[최진오]

장치리스트 관련 수정중

onecable/src/main/java/com/ntels/onecable/common/Constants.java

@@ -870,6 +870,7 @@ public interface Constants {
    * 디바이스 명
    */
   public static final String KEY_DEVICE_NAME = "device_name";
+  public static final String KEY_PRD_USER_NAME = "prd_user_name";
   public static final String KEY_DEVICE_HOSTNAME = "device_hostname";
 
   /**

onecable/src/main/java/com/ntels/onecable/common/http/HttpSend.java

@@ -901,8 +901,9 @@ public class HttpSend {
         ArrayList<HashMap<String, Object>> alPost = new ArrayList<HashMap<String, Object>>();
         ArrayList<String> alFilePath = new ArrayList<String>();
         try {
-            interface_Id = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_G_devices,
-                    mAppConfig.getCustId(), mAppConfig.getCtrtGroupId());
+            interface_Id = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_G_devices
+                    , mAppConfig.getCustId()
+                    , mAppConfig.getCtrtGroupId());
             sendType = Constants.SEND_TYPE_GET;
             //            /* 이름 */
             //            interface_Id = util.convGetRestReplace(interface_Id, Constants.KEY_member_id, key_member_id);
@@ -920,7 +921,7 @@ public class HttpSend {
      * @param keyDeviceId 홈허브 ID
      * @param keyNodeId   노드 ID
      */
-    public void G_devices_device_id(String keyDeviceId, String keyNodeId) {
+    public void getNodeDetail(String keyDeviceId, String keyNodeId) {
 
         String url = "";
         String interface_Id = "";
@@ -931,10 +932,14 @@ public class HttpSend {
         ArrayList<HashMap<String, Object>> alPost = new ArrayList<HashMap<String, Object>>();
         ArrayList<String> alFilePath = new ArrayList<String>();
         try {
-            interface_Id = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_G_devices_device_id);
+            interface_Id = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_G_node
+                    , mAppConfig.getCustId()
+                    , mAppConfig.getCtrtGroupId()
+                    , keyDeviceId
+                    , keyNodeId);
             sendType = Constants.SEND_TYPE_GET;
-            interface_Id = util.convGetRestReplace(interface_Id, Constants.KEY_DEVICE_ID, keyDeviceId);
-            interface_Id = util.convGetRestReplace(interface_Id, Constants.KEY_NODE_ID, keyNodeId);
+//            interface_Id = util.convGetRestReplace(interface_Id, Constants.KEY_DEVICE_ID, keyDeviceId);
+//            interface_Id = util.convGetRestReplace(interface_Id, Constants.KEY_NODE_ID, keyNodeId);
             setHttp(url, interface_Id, sendType, alPost, body, fileParamName, filePath, alFilePath);
         } catch (Exception e) {
             e.printStackTrace();

onecable/src/main/java/com/ntels/onecable/view/mainmore/Homehub.java

@@ -371,7 +371,7 @@ public class Homehub extends CustomActionBarActivity implements View.OnClickList
           resultGetDevicesDetail(result);
         }
       });
-      httpSend.G_devices_device_id(appConfig.getSelect_Homegrp_Homehub_Device_Id(), "");
+      httpSend.getNodeDetail(appConfig.getSelect_Homegrp_Homehub_Device_Id(), "");
     } catch (Exception ex) {
       ex.printStackTrace();
     }

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

@@ -17,7 +17,6 @@ import com.ntels.onecable.common.http.Response;
 import com.ntels.onecable.common.util.Dlog;
 import com.ntels.onecable.common.util.LogUtil;
 import com.ntels.onecable.common.util.Util;
-import com.ntels.onecable.common.util.recyclerview.DividerItemDecoration;
 import com.ntels.onecable.common.websocket.OnWebSocketResponse;
 import com.ntels.onecable.common.websocket.WebSocketService;
 import com.ntels.onecable.view.dialog.CustomDialog;
