1. 버그 수정.

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceAdd.java

@@ -248,7 +248,7 @@ public class ThingsDeviceAdd extends CustomActivity implements View.OnClickListe
         mUtil.getView(mActivity, R.id.llRowDevice8).setOnClickListener(this);
         mUtil.getView(mActivity, R.id.llBtn1).setOnClickListener(this);
 
-        if (mDeviceId.equals("")) {
+        if ("".equals(mDeviceId)) {
             setSpinnerDeviceList();
 
             Intent intent = new Intent();
@@ -271,11 +271,12 @@ public class ThingsDeviceAdd extends CustomActivity implements View.OnClickListe
             for (int i = 0; i < mAppConfig.getDevicesList().size(); i++) {
                 mDeviceNameList.add(mAppConfig.getHomehubDeviceName(i));
                 mDeviceSnList.add("S/N : " + mAppConfig.getHomehubDeviceSn(i) + "\n"
-                                + mUtil.getString(mActivity, R.string.layout_things_device_add_99) + " : "  );//+ mAppConfig.get);
-                if (mAppConfig.getDevicesList().get(i).get(Constants.KEY_CTRT_CNT) == mAppConfig.getDevicesList().get(i).get(Constants.KEY_CTRT_CNT)) {
+                                + mUtil.getString(mActivity, R.string.layout_things_device_add_99) + " : " + mAppConfig.getDevicesList().get(i)
+                        .get(Constants.KEY_REMAIN_CTRT_CNT) + "개");
+                if ("0".equals(mAppConfig.getDevicesList().get(i).get(Constants.KEY_REMAIN_CTRT_CNT))) {
                     mDeviceEnableList.add("N");
                 } else {
-                    mDeviceEnableList.add("N");
+                    mDeviceEnableList.add("Y");
                 }
             }
         }

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceDelOffStep2.java

@@ -95,11 +95,11 @@ public class ThingsDeviceDelOffStep2 extends CustomActivity implements View.OnCl
     public void onClick(View view) {
 
         switch (view.getId()) {
-            case R.id.llBtn2:
+            /*case R.id.llBtn2:
                 onBackPressedEnd();
-                break;
+                break;*/
             case R.id.llBtn1:
-                mUtil.getView(mActivity, R.id.llBtn1).setEnabled(false);
+                /*mUtil.getView(mActivity, R.id.llBtn1).setEnabled(false);
                 if (mAppConfig.getSelectCtrtGroupHomehubOnlineState(mDeviceId).equals("ON")) {
                     if (mIsResult) {
                         mIntent = new Intent();
@@ -114,7 +114,11 @@ public class ThingsDeviceDelOffStep2 extends CustomActivity implements View.OnCl
                     mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG866), Toast.LENGTH_SHORT);
                     return;
                 }
-                mUtil.getView(mActivity, R.id.llBtn1).setEnabled(true);
+                mUtil.getView(mActivity, R.id.llBtn1).setEnabled(true);*/
+                if (!mAppConfig.getSelectCtrtGroupHomehubOnlineState(mDeviceId).equals("ON")) {
+                    mUtil.setShowToast(mActivity, mUtil.getString(mActivity, R.string.MSG866), Toast.LENGTH_SHORT);
+                }
+                onBackPressed();
                 break;
             default:
                 break;
@@ -247,7 +251,7 @@ public class ThingsDeviceDelOffStep2 extends CustomActivity implements View.OnCl
 
         mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.VISIBLE);
         mUtil.getView(mActivity, R.id.llBtn1).setOnClickListener(this);
-        mUtil.getView(mActivity, R.id.llBtn2).setOnClickListener(this);
+//        mUtil.getView(mActivity, R.id.llBtn2).setOnClickListener(this);
 
         mUtil.getTextView(mActivity, R.id.tvDeviceName).setText(mDeviceName);
         mUtil.setImage(mActivity, mDeviceImageId, R.id.ivIconDevice);
@@ -256,15 +260,15 @@ public class ThingsDeviceDelOffStep2 extends CustomActivity implements View.OnCl
 //            mUtil.getTextView(mActivity, R.id.tvDeviceDesc).setVisibility(View.VISIBLE);
             mUtil.getImageView(mActivity, R.id.ivIconFail).setVisibility(View.GONE);
             mUtil.getImageView(mActivity, R.id.ivIconSucess).setVisibility(View.VISIBLE);
-            mUtil.getView(mActivity, R.id.llBtn2).setVisibility(View.GONE);
-            mUtil.getTextView(mActivity, R.id.tvBtn1).setText(mUtil.getString(mActivity, R.string.layout_ok));
+//            mUtil.getView(mActivity, R.id.llBtn2).setVisibility(View.GONE);
+//            mUtil.getTextView(mActivity, R.id.tvBtn1).setText(mUtil.getString(mActivity, R.string.layout_ok));
         } else {
             mUtil.getTextView(mActivity, R.id.tvTitle).setText(mUtil.getString(mActivity, R.string.layout_things_device_del_step2_02));
 //            mUtil.getTextView(mActivity, R.id.tvDeviceDesc).setVisibility(View.GONE);
             mUtil.getImageView(mActivity, R.id.ivIconFail).setVisibility(View.VISIBLE);
             mUtil.getImageView(mActivity, R.id.ivIconSucess).setVisibility(View.GONE);
-            mUtil.getView(mActivity, R.id.llBtn2).setVisibility(View.VISIBLE);
-            mUtil.getTextView(mActivity, R.id.tvBtn1).setText(mUtil.getString(mActivity, R.string.layout_retry));
+//            mUtil.getView(mActivity, R.id.llBtn2).setVisibility(View.VISIBLE);
+//            mUtil.getTextView(mActivity, R.id.tvBtn1).setText(mUtil.getString(mActivity, R.string.layout_retry));
         }
 
     }

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDeviceDelStep2.java

@@ -99,7 +99,7 @@ public class ThingsDeviceDelStep2 extends CustomActivity implements View.OnClick
                 break;
             case R.id.llBtn1:
                 mUtil.getView(mActivity, R.id.llBtn1).setEnabled(false);
-                if (mAppConfig.getSelectCtrtGroupHomehubOnlineState().equals("ON")) {
+                if (mAppConfig.getSelectCtrtGroupHomehubOnlineState(mDeviceId).equals("ON")) {
                     if (mIsResult) {
                         mIntent = new Intent();
                         mIntent.putExtra(Constants.EXTRA_RELOAD_FLAG, true);

onecable/src/main/res/layout/things_device_del_off_step2.xml

@@ -136,7 +136,7 @@
                     android:gravity="center">
 
                 <LinearLayout
-                        android:id="@+id/llBtn2"
+                        android:id="@+id/llBtn1"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
@@ -144,12 +144,12 @@
                         android:gravity="center">
 
                     <TextView
-                            android:id="@+id/tvBtn2"
+                            android:id="@+id/tvBtn1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:background="@null"
                             android:includeFontPadding="false"
-                            android:text="@string/layout_cancel"
+                            android:text="@string/layout_ok"
                             android:textColor="@drawable/d_font_color_font_03_color_font_04"
                             android:textSize="@dimen/size_font_09"
                             android:textStyle="bold"/>