[최진오]

디바이스 목록 변경
 - 1개 일때 무조건 디바이스 아이디 가져오게 처리

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

@@ -757,6 +757,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener
             loadingHandler.removeMessages(loadingRow);
         }
         setHomeHubStateList();
+
     }
 
     /**

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

@@ -203,6 +203,7 @@ public class FragmentThingsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 final ItemViewHolder itemViewHolerView = (ItemViewHolder) holder;
 
                 // (장치의) 접속 상태 (ON / OFF / none)
+                String onlineState = mUtil.null2string(hmItem.get(Constants.KEY_DEVICE_ONLINE));
                 String deviceId = mUtil.null2string(hmItem.get(Constants.KEY_DEVICE_ID));
 
                 // (default) 커맨드 클래스 값의 단위
@@ -546,7 +547,7 @@ public class FragmentThingsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                     itemViewHolerView.ivRowDelete.setVisibility(View.VISIBLE);
 //                    itemViewHolerView.llRowOffline.setVisibility(GONE);
                     itemViewHolerView.llLoading.setVisibility(GONE);
-                    if (mAppConfig.getSelectHomegrpHomehubOnlineState(deviceId).equals("OFF")) {
+                    if (onlineState.equals("OFF") || mAppConfig.getSelectHomegrpHomehubOnlineState(deviceId).equals("OFF")) {
                         itemViewHolerView.ivRowIcon.setBackgroundResource(R.drawable.img_thing_icon_bg_default);
                     }
                 } else if (isMoveCheck) {
@@ -554,11 +555,11 @@ public class FragmentThingsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                     itemViewHolerView.ivRowMove.setVisibility(View.VISIBLE);
 //                    itemViewHolerView.llRowOffline.setVisibility(GONE);
                     itemViewHolerView.llLoading.setVisibility(GONE);
-                    if (mAppConfig.getSelectHomegrpHomehubOnlineState(deviceId).equals("OFF")) {
+                    if (onlineState.equals("OFF") || mAppConfig.getSelectHomegrpHomehubOnlineState(deviceId).equals("OFF")) {
                         itemViewHolerView.ivRowIcon.setBackgroundResource(R.drawable.img_thing_icon_bg_default);
                     }
                 } else {
-                    if (mAppConfig.getSelectHomegrpHomehubOnlineState(deviceId).equals("OFF")) {
+                    if (onlineState.equals("OFF") || mAppConfig.getSelectHomegrpHomehubOnlineState(deviceId).equals("OFF")) {
                         itemViewHolerView.ivRowIcon.setBackgroundResource(R.drawable.img_thing_icon_bg_default);
 //                        itemViewHolerView.llRowControl.setVisibility(GONE);
 //                        itemViewHolerView.llRowDelete.setVisibility(GONE);

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

@@ -1185,10 +1185,12 @@ public class ThingsDetail extends CustomActivity implements View.OnClickListener
         sendParams.put(Constants.KEY_MESSAGE_TYPE, Constants.WEBSOCKET_TYPE_NODE_COMMAND);
         sendParams.put(Constants.KEY_DEVICE_ID, mDeviceId);
         sendParams.put(Constants.KEY_NODE_ID, mNodeId);
+        sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getSelectServicehubRequestId());
         sendParams.put(Constants.KEY_COMMAND_TYPE, Constants.WEBSOCKET_COMM_TYPE_CONTROL);
+        sendParams.put(Constants.KEY_CUST_ID, mAppConfig.getCustId());
+        sendParams.put(Constants.KEY_CTRT_GRP_ID, mAppConfig.getCtrtGroupId());
         sendParams.put(Constants.KEY_CMDCLS_ID, cmdclsId);
         sendParams.put(Constants.KEY_CMDCLS_VALUE, requestValue);
-        sendParams.put(Constants.KEY_REQUEST_ID, mAppConfig.getSelectServicehubRequestId());
 
         getWebSocketService().send(Constants.WEBSOCKET_SEND_NODE_COMMAND, sendParams);
     }

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

@@ -458,11 +458,11 @@ class ThingsDetailVpAdapter extends PagerAdapter {
                 } else {
                     if (httpContentValue.equals(select)) {
                         mUtil.getView(childView, R.id.ivRowBody1_Icon).setBackgroundResource(
-                                R.drawable.img_things_detail_05_01_valve_state_locked);
+                                R.drawable.img_things_detail_05_02_valve_state_unlocked);
                         mUtil.getTextView(childView, R.id.tvRowBody1_Title).setTextColor(Util.getColor(mContext, R.color.color_text_01));
                     } else {
                         mUtil.getView(childView, R.id.ivRowBody1_Icon).setBackgroundResource(
-                                R.drawable.img_things_detail_05_02_valve_state_unlocked);
+                                R.drawable.img_things_detail_05_01_valve_state_locked);
                         mUtil.getTextView(childView, R.id.tvRowBody1_Title).setTextColor(Util.getColor(mContext, R.color.color_text_02));
                     }
                 }

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

@@ -396,6 +396,10 @@ public class ThingsDeviceAddStep3 extends CustomActivity implements View.OnClick
                 if (joResult.get(Constants.KEY_COMMAND_ID).equals(mStartCommandId)) {
                     setThingsAddPolling();
                 } else if (joResult.get(Constants.KEY_COMMAND_ID).equals(mStopCommandId)) {
+                    if (mScheduledFuture != null) {
+                        mScheduledFuture.cancel(false);
+                        mIsPollingPause = true;
+                    }
                     mUtil.getView(mActivity, R.id.llPageRoot).setVisibility(View.INVISIBLE);
                     mIntent = new Intent(mActivity, ThingsDeviceAddStep4.class);
                     mIntent.putExtra(Constants.EXTRA_DEVICE_NAME, mDeviceName);