@@ -402,7 +401,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
         } else {
             Dlog.v("jino111111");
             //홈그룹 있을경우
-            if (!appConfig.getIsHomegrpHomehub()){
+            if (!appConfig.getIsHomegrpHomehub()) {
                 Dlog.v("jino111112");
                 //홈그룹은 있고 홈허브가 없는경우
                 util.getView(toolbar, R.id.llToolbar).setVisibility(View.GONE);
@@ -460,7 +459,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
 
             LogUtil.e(TAG, "Homegrp id - " + appConfig.getCtrtGroupId());
 
-            if (!appConfig.getIsHomegrpHomehub()){
+            if (!appConfig.getIsHomegrpHomehub()) {
                 //홈그룹은 있고 홈허브가 없는경우
                 if (appConfig.getSelect_Homegrp_Grade_Code().equals("MAS")) {
                     util.getView(act, R.id.llNoHub_Master).setVisibility(View.VISIBLE);
@@ -541,8 +540,8 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
 
         isListFooter = true;
         isListFooterVisible = true;
-        dataAdapter = new FragmentThingsAdapter(act, R.layout.row_things_list,
-                R.layout.row_things_list, R.layout.row_footer_things_list, alTotalList, this);
+        dataAdapter = new FragmentThingsAdapter(act, R.layout.row_things_list, R.layout.row_things_list, R.layout.row_footer_things_list,
+                alTotalList, this);
         dataAdapter.setFooterCheck(isListFooter);
         dataAdapter.setFooterVisible(isListFooterVisible);
 
@@ -581,14 +580,14 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
                     if (positionType == dataAdapter.TYPE_HEADER) {
                         return glmList.getSpanCount();
                     } else {
-                        return dataAdapter.getItemViewType(position) == 1
-                                ? 1 : (valueConut % listColumnsCnt == 1 ? glmList.getSpanCount() : 1);
+                        return dataAdapter.getItemViewType(position) == 1 ? 1 : (valueConut % listColumnsCnt == 1 ? glmList.getSpanCount
+                                () : 1);
                     }
                 }
             });
             rcvList.setLayoutManager(glmList);
         }
-        rcvList.addItemDecoration(new DividerItemDecoration(getActivity(), R.drawable.color_line_01));
+//        rcvList.addItemDecoration(new DividerItemDecoration(getActivity(), R.drawable.color_line_01));
         AlphaInAnimationAdapter alphaAdapter = new AlphaInAnimationAdapter(dataAdapter);
         alphaAdapter.setDuration(150);
         ScaleInAnimationAdapter scaleAdapter = new ScaleInAnimationAdapter(alphaAdapter);
@@ -678,8 +677,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
         if (resultCode.equals("00")) {
             String resultDeviceId = util.null2string(joResult.get(Constants.KEY_DEVICE_ID));
             String resultNodeId = util.null2string(joResult.get(Constants.KEY_NODE_ID));
-            String resultRequestTime = util.null2string(
-                    joResult.get(Constants.KEY_REQUEST_TIME));
+            String resultRequestTime = util.null2string(joResult.get(Constants.KEY_REQUEST_TIME));
             int loadingRow = -1;
             for (int row = 0; row < alTotalList.size(); row++) {
 
@@ -747,8 +745,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
         String resultDeviceId = util.null2string(joResult.get(Constants.KEY_DEVICE_ID));
         String resultNodeId = util.null2string(joResult.get(Constants.KEY_NODE_ID));
         String resultCollectTime = util.null2string(joResult.get(Constants.KEY_COLLECT_TIME));
-        HashMap<String, Object> hmContentValue =
-                util.jsonToMap(joResult.get(Constants.KEY_CONTENT_VALUE));
+        HashMap<String, Object> hmContentValue = util.jsonToMap(joResult.get(Constants.KEY_CONTENT_VALUE));
         String resultOnlineState = util.null2string(hmContentValue.get(Constants.KEY_ONLINE));
 
         for (int row = 0; row < alTotalList.size(); row++) {
@@ -878,12 +875,12 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
                 alTotalList.clear();
                 util.getTextView(toolbar, R.id.tvToolbarTitle2).setText("");
 
-                JSONObject joResult = new JSONObject(result.getContent());
-                Dlog.v(joResult.toString());
-                String devices = util.null2string(joResult.get(Constants.KEY_DEVICES));
+//                JSONObject joResult = new JSONObject(result.getContent());
+//                Dlog.v(joResult.toString());
+//                String devices = util.null2string(joResult.get(Constants.KEY_DEVICES));
 
-                ArrayList<HashMap<String, Object>> alList = util.jsonToArrayListMap(devices);
-//                ArrayList<HashMap<String, Object>> alList = util.jsonToArrayListMap(result.getContent());
+//                ArrayList<HashMap<String, Object>> alList = util.jsonToArrayListMap(devices);
+                ArrayList<HashMap<String, Object>> alList = util.jsonToArrayListMap(result.getContent());
                 if (alList.size() > 0) {
                     util.getTextView(toolbar, R.id.tvToolbarTitle2).setText(alList.size() + "");
                     for (int row = 0; row < alList.size(); row++) {
@@ -936,8 +933,8 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
                 }
             });
             swipeRefreshLayout.setVisibility(View.GONE);
-            httpSend.D_cloud_devices_device_id_nodes_node_id(callHttpDeviceId, callHttpNodeId,
-                    appConfig.getCtrtGroupId(), appConfig.getLogin_Member_Id());
+            httpSend.D_cloud_devices_device_id_nodes_node_id(callHttpDeviceId, callHttpNodeId, appConfig.getCtrtGroupId(), appConfig
+                    .getLogin_Member_Id());
         } catch (Exception ex) {
             ex.printStackTrace();
         }
@@ -1192,15 +1189,13 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
             callHttpDeviceId = appConfig.getSelect_Homegrp_Homehub_Device_Id();
             thingsDeviceAdd();
         } else if (callType == 1) {
-            String deviceclassTypeId = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_DEVICECLASS_TYPE_ID));
-            int deviceclassTypeIdNum = Integer.valueOf(deviceclassTypeId);
+            String deviceclassTypeId = util.null2string(alTotalList.get(position).get(Constants.KEY_DEVICECLASS_TYPE_ID));
+            int deviceclassTypeIdNum = util.null2int(deviceclassTypeId);
             util.callBtnGoogleAnalytics(actName, "ViewDetail_Things", deviceclassTypeId);
 
             // 상세보기
             if (deviceclassTypeIdNum == Constants.DEVICECLASS_TYPE_ID_40801) {
-                String[] numbers = util.null2string(
-                        alTotalList.get(position).get(Constants.KEY_DEVICE_SN)).split("-");
+                String[] numbers = util.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_SN)).split("-");
                 String cameraNumber = numbers[0];
                 String userNumber = numbers[1];
                 intent = new Intent(act, ThingsCameraDetail.class);
@@ -1208,8 +1203,7 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
                 intent.putExtra(Constants.EXTRA_CAMERA_USER_NUMBER, userNumber);
                 util.callActivity(act, intent);
             } else if (deviceclassTypeIdNum == Constants.DEVICECLASS_TYPE_ID_40802) {
-                String configuration = util.null2string(
-                        alTotalList.get(position).get(Constants.KEY_CONFIGURATION));
+                String configuration = util.null2string(alTotalList.get(position).get(Constants.KEY_CONFIGURATION));
                 HashMap<String, Object> hmConfigurations = util.parseConfiguration(configuration);
                 if (hmConfigurations == null) {
                     // TODO : configuration 없을 시 처리 방법?
@@ -1240,94 +1234,58 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
             }
         } else if (callType == 2) {
             // 삭제하기
-            String deviceId = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_DEVICE_ID));
+            String deviceId = util.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_ID));
             callHttpDeviceId = deviceId;
-            String nodeId = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_NODE_ID));
+            String nodeId = util.null2string(alTotalList.get(position).get(Constants.KEY_NODE_ID));
             callHttpNodeId = nodeId;
