[REST API 수정]

    - 3.1.1.13 회원 탈퇴(계정 삭제) - 수정했지만 사용안함
    - 3.2.1.7 홈그룹(자진) 탈퇴
    - 3.3.1.3 디바이스 속성 변경

kneet_v2/src/main/java/com/ntels/kneet/v2/common/http/HttpSend.java

@@ -471,7 +471,7 @@ public class HttpSend {
      * 5. Created   : 2015. 10.
      * </PRE>
      */
-    public void D_member_member_id(String sHTTP_member_id, String sHTTP_password) {
+    public void D_member_member_id() {
 
         String sUrl = "";
         String sInterface_Id = "";
@@ -485,9 +485,9 @@ public class HttpSend {
             sInterface_Id = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_D_member_member_id);
             sSendType = Constants.SEND_TYPE_DELETE;
             //sInterface_Id = util.convGetRestReplace(sInterface_Id, Constants.HTTP_device_id, sHTTP_device_id);
-            sInterface_Id = util.convGetRestReplace(sInterface_Id, Constants.HTTP_member_id, sHTTP_member_id);
+            //sInterface_Id = util.convGetRestReplace(sInterface_Id, Constants.HTTP_member_id, sHTTP_member_id);
             /** 비밀번호 */
-            addParameter(alPost, Constants.HTTP_password, sHTTP_password);
+            //addParameter(alPost, Constants.HTTP_password, sHTTP_password);
             setHttp(sUrl, sInterface_Id, sSendType, alPost, sBody, sFileParamName, sFilePath, alFilePath);
         } catch (Exception e) {
             e.printStackTrace();
@@ -904,7 +904,7 @@ public class HttpSend {
      * 5. Created   : 2015. 10.
      * </PRE>
      */
-    public void D_homegrp_members_member_id(String sHTTP_member_id) {
+    public void D_homegrp_members_member_id() {
 
         String sUrl = "";
         String sInterface_Id = "";
@@ -917,10 +917,6 @@ public class HttpSend {
         try {
             sInterface_Id = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_D_homegrp_members_member_id);
             sSendType = Constants.SEND_TYPE_DELETE;
-            //            /** 이름 */
-            sInterface_Id = util.convGetRestReplace(sInterface_Id, Constants.HTTP_member_id, sHTTP_member_id);
-            //            /** 이름 */
-            //            addParameter(alPost, Constants.HTTP_, sHTTP_);
             setHttp(sUrl, sInterface_Id, sSendType, alPost, sBody, sFileParamName, sFilePath, alFilePath);
         } catch (Exception e) {
             e.printStackTrace();
@@ -1480,7 +1476,7 @@ public class HttpSend {
      * 5. Created   : 2015. 10.
      * </PRE>
      */
-    public void P_devices_property_device_id(String sHTTP_device_id, String sHTTP_device_name) {
+    public void P_devices_property_device_id(String sHTTP_device_id, String sHTTP_node_id, String sHTTP_device_name) {
 
         String sUrl = "";
         String sInterface_Id = "";
@@ -1492,9 +1488,9 @@ public class HttpSend {
         ArrayList<String> alFilePath = new ArrayList<String>();
         try {
             sInterface_Id = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_P_devices_property_device_id);
-            sSendType = Constants.SEND_TYPE_POST;
+            sSendType = Constants.SEND_TYPE_PUT;
             sInterface_Id = util.convGetRestReplace(sInterface_Id, Constants.HTTP_device_id, sHTTP_device_id);
-            //            addParameter(alPost, Constants.HTTP_image_sequence, sHTTP_image_sequence);
+            sInterface_Id = util.convGetRestReplace(sInterface_Id, Constants.HTTP_node_id, sHTTP_node_id);
             addParameter(alPost, Constants.HTTP_device_name, sHTTP_device_name);
             setHttp(sUrl, sInterface_Id, sSendType, alPost, sBody, sFileParamName, sFilePath, alFilePath);
         } catch (Exception e) {

kneet_v2/src/main/java/com/ntels/kneet/v2/view/Login.java

@@ -343,7 +343,7 @@ public class Login extends CustomActivity implements View.OnClickListener,
             //언어 코드 (ex: en)
             String sLANG = "ko";
             //인증 토큰
-            String sAUTH_TOKEN = "EAEAihAcWyP9GN1hRz6x72EjIi5CnCZWsJrPhz0uLt5ltNjbqglfbeTEWzj4YgGXz/Jru/8uQQfVP5DvIiwr8qYOscQVwR98";
+            String sAUTH_TOKEN = "EAEAihAcWyMeIHW9Ye3LQETa+Mku5ZUOsJrPhz0uLt5ltNjbqglfbeTEWzj4YgGXz/Jru/8uQQfVP5DvIiwr8qYOscQVwR98";
 
             //회원이미지 추가
             /*String sIMAGE_FILE_NAME = "";

kneet_v2/src/main/java/com/ntels/kneet/v2/view/Main.java

@@ -522,7 +522,7 @@ public class Main extends CustomActionBarActivity implements View.OnClickListene
                     result_D_homegrp_members_member_id(result);
                 }
             });
-            httpSend.D_homegrp_members_member_id(appConfig.getLogin_Member_Id());
+            httpSend.D_homegrp_members_member_id();
         } catch (Exception ex) {
             ex.printStackTrace();
         }

kneet_v2/src/main/java/com/ntels/kneet/v2/view/things/Things_Detail.java

@@ -762,6 +762,7 @@ public class Things_Detail extends CustomActionBarActivity implements View.OnCli
                         hmTemp.put(Constants.HTTP_device_id, sHTTP_device_id);
                         hmTemp.put(Constants.HTTP_device_mf_id, sHTTP_device_mf_id);
                         hmTemp.put(Constants.HTTP_online_state, sHTTP_online_state);
+                        hmTemp.put(Constants.HTTP_node_id, sHTTP_node_id);
                         alTotalList.add(hmTemp);
                     }
                 }
@@ -908,9 +909,11 @@ public class Things_Detail extends CustomActionBarActivity implements View.OnCli
                         case 2:
                             String sHTTP_device_id = util.null2string(alTotalList.get(0).get(Constants.HTTP_device_id));
                             String sHTTP_device_name = util.null2string(alTotalList.get(0).get(Constants.HTTP_device_name));
+                            String sHTTP_node_id = util.null2string(alTotalList.get(0).get(Constants.HTTP_node_id));
                             intent = new Intent(act, Things_Name_Change.class);
                             intent.putExtra(Constants.EXTRA_DEVICE_ID, sHTTP_device_id);
                             intent.putExtra(Constants.EXTRA_DEVICE_NAME, sHTTP_device_name);
+                            intent.putExtra(Constants.EXTRA_NODE_ID, sHTTP_node_id);
                             util.callActivityForResultNoAnim(act, intent, Constants.ACT_THINGS_NAME_CHANGE);
                             break;
                         case 3:

kneet_v2/src/main/java/com/ntels/kneet/v2/view/things/Things_Name_Change.java

@@ -60,6 +60,7 @@ public class Things_Name_Change extends CustomActivity implements View.OnClickLi
     private String       sHTTP_image_file_name  = "";
     private String       sDEVICE_ID             = "";
     private String       sDEVICE_NAME           = "";
+    private String       sNODE_ID               = "";
 
     /**
      * <PRE>
@@ -102,6 +103,7 @@ public class Things_Name_Change extends CustomActivity implements View.OnClickLi
             sCallType = intent.getStringExtra(Constants.EXTRA_CALL_TYPE);
             sDEVICE_ID = intent.getStringExtra(Constants.EXTRA_DEVICE_ID);
             sDEVICE_NAME = intent.getStringExtra(Constants.EXTRA_DEVICE_NAME);
+            sNODE_ID = intent.getStringExtra(Constants.EXTRA_NODE_ID);
         }
 
         util.getView(act, R.id.llBtn1).setOnClickListener(this);
@@ -181,7 +183,7 @@ public class Things_Name_Change extends CustomActivity implements View.OnClickLi
                     result_P_devices_property_device_id(result);
                 }
             });
-            httpSend.P_devices_property_device_id(sDEVICE_ID, sDEVICE_NAME);
+            httpSend.P_devices_property_device_id(sDEVICE_ID, sNODE_ID, sDEVICE_NAME);
 
         } catch (Exception ex) {
             ex.printStackTrace();

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

@@ -31,8 +31,8 @@
     <string name="SEND_P_member_member_id_update_field" translatable="false">/member/:update_field</string>
     <!--3.1.1.7 (기존) 비밀번호 확인 GET /v3/member/password 비밀번호 정보를 확인한다.-->
     <string name="SEND_G_member_member_id" translatable="false">/member/password</string>
-    <!--11.3 회원 탈퇴 (계정 삭제) DELETE /v2/member/:member_id 회원의 계정을 삭제 처리한다.-->
-    <string name="SEND_D_member_member_id" translatable="false">/member/:member_id</string>
+    <!--3.1.1.13 회원 탈퇴 (계정 삭제) DELETE /v3/member 회원의 계정을 삭제 처리한다.-->
+    <string name="SEND_D_member_member_id" translatable="false">/member</string>
     <!--11.4 [페기] 홈그룹 이름 변경 POST /v2/homegrp/name 회원의 홈그룹 이름을 변경한다.-->
     <string name="SEND_P_homegrp_name" translatable="false">/homegrp/name</string>
     <!--11.5 [폐기] 홈그룹 홈 위치 설정 POST /v2/homegrp/location 회원의 홈그룹 위치 정보를 등록 또는 변경 한다.-->
@@ -67,8 +67,8 @@
     <string name="SEND_G_homegrp_members_invitations" translatable="false">/homegrp_members/invitations</string>
     <!--12.10 홈그룹 정보조회 GET /v2/homegrp/:homegrp_id 홈그룹 정보를 조회한다.-->
     <string name="SEND_G_homegrp_homegrp_id" translatable="false">/homegrp/:homegrp_id</string>
-    <!--12.11 홈그룹 (자진) 탈퇴 DELETE /v2/homegrp_members/:member_id 일반 등급의 홈그룹 멤버를 홈그룹에서 자진 탈퇴 처리한다.-->
-    <string name="SEND_D_homegrp_members_member_id" translatable="false">/homegrp_members/:member_id</string>
+    <!--3.2.1.7 홈그룹 (자진) 탈퇴 DELETE /v3/homegrp_members/self 일반 등급의 홈그룹 멤버를 홈그룹에서 자진 탈퇴 처리한다.-->
+    <string name="SEND_D_homegrp_members_member_id" translatable="false">/homegrp_members/self</string>
 
     <!--20 대시보드/홈로그/홈모드   -->
     <!--20.1 홈모드 조회 GET /v2/modes 홈그룹의 홈모드 목록을 불러온다.-->
@@ -99,8 +99,8 @@
     <string name="SEND_P_devices_device_id_nodes_node_id_commands" translatable="false">/devices/:device_id/nodes/:node_id/commands</string>
     <!--30.4 노드(커맨드클래스) 마지막 상태 값 조회 GET /v2/devices/:device_id/nodes/:node_id/status 해당 노드(커맨드클래스)의 마지막 상태 값을 조회한다.-->
     <string name="SEND_G_devices_device_id_nodes_node_id_status" translatable="false">/devices/:device_id/nodes/:node_id/status</string>
-    <!--30.5 장치 명/아이콘 변경 POST /v2/devices/property/:device_id 장치 이름 또는 아이콘을 변경한다.-->
-    <string name="SEND_P_devices_property_device_id" translatable="false">/devices/property/:device_id</string>
+    <!--30.5 장치 명/아이콘 변경 PUT /v3/devices/:device_id/:node_id 장치 이름 또는 아이콘을 변경한다.-->
+    <string name="SEND_P_devices_property_device_id" translatable="false">/devices/:device_id/:node_id</string>
     <!--30.6 장치 아이콘 목록 조회 GET /v2/devices/icons/:device_id 장치 유형별 선택할 수 있는 아이콘 목록을 조회한다.-->
     <string name="SEND_G_devices_icons_device_id" translatable="false">/devices/icons/:device_id</string>
     <!--30.7 장치 삭제 DELETE /v2/devices/:device_id 장치를 삭제하고 규칙/제어를 정지상태로 변경한다.-->