-            String deviceName = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_DEVICE_NAME));
+            String deviceName = util.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_NAME));
 
             intent = new Intent(act, ThingsDeviceDel1st.class);
             intent.putExtra(Constants.EXTRA_DEVICE_NAME, deviceName);
             intent.putExtra(Constants.EXTRA_DEVICE_ID, deviceId);
             intent.putExtra(Constants.EXTRA_NODE_ID, nodeId);
 
-            String deviceModelId = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_DEVICE_MODEL_ID));
-            String deviceMfId = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_DEVICE_MF_ID));
-            int deviceclassTypeId = util.null2int(
-                    alTotalList.get(position).get(Constants.KEY_DEVICECLASS_TYPE_ID));
-            String deviceProtocolType = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_DEVICE_PROTOCOL_TYPE));
+            String deviceModelId = util.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_MODEL_ID));
+            String deviceMfId = util.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_MF_ID));
+            int deviceclassTypeId = util.null2int(alTotalList.get(position).get(Constants.KEY_DEVICECLASS_TYPE_ID));
+            String deviceProtocolType = util.null2string(alTotalList.get(position).get(Constants.KEY_DEVICE_PROTOCOL_TYPE));
 
             if (deviceModelId.equals("HY-11-10A") && deviceMfId.equals("TimeValve")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        util.getString(act, R.string.layout_things_device_add_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        util.getString(act, R.string.layout_things_device_add_del_01));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        util.getString(act, R.string.layout_things_device_add_del_04));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_01_smartgasvalve);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_01_smartgasvalve_wait);
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, util.getString(act, R.string.layout_things_device_add_03));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, util.getString(act, R.string.layout_things_device_add_del_01));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, util.getString(act, R.string.layout_things_device_add_del_04));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_01_smartgasvalve);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_01_smartgasvalve_wait);
             } else if (deviceModelId.equals("SPD-01") && deviceMfId.equals("LGU+")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        util.getString(act, R.string.layout_things_device_add_05));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        util.getString(act, R.string.layout_things_device_add_del_02));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        util.getString(act, R.string.layout_things_device_add_del_05));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_02_iotplug);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_02_iotplug_wait);
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, util.getString(act, R.string.layout_things_device_add_05));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, util.getString(act, R.string.layout_things_device_add_del_02));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, util.getString(act, R.string.layout_things_device_add_del_05));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_02_iotplug);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_02_iotplug_wait);
             } else if (deviceModelId.equals("ZL7261KR-5") && deviceMfId.equals("VisionSecurity")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        util.getString(act, R.string.layout_things_device_add_07));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        util.getString(act, R.string.layout_things_device_add_del_02));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        util.getString(act, R.string.layout_things_device_add_del_06));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_03_smartplug);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_03_smartplug_wait);
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, util.getString(act, R.string.layout_things_device_add_07));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, util.getString(act, R.string.layout_things_device_add_del_02));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, util.getString(act, R.string.layout_things_device_add_del_06));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_03_smartplug);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_03_smartplug_wait);
             } else if (deviceModelId.equals("ZP3111") && deviceMfId.equals("VisionSecurity")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        util.getString(act, R.string.layout_things_device_add_09));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        util.getString(act, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        util.getString(act, R.string.layout_things_device_add_del_08));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_04_mutisensor_motion);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_04_mutisensor_motion_wait);
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, util.getString(act, R.string.layout_things_device_add_09));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, util.getString(act, R.string.layout_things_device_add_del_03));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, util.getString(act, R.string.layout_things_device_add_del_08));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_04_mutisensor_motion);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_04_mutisensor_motion_wait);
             } else if (deviceModelId.equals("ZS5101") && deviceMfId.equals("VisionSecurity")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        util.getString(act, R.string.layout_things_device_add_11));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        util.getString(act, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        util.getString(act, R.string.layout_things_device_add_del_10));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_05_shocksensor);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_05_shocksensor_wait);
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, util.getString(act, R.string.layout_things_device_add_11));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, util.getString(act, R.string.layout_things_device_add_del_03));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, util.getString(act, R.string.layout_things_device_add_del_10));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_05_shocksensor);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_05_shocksensor_wait);
             } else if (deviceModelId.equals("ZD211x") && deviceMfId.equals("VisionSecurity")) {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        util.getString(act, R.string.layout_things_device_add_11));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, util.getString(act, R.string.layout_things_device_add_11));
                 intent.putExtra(Constants.EXTRA_DEVICE_DESC, util.getString(act, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        util.getString(act, R.string.layout_things_device_add_del_12));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_06_mutisensor_door);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_06_mutisensor_door_wait);
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, util.getString(act, R.string.layout_things_device_add_del_12));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_06_mutisensor_door);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_06_mutisensor_door_wait);
             } else if (deviceclassTypeId == Constants.DEVICECLASS_TYPE_ID_40801) {
                 comHandler.sendEmptyMessageDelayed(MSG_COM_WS_NODE_DELETE, 10);
                 return;
@@ -1339,51 +1297,38 @@ public class FragmentThings extends Fragment implements View.OnClickListener,
                 customDialog.msgAlert(act, Constants.MSG921);
                 return;
             } else {
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        util.getString(act, R.string.layout_things_device_add_15));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        util.getString(act, R.string.layout_things_device_add_del_13));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        util.getString(act, R.string.layout_things_device_add_del_15));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_00_zwave);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_00_zwave_wait);
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, util.getString(act, R.string.layout_things_device_add_15));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, util.getString(act, R.string.layout_things_device_add_del_13));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, util.getString(act, R.string.layout_things_device_add_del_15));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_00_zwave);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_00_zwave_wait);
             }
             util.callActivityForResultNoAnim(act, intent, Constants.ACT_THINGS_DEVICE_DEL_01);
         } else if (callType == 3) {
             // 실행하기
             callHttpRequestValue = dataAdapter.getHttpValue();
             callHttpDeviceId = appConfig.getSelect_Homegrp_Homehub_Device_Id();
-            callHttpNodeId = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_NODE_ID));
-            callHttpCmdclsId = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_CMDCLS_ID));
-            String contentValue = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_CONTENT_VALUE));
-            String cmdclsCode = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_CMDCLS_CODE));
+            callHttpNodeId = util.null2string(alTotalList.get(position).get(Constants.KEY_NODE_ID));
+            callHttpCmdclsId = util.null2string(alTotalList.get(position).get(Constants.KEY_CMDCLS_ID));
+            String contentValue = util.null2string(alTotalList.get(position).get(Constants.KEY_CONTENT_VALUE));
+            String cmdclsCode = util.null2string(alTotalList.get(position).get(Constants.KEY_CMDCLS_CODE));
 
             util.callBtnGoogleAnalytics(actName, "Control_Things", cmdclsCode + "_1depth");
 
             Dlog.v("callHttpRequestValue", callHttpRequestValue);
             Dlog.v("contentValue", contentValue);
 
-            String cmdclsTypeId = util.null2string(
-                    alTotalList.get(position).get(Constants.KEY_CMDCLS_TYPE_ID));
-            String tempValue = util.getStringValues(act, "CMDCLS_TYPE_ID_"
-                    + cmdclsTypeId + "_" + callHttpRequestValue);
+            String cmdclsTypeId = util.null2string(alTotalList.get(position).get(Constants.KEY_CMDCLS_TYPE_ID));
+            String tempValue = util.getStringValues(act, "CMDCLS_TYPE_ID_" + cmdclsTypeId + "_" + callHttpRequestValue);
 
             if (callHttpRequestValue.equals(contentValue)) {
-                util.setShowToast(act, util.getString(act, R.string.MSG899)
-                        .replaceAll("\\'컨텐츠밸류\\'", tempValue), Toast.LENGTH_SHORT);
+                util.setShowToast(act, util.getString(act, R.string.MSG899).replaceAll("\\'컨텐츠밸류\\'", tempValue), Toast.LENGTH_SHORT);
                 dataAdapter.notifyDataSetChanged();
                 return;
             } else {
                 util.setVibrator(100);
             }
-            comHandler.sendMessageDelayed(
-                    comHandler.obtainMessage(MSG_COM_WS_NODE_COMMAND, position, 0), 10);
+            comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_WS_NODE_COMMAND, position, 0), 10);
         }
     }
 

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

@@ -64,146 +64,91 @@ public class ThingsDeviceAdd extends CustomActionBarActivity implements View.OnC
                 break;
             case R.id.llRowDevice1:
                 intent = new Intent(mActivity, ThingsDeviceAdd1st.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_02));
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_01));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_04));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_01_smartgasvalve);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_01_smartgasvalve_wait);
+                intent.putExtra(Constants.EXTRA_DEVICE_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_02));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_03));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_01));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_04));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_01_smartgasvalve);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_01_smartgasvalve_wait);
                 intent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mUtil.callActivityForResultNoAnim(mActivity, intent,
-                        Constants.ACT_THINGS_DEVICE_ADD_01);
+                mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_ADD_01);
                 break;
             case R.id.llRowDevice2:
                 intent = new Intent(mActivity, ThingsDeviceAdd1st.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_04));
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_05));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_02));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_05));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_02_iotplug);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_02_iotplug_wait);
+                intent.putExtra(Constants.EXTRA_DEVICE_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_04));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_05));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_02));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_05));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_02_iotplug);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_02_iotplug_wait);
                 intent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mUtil.callActivityForResultNoAnim(mActivity, intent,
-                        Constants.ACT_THINGS_DEVICE_ADD_01);
+                mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_ADD_01);
                 break;
             case R.id.llRowDevice3:
                 intent = new Intent(mActivity, ThingsDeviceAdd1st.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_06));
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_07));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_02));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_06));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_03_smartplug);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_03_smartplug_wait);
+                intent.putExtra(Constants.EXTRA_DEVICE_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_06));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_07));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_02));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_06));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_03_smartplug);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_03_smartplug_wait);
                 intent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mUtil.callActivityForResultNoAnim(mActivity, intent,
-                        Constants.ACT_THINGS_DEVICE_ADD_01);
+                mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_ADD_01);
                 break;
             case R.id.llRowDevice4:
                 intent = new Intent(mActivity, ThingsDeviceAdd1st.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_08));
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_09));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_07));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_04_mutisensor_motion);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_04_mutisensor_motion_wait);
+                intent.putExtra(Constants.EXTRA_DEVICE_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_08));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_09));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_07));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_04_mutisensor_motion);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_04_mutisensor_motion_wait);
                 intent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mUtil.callActivityForResultNoAnim(mActivity, intent,
-                        Constants.ACT_THINGS_DEVICE_ADD_01);
+                mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_ADD_01);
                 break;
             case R.id.llRowDevice5:
                 intent = new Intent(mActivity, ThingsDeviceAdd1st.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_10));
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_11));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_09));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_05_shocksensor);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_05_shocksensor_wait);
+                intent.putExtra(Constants.EXTRA_DEVICE_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_10));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_11));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_09));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_05_shocksensor);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_05_shocksensor_wait);
                 intent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mUtil.callActivityForResultNoAnim(mActivity, intent,
-                        Constants.ACT_THINGS_DEVICE_ADD_01);
+                mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_ADD_01);
                 break;
             case R.id.llRowDevice6:
                 intent = new Intent(mActivity, ThingsDeviceAdd1st.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_12));
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_11));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_11));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_06_mutisensor_door);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_06_mutisensor_door_wait);
+                intent.putExtra(Constants.EXTRA_DEVICE_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_12));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_11));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_03));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_11));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_06_mutisensor_door);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_06_mutisensor_door_wait);
                 intent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mUtil.callActivityForResultNoAnim(mActivity, intent,
-                        Constants.ACT_THINGS_DEVICE_ADD_01);
+                mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_ADD_01);
                 break;
             case R.id.llRowDevice7:
                 intent = new Intent(mActivity, ThingsDeviceAdd1st.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_13));
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_14));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_13));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC1,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_14));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_00_zwave);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_00_zwave_wait);
+                intent.putExtra(Constants.EXTRA_DEVICE_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_13));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_14));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_13));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC1, mUtil.getString(mActivity, R.string.layout_things_device_add_del_14));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_00_zwave);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_00_zwave_wait);
                 intent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mUtil.callActivityForResultNoAnim(mActivity, intent,
-                        Constants.ACT_THINGS_DEVICE_ADD_01);
+                mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_ADD_01);
                 break;
             case R.id.llRowDevice8:
                 // Netatmo에서 access_camera permission을 받아야 사용 가능.
                 intent = new Intent(mActivity, ThingsDeviceAdd1st.class);
-                intent.putExtra(Constants.EXTRA_DEVICE_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_16));
-                intent.putExtra(Constants.EXTRA_COMPANY_NAME,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_17));
-                intent.putExtra(Constants.EXTRA_DEVICE_DESC,
-                        mUtil.getString(mActivity, R.string.layout_things_device_add_del_16));
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE,
-                        R.drawable.img_things_product_addimg_07_netatmo);
-                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1,
-                        R.drawable.img_things_product_addimg_07_netatmo);
+                intent.putExtra(Constants.EXTRA_DEVICE_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_16));
+                intent.putExtra(Constants.EXTRA_COMPANY_NAME, mUtil.getString(mActivity, R.string.layout_things_device_add_17));
+                intent.putExtra(Constants.EXTRA_DEVICE_DESC, mUtil.getString(mActivity, R.string.layout_things_device_add_del_16));
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE, R.drawable.img_things_product_addimg_07_netatmo);
+                intent.putExtra(Constants.EXTRA_DEVICE_IMAGE1, R.drawable.img_things_product_addimg_07_netatmo);
                 intent.putExtra(Constants.EXTRA_DEVICE_ID, mDeviceId);
-                mUtil.callActivityForResultNoAnim(mActivity, intent,
-                        Constants.ACT_THINGS_DEVICE_ADD_01);
+                mUtil.callActivityForResultNoAnim(mActivity, intent, Constants.ACT_THINGS_DEVICE_ADD_01);
                 break;
             default:
                 break;

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

@@ -558,7 +558,7 @@ public class ThingsDeviceLedBulbDetail extends CustomActionBarActivity implement
             });
             mTotalList.clear();
             mSwipeRefreshLayout.setVisibility(View.INVISIBLE);
-            httpSend.G_devices_device_id(mDeviceId, mNodeId);
+            httpSend.getNodeDetail(mDeviceId, mNodeId);
         } catch (Exception ex) {
             ex.printStackTrace();
         }

onecable/src/main/res/drawable/d_font_color_font_03_color_font_04.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2015. Ncomz. All Rights Reserved
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:color="@color/color_text_04" android:state_enabled="false"/>
+  <item android:color="@color/color_text_03" android:state_enabled="true"/>
+  <item android:color="@color/color_text_03" android:state_pressed="true"/>
+  <item android:color="@color/color_text_03"/>
+
+</selector>

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

@@ -95,9 +95,6 @@
                 </com.ntels.onecable.common.widget.CustomScrollView>
             </LinearLayout>
 
-            <View
-                    android:visibility="gone"
-                    style="@style/width_Divider_02"/>
 
             <LinearLayout
                     android:layout_width="match_parent"

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

@@ -4,64 +4,66 @@
   -->
 
 <LinearLayout
-    android:id="@+id/llFooterRoot"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical">
+        android:id="@+id/llFooterRoot"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical">
 
   <LinearLayout
-      android:id="@+id/llFooterProgress"
-      android:layout_width="match_parent"
-      android:layout_height="110dp"
-      android:gravity="center"
-      android:orientation="vertical"
-      android:visibility="gone">
+          android:id="@+id/llFooterProgress"
+          android:layout_width="match_parent"
+          android:layout_height="200dp"
+          android:gravity="center"
+          android:background="@drawable/d_list_add_bg"
+          android:orientation="vertical"
+          android:visibility="gone">
 
     <ProgressBar
-        android:id="@+id/progressBar3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+            android:id="@+id/progressBar3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:includeFontPadding="false"
-        android:text="조회중입니다. 잠시만 기다려 주세요."
-        android:textColor="@color/color_text_01"
-        android:textSize="@dimen/size_font_04"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:includeFontPadding="false"
+            android:text="조회중입니다. 잠시만 기다려 주세요."
+            android:textColor="@color/color_text_01"
+            android:textSize="@dimen/size_font_04"/>
   </LinearLayout>
 
   <LinearLayout
-      android:id="@+id/llFooterBody"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:gravity="center"
-      android:orientation="vertical"
-      android:paddingBottom="40dp"
-      android:paddingTop="40dp"
-      android:visibility="visible">
+          android:id="@+id/llFooterBody"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center"
+          android:orientation="vertical"
+          android:minHeight="202dp"
+          android:layout_margin="2dp"
+          android:background="@drawable/list_add_bg"
+          android:visibility="visible">
 
     <ImageView
-        android:id="@+id/ivFooterAdd"
-        android:layout_width="55dp"
-        android:layout_height="55dp"
-        android:background="@drawable/d_common_list_btn_big_add"/>
+            android:id="@+id/ivFooterAdd"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:background="@drawable/d_common_list_btn_big_add"/>
 
     <TextView
-        android:id="@+id/tvFooterTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:gravity="center"
-        android:includeFontPadding="false"
-        android:text="@string/layout_nodata_desc_04"
-        android:textColor="@color/color_text_01"
-        android:textSize="@dimen/size_font_05"
-        android:textStyle="bold"
-        android:visibility="visible"/>
+            android:id="@+id/tvFooterTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="@string/layout_nodata_desc_04"
+            android:textColor="@color/color_text_01"
+            android:textSize="@dimen/size_font_04"
+            android:textStyle="bold"
+            android:visibility="visible"/>
   </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

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

@@ -4,170 +4,185 @@
   -->
 
 <LinearLayout
-    android:id="@+id/llRowRoot"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-  <RelativeLayout
-      android:id="@+id/rlRowBody"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:id="@+id/llRowBody"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/llRowRoot"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:paddingBottom="20dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="25dp">
-
-
-      <com.ntels.onecable.common.widget.CircleImageView
-          android:id="@+id/ivRowIcon"
-          android:layout_width="75dp"
-          android:layout_height="75dp"
-          app:civ_border_color="@color/Translucent"
-          app:civ_border_width="0dp"/>
-
-
-      <TextView
-          android:id="@+id/tvRowTitle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="7dp"
-          android:ellipsize="end"
-          android:gravity="center_horizontal"
-          android:includeFontPadding="false"
-          android:singleLine="true"
-          android:text="asdfasdf"
-          android:textColor="@color/color_text_01"
-          android:textSize="@dimen/size_font_04"/>
-
-      <LinearLayout
-          android:id="@+id/llRowControl"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_gravity="center_horizontal"
-          android:layout_marginTop="20dp"
-          android:gravity="center"
-          android:minHeight="35dp"
-          android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/tvRowControl"
-            android:layout_width="wrap_content"
+        android:orientation="vertical">
+
+    <RelativeLayout
+            android:id="@+id/rlRowBody"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:ellipsize="end"
-            android:gravity="center_horizontal"
-            android:includeFontPadding="false"
-            android:singleLine="true"
-            android:text=""
-            android:textColor="@color/color_text_01"
-            android:textSize="@dimen/size_font_03"
-            android:textStyle="bold"/>
+            android:padding="2dp">
 
         <LinearLayout
-            android:id="@+id/llRowControlBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="visible">
-
-          <View
-              android:id="@+id/vEmp1"
-              android:layout_width="0dp"
-              android:layout_height="match_parent"
-              android:layout_weight="1"
-              android:gravity="center_horizontal"/>
-
-          <Button
-              android:id="@+id/btnRowControl"
-              android:layout_width="45dp"
-              android:layout_height="35dp"
-              android:layout_marginRight="5dp"
-              android:background="@drawable/img_things_list_btn_onoff_off"/>
+                android:id="@+id/llRowBody"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:minHeight="202dp"
+                android:background="@drawable/d_list_bg"
+                android:paddingBottom="10dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="24dp"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true">
+
+
+            <com.ntels.onecable.common.widget.CircleImageView
+                    android:id="@+id/ivRowIcon"
+                    android:layout_width="75dp"
+                    android:layout_height="75dp"
+                    android:layout_marginLeft="5dp"
+                    app:civ_border_color="@color/Translucent"
+                    app:civ_border_width="0dp"/>
+
+
+            <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_marginLeft="5dp"
+                    android:layout_height="wrap_content">
+
+                <TextView
+                        android:id="@+id/tvRowTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="27dp"
+                        android:ellipsize="end"
+                        android:layout_alignParentLeft="true"
+                        android:includeFontPadding="false"
+                        android:singleLine="true"
+                        android:text="스마트 플러그"
+                        android:textColor="@color/color_text_01"
+                        android:textSize="@dimen/size_font_04"/>
+
+                <LinearLayout
+                        android:id="@+id/llRowControl"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignBottom="@+id/tvRowTitle"
+                        android:layout_alignParentBottom="true"
+                        android:layout_marginTop="6dp"
+                        android:layout_marginBottom="12dp"
+                        android:gravity="left"
+                        android:orientation="horizontal">
+
+                    <TextView
+                            android:id="@+id/tvRowControl"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="8dp"
+                            android:ellipsize="end"
+                            android:gravity="center_horizontal"
+                            android:includeFontPadding="false"
+                            android:singleLine="true"
+                            android:text="닫힘"
+                            android:textColor="@color/color_text_01"
+                            android:textSize="@dimen/size_font_05"
+                            android:textStyle="bold"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                        android:id="@+id/llRowControlBtn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="visible">
+
+                    <View
+                            android:id="@+id/vEmp1"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_horizontal"/>
+
+                    <Button
+                            android:id="@+id/btnRowControl"
+                            android:layout_width="45dp"
+                            android:layout_height="45dp"
+                            android:background="@drawable/img_things_list_btn_onoff_off"/>
+                </LinearLayout>
+            </RelativeLayout>
+
+            <LinearLayout
+                    android:id="@+id/llRowDelete"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="20dp"
+                    android:gravity="center"
+                    android:minHeight="35dp"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                <ImageView
+                        android:id="@+id/ivRowDelete"
+                        android:layout_width="45dp"
+                        android:layout_height="35dp"
+                        android:layout_marginRight="5dp"
+                        android:background="@drawable/d_img_things_list_btn_delete"
+                        android:duplicateParentState="true"/>
+            </LinearLayout>
+
+            <LinearLayout
+                    android:id="@+id/llRowOffline"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="20dp"
+                    android:gravity="center"
+                    android:minHeight="35dp"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                <TextView
+                        android:id="@+id/tvRowOffline"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:gravity="center_horizontal"
+                        android:includeFontPadding="false"
+                        android:singleLine="true"
+                        android:text="@string/layout_offline"
+                        android:textColor="@color/color_text_01"
+                        android:textSize="@dimen/size_font_03"
+                        android:textStyle="bold"/>
+            </LinearLayout>
         </LinearLayout>
-      </LinearLayout>
-
-      <LinearLayout
-          android:id="@+id/llRowDelete"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_gravity="center_horizontal"
-          android:layout_marginTop="20dp"
-          android:gravity="center"
-          android:minHeight="35dp"
-          android:orientation="horizontal"
-          android:visibility="gone">
 
         <ImageView
-            android:id="@+id/ivRowDelete"
-            android:layout_width="45dp"
-            android:layout_height="35dp"
-            android:layout_marginRight="5dp"
-            android:background="@drawable/d_img_things_list_btn_delete"
-            android:duplicateParentState="true"/>
-      </LinearLayout>
-
-      <LinearLayout
-          android:id="@+id/llRowOffline"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_gravity="center_horizontal"
-          android:layout_marginTop="20dp"
-          android:gravity="center"
-          android:minHeight="35dp"
-          android:orientation="horizontal"
-          android:visibility="gone">
-
-        <TextView
-            android:id="@+id/tvRowOffline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center_horizontal"
-            android:includeFontPadding="false"
-            android:singleLine="true"
-            android:text="@string/layout_offline"
-            android:textColor="@color/color_text_01"
-            android:textSize="@dimen/size_font_03"
-            android:textStyle="bold"/>
-      </LinearLayout>
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/ivCheck"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginTop="15dp"
-        android:background="@drawable/d_common_checkbox"
-        android:visibility="gone"/>
-
-    <LinearLayout
-        android:id="@+id/llLoading"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/llRowBody"
-        android:layout_alignLeft="@+id/llRowBody"
-        android:layout_alignRight="@+id/llRowBody"
-        android:layout_alignTop="@+id/llRowBody"
-        android:background="@drawable/common_bg_alpha_85_w"
-        android:gravity="center">
-
-      <ProgressBar
-          android:id="@+id/progressLoading"
-          android:layout_width="60dp"
-          android:layout_height="60dp"
-          android:indeterminateDrawable="@drawable/d_things_run_loading"
-          android:indeterminateDuration="100"/>
-    </LinearLayout>
-  </RelativeLayout>
+                android:id="@+id/ivCheck"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="15dp"
+                android:background="@drawable/d_common_checkbox"
+                android:visibility="gone"/>
+
+        <LinearLayout
+                android:id="@+id/llLoading"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_alignBottom="@+id/llRowBody"
+                android:layout_alignLeft="@+id/llRowBody"
+                android:layout_alignRight="@+id/llRowBody"
+                android:layout_alignTop="@+id/llRowBody"
+                android:visibility="gone"
+                android:background="@drawable/common_bg_alpha_85_w"
+                android:gravity="center">
+
+            <ProgressBar
+                    android:id="@+id/progressLoading"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:indeterminateDrawable="@drawable/d_things_run_loading"
+                    android:indeterminateDuration="100"/>
+        </LinearLayout>
+    </RelativeLayout>
 </LinearLayout>

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

@@ -1,186 +1,184 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015. Ncomz. All Rights Reserved
-  -->
-
 <LinearLayout
-    android:id="@+id/llPageRoot"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:background="@null"
-    android:orientation="vertical"
-    android:padding="20dp">
-
-  <LinearLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:minWidth="@dimen/width_dialog_01"
-      android:orientation="vertical">
-
-
-    <LinearLayout
-        android:id="@+id/llBody"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/llPageRoot"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@drawable/color_popup_bg_body"
-        android:gravity="center"
-        android:minWidth="280dp"
-        android:orientation="vertical">
+        android:background="@null"
+        android:orientation="vertical"
+        android:padding="25dp">
 
-
-      <com.ntels.onecable.common.widget.CustomScrollView
-          android:id="@+id/svBody"
-          android:layout_width="match_parent"
-          android:layout_height="0dp"
-          android:layout_weight="1"
-          android:background="@drawable/color_bg_01"
-          android:fadingEdge="none">
-
-        <LinearLayout
-            android:id="@+id/llBodyList"
-            android:layout_width="match_parent"
+    <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:minHeight="440dp"
-            android:orientation="vertical"
-            android:padding="40dp">
-
-          <LinearLayout
-              android:id="@+id/llStart"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:gravity="center_horizontal"
-              android:orientation="vertical">
+            android:minWidth="@dimen/width_dialog_01"
+            android:orientation="vertical">
 
 
-            <TextView
-                android:id="@+id/tvDeviceName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:includeFontPadding="false"
-                android:text=""
-                android:textColor="@color/color_text_02"
-                android:textSize="@dimen/size_font_03"
-                android:textStyle="bold"/>
-
-            <TextView
-                android:id="@+id/tvCompanyName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:gravity="center_horizontal"
-                android:includeFontPadding="false"
-                android:text=""
-                android:textColor="@color/color_text_03"
-                android:textSize="@dimen/size_font_04"/>
-
-            <TextView
-                android:id="@+id/tvDeviceDesc"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:gravity="center_horizontal"
-                android:includeFontPadding="false"
-                android:text=""
-                android:textColor="@color/color_text_01"
-                android:textSize="@dimen/size_font_01"
-                android:textStyle="bold"/>
-
-            <ImageView
-                android:id="@+id/ivIconDevice"
-                android:layout_marginTop="40dp"
-                android:layout_width="250dp"
-                android:layout_height="190dp"
-                android:scaleType="fitCenter"/>
-          </LinearLayout>
-
-          <LinearLayout
-              android:id="@+id/llReStart"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:gravity="center_horizontal"
-              android:orientation="vertical"
-              android:visibility="gone">
-
-            <TextView
+        <LinearLayout
+                android:id="@+id/llBody"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:includeFontPadding="false"
-                android:text="@string/layout_things_device_add_01_03"
-                android:textColor="@color/color_text_01"
-                android:textSize="@dimen/size_font_03"
-                android:textStyle="bold"/>
-
-            <Button
-                android:id="@+id/btnReStart"
-                android:layout_width="170dp"
-                android:layout_height="170dp"
-                android:layout_marginTop="70dp"
-                android:background="@drawable/d_img_homemode_bigbtn"
-                android:text="@string/layout_things_device_add_01_04"
-                android:textColor="@color/color_text_04"
-                android:textSize="@dimen/size_font_03"
-                android:textStyle="bold"/>
-          </LinearLayout>
-
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:minWidth="280dp"
+                android:orientation="vertical">
+
+
+            <com.ntels.onecable.common.widget.CustomScrollView
+                    android:id="@+id/svBody"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:fadingEdge="none">
+
+                <LinearLayout
+                        android:id="@+id/llBodyList"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_horizontal"
+                        android:minHeight="440dp"
+                        android:orientation="vertical"
+                        android:background="@drawable/img_popup_bg_dv"
+                        android:padding="40dp">
+
+                    <LinearLayout
+                            android:id="@+id/llStart"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical">
+
+
+                        <TextView
+                                android:id="@+id/tvDeviceName"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_horizontal"
+                                android:includeFontPadding="false"
+                                android:text=""
+                                android:textColor="@color/color_text_02"
+                                android:textSize="@dimen/size_font_03"
+                                android:textStyle="bold"/>
+
+                        <TextView
+                                android:id="@+id/tvCompanyName"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="20dp"
+                                android:gravity="center_horizontal"
+                                android:includeFontPadding="false"
+                                android:text=""
+                                android:textColor="@color/color_text_03"
+                                android:textSize="@dimen/size_font_04"/>
+
+                        <TextView
+                                android:id="@+id/tvDeviceDesc"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="20dp"
+                                android:gravity="center_horizontal"
+                                android:includeFontPadding="false"
+                                android:text=""
+                                android:textColor="@color/color_text_01"
+                                android:textSize="@dimen/size_font_01"
+                                android:textStyle="bold"/>
+
+                        <ImageView
+                                android:id="@+id/ivIconDevice"
+                                android:layout_marginTop="40dp"
+                                android:layout_width="250dp"
+                                android:layout_height="190dp"
+                                android:scaleType="fitCenter"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                            android:id="@+id/llReStart"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:visibility="gone">
+
+                        <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_horizontal"
+                                android:includeFontPadding="false"
+                                android:text="@string/layout_things_device_add_01_03"
+                                android:textColor="@color/color_text_01"
+                                android:textSize="@dimen/size_font_03"
+                                android:textStyle="bold"/>
+
+                        <Button
+                                android:id="@+id/btnReStart"
+                                android:layout_width="170dp"
+                                android:layout_height="170dp"
+                                android:layout_marginTop="70dp"
+                                android:background="@drawable/d_img_homemode_bigbtn"
+                                android:text="@string/layout_things_device_add_01_04"
+                                android:textColor="@color/color_text_04"
+                                android:textSize="@dimen/size_font_03"
+                                android:textStyle="bold"/>
+                    </LinearLayout>
+
+
+                </LinearLayout>
+            </com.ntels.onecable.common.widget.CustomScrollView>
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="@drawable/img_popup_btn_dv"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center">
+
+                <LinearLayout
+                        android:id="@+id/llBtn2"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@drawable/d_img_popup_btn_left"
+                        android:gravity="center">
+
+                    <TextView
+                            android:id="@+id/tvBtn2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@null"
+                            android:includeFontPadding="false"
+                            android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                            android:textSize="@dimen/size_font_09"
+                            android:textStyle="bold"/>
+                </LinearLayout>
+
+                <View
+                        android:id="@+id/vLine"
+                        android:visibility="gone"
+                        style="@style/height_Divider_02"/>
+
+                <LinearLayout
+                        android:id="@+id/llBtn1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@drawable/d_img_popup_btn_right"
+                        android:gravity="center">
+
+                    <TextView
+                            android:id="@+id/tvBtn1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@null"
+                            android:includeFontPadding="false"
+                            android:textColor="@drawable/d_font_color_font_03_color_font_04"
+                            android:textSize="@dimen/size_font_09"
+                            android:textStyle="bold"/>
+                </LinearLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
-      </com.ntels.onecable.common.widget.CustomScrollView>
-
-      <View
-          style="@style/width_Divider_02"/>
-
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="60dp"
-          android:layout_gravity="center_horizontal"
-          android:gravity="center">
-
-        <LinearLayout
-            android:id="@+id/llBtn1"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center">
-
-          <TextView
-              android:id="@+id/tvBtn1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:background="@null"
-              android:includeFontPadding="false"
-              android:text="@string/layout_start"
-              android:textColor="@drawable/d_font_color_font_01_color_font_02"
-              android:textSize="@dimen/size_font_05"
-              android:textStyle="bold"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/llBtn2"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center">
-
-          <TextView
-              android:id="@+id/tvBtn2"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:background="@null"
-              android:includeFontPadding="false"
-              android:text="@string/layout_cancel"
-              android:textColor="@drawable/d_font_color_font_01_color_font_02"
-              android:textSize="@dimen/size_font_05"
-              android:textStyle="bold"/>
-        </LinearLayout>
-
-      </LinearLayout>
     </LinearLayout>
-  </LinearLayout>
-
-</LinearLayout>
+</LinearLayout>

onecable/src/main/res/values/strings_send_url.xml

@@ -77,10 +77,10 @@
 
   <!--3.3 Things(내 장치)   -->
 
-  <!--3.3.1.1 장치 리스트 조회 GET /v3/devices 회원의 장치 목록을 조회한다.-->
+  <!--3.3.1.1 장치 리스트 조회 GET 회원의 장치 목록을 조회한다.-->
   <string name="SEND_G_devices" translatable="false">/customer/%1$s/group/%2$s/device/node</string>
-  <!--3.3.1.2 장치 상세 조회 GET /v3/devices/:device_id/:node_id 해당 노드의 상세 정보를 조회한다. (장치가 보유한 모든 커맨드 클래스 리스트를 보여준다.)-->
-  <string name="SEND_G_devices_device_id" translatable="false">/devices/:device_id/:node_id</string>
+  <!--3.3.1.2 장치 상세 조회 GET 해당 노드의 상세 정보를 조회한다. (장치가 보유한 모든 커맨드 클래스 리스트를 보여준다.)-->
+  <string name="SEND_G_node" translatable="false">/customer/%1$s/group/%2$s/device/%3$s/node/%4$s</string>
   <!--3.3.1.3 장치 명/아이콘 변경 PUT /v3/devices/:device_id/:node_id 장치 이름 또는 아이콘을 변경한다.-->
   <string name="SEND_P_devices_property_device_id" translatable="false">
     /devices/:device_id/:node_id