1. 폰트사이즈 및 이미지 변경.

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

@@ -779,7 +779,7 @@ public interface Constants {
   public static final String KEY_INVITATION = "invitation";
   public static final String KEY_MEMBER_TYPE_CODE = "member_type_code";
   public static final String KEY_MEMBER_IDS = "member_ids";
-  public static final String KEY_INVITATION_HIST_IDS = "invitation_hist_ids";
+  public static final String KEY_RECEIVE_PHONES = "receive_phones";
   public static final String KEY_REQUEST_TIME = "request_time";
   /**
    * [장치 목록]

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

@@ -536,13 +536,13 @@ public class HttpSend {
     /**
      * [DELETE]홈그룹 멤버 강퇴/초대 취소(홈그룹으로 초대받은 멤버의 정보를 변경한다.)
      *
-     * @param key_member_ids          멤버 ID 목록(','로 구분됨)
-     * @param key_invitation_hist_ids 초대 멤버 ID 목록(','로 구분됨)
+     * @param keyMemberIds 멤버 ID 목록(','로 구분됨)
+     * @param keyNicknames 초대 멤버 핸드폰 번호 목록(','로 구분됨)
      */
-    public void D_homegrp_members(String key_member_ids, String key_invitation_hist_ids) {
+    public void deleteHomegrpMembers(String keyMemberIds, String keyNicknames) {
 
         String url = "";
-        String interface_Id = "";
+        String interfaceId = "";
         String sendType = "";
         String body = "";
         String fileParamName = "";
@@ -550,11 +550,12 @@ 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_D_homegrp_members);
+            interfaceId = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_D_homegrp_members, mAppConfig.getCustId(),
+                    mAppConfig.getCtrtGroupId());
             sendType = Constants.SEND_TYPE_DELETE;
-            addParameter(alPost, Constants.KEY_MEMBER_IDS, key_member_ids);
-            addParameter(alPost, Constants.KEY_INVITATION_HIST_IDS, key_invitation_hist_ids);
-            setHttp(url, interface_Id, sendType, alPost, body, fileParamName, filePath, alFilePath);
+            addParameter(alPost, Constants.KEY_MEMBER_IDS, keyMemberIds);
+            addParameter(alPost, Constants.KEY_RECEIVE_PHONES, keyNicknames);
+            setHttp(url, interfaceId, sendType, alPost, body, fileParamName, filePath, alFilePath);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -1621,31 +1622,31 @@ public class HttpSend {
             if (sendType.equals(Constants.SEND_TYPE_POST)) {
                 uriVal = urlVal + interfaceId;
                 sendTypeVal = CustomRequest.HTTP_METHOD_POST;
-                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthToken(), alPost,
+                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthorization(), alPost,
                         CustomRequest.SEND_METHOD);
                 executeRequest(customRequest);
             } else if (sendType.equals(Constants.SEND_TYPE_POST1)) {
                 uriVal = urlVal + interfaceId;
                 sendTypeVal = CustomRequest.HTTP_METHOD_POST;
-                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthToken(), body,
+                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthorization(), body,
                         CustomRequest.SEND_METHOD);
                 executeRequest(customRequest);
             } else if (sendType.equals(Constants.SEND_TYPE_MULTIPART)) {
                 uriVal = urlVal + interfaceId;
                 sendTypeVal = CustomRequest.HTTP_METHOD_MULTIPART;
-                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthToken(), alPost,
+                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthorization(), alPost,
                         fileParamName, filePath, CustomRequest.SEND_METHOD);
                 executeRequest(customRequest);
             } else if (sendType.equals(Constants.SEND_TYPE_MULTIPART1)) {
                 uriVal = urlVal + interfaceId;
                 sendTypeVal = CustomRequest.HTTP_METHOD_MULTIPART;
-                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthToken(), alPost,
+                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthorization(), alPost,
                         fileParamName, alFilePath, CustomRequest.SEND_METHOD);
                 executeRequest(customRequest);
             } else if (sendType.equals(Constants.SEND_TYPE_DELETE)) {
                 uriVal = urlVal + interfaceId + sParam;
                 sendTypeVal = CustomRequest.HTTP_METHOD_DELETE;
-                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthToken(), "",
+                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthorization(), "",
                         CustomRequest.SEND_METHOD);
                 executeRequest(customRequest);
                 //            } else if ( sendType.equals(Constants.SEND_TYPE_DELETE1) ) {
@@ -1657,19 +1658,19 @@ public class HttpSend {
             } else if (sendType.equals(Constants.SEND_TYPE_GET)) {
                 uriVal = urlVal + interfaceId + sParam;
                 sendTypeVal = CustomRequest.HTTP_METHOD_GET;
-                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthToken(), "",
+                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthorization(), "",
                         CustomRequest.SEND_METHOD);
                 executeRequest(customRequest);
             } else if (sendType.equals(Constants.SEND_TYPE_PUT)) {
                 uriVal = urlVal + interfaceId + sParam;
                 sendTypeVal = CustomRequest.HTTP_METHOD_PUT;
-                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthToken(), alPost,
+                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthorization(), alPost,
                         CustomRequest.SEND_METHOD);
                 executeRequest(customRequest);
             } else if (sendType.equals(Constants.SEND_TYPE_PUT1)) {
                 uriVal = urlVal + interfaceId + sParam;
                 sendTypeVal = CustomRequest.HTTP_METHOD_PUT;
-                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthToken(), body,
+                CustomRequest customRequest = new CustomRequest(bDialog, sendTypeVal, uriVal, mAppConfig.getAuthorization(), body,
                         CustomRequest.SEND_METHOD);
                 executeRequest(customRequest);
             }

onecable/src/main/java/com/ntels/onecable/view/homemember/FragmentHomeMember.java

@@ -506,12 +506,12 @@ public class FragmentHomeMember extends Fragment implements View.OnClickListener
                                 + alTotalList.get(row).get(Constants.KEY_MEMBER_ID);
                     } else {
                         temp1 += (temp1.equals("") ? "" : ",")
-                                + alTotalList.get(row).get(Constants.KEY_INVITATION_HIST_ID);
+                                + alTotalList.get(row).get(Constants.KEY_NICKNAME);
                     }
                 }
             }
 
-            httpSend.D_homegrp_members(temp, temp1);
+            httpSend.deleteHomegrpMembers(temp, temp1);
         } catch (Exception ex) {
             ex.printStackTrace();
         }
@@ -661,14 +661,13 @@ public class FragmentHomeMember extends Fragment implements View.OnClickListener
                 break;
             case Constants.MSG996:
                 if (btnResult == 1) {
-                    // TODO: 2017-03-28 멤버 삭제 API 호출
+                    loading = true;
+                    comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_D_HOMEGRP_MEMBERS), 10);
                 }
                 break;
             case Constants.MSG807:
                 if (btnResult == 1) {
                     comHandler.sendMessageDelayed(comHandler.obtainMessage(type), 10);
-                } else {
-                    act.onBackPressed();
                 }
                 break;
             default:

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

@@ -226,7 +226,7 @@
                                 android:singleLine="true"
                                 android:textColor="@color/color_text_01"
                                 android:textColorHint="@color/color_text_03"
-                                android:textSize="@dimen/size_font_01">
+                                android:textSize="@dimen/size_font_04">
 
                         </TextView>
                     </LinearLayout>
@@ -269,7 +269,8 @@
                         android:includeFontPadding="false"
                         android:text="@string/layout_cancel"
                         android:textColor="@drawable/d_font_color_font_01_color_font_02"
-                        android:textSize="@dimen/size_font_09"/>
+                        android:textSize="@dimen/size_font_09"
+                        android:textStyle="bold"/>
             </LinearLayout>
 
             <View
@@ -290,7 +291,8 @@
                         android:background="@null"
                         android:text="@string/layout_ok"
                         android:textColor="@color/color_text_04"
-                        android:textSize="@dimen/size_font_09"/>
+                        android:textSize="@dimen/size_font_09"
+                        android:textStyle="bold"/>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -41,7 +41,7 @@
       android:layout_height="wrap_content"
       android:gravity="center"
       android:orientation="vertical"
-      android:minHeight="202dp"
+      android:minHeight="210dp"
       android:layout_margin="2dp"
       android:background="@drawable/list_add_bg"
       android:visibility="visible">

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

@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:orientation="vertical"
-                android:minHeight="202dp"
+                android:minHeight="210dp"
                 android:background="@drawable/d_list_bg"
                 android:paddingBottom="22dp"
                 android:paddingLeft="15dp"

onecable/src/main/res/values-en/strings_layout.xml

@@ -67,6 +67,8 @@
   <string name="layout_homemember_add_05"><![CDATA["퀴즈를 선택하세요."]]></string>
   <string name="layout_homemember_add_06"><![CDATA["Enter answer"]]></string>
   <string name="layout_homemember_add_07"><![CDATA["Invite"]]></string>
+  <string name="layout_homemember_add_08"><![CDATA["초대할 멤버의 휴대폰 번호"]]></string>
+  <string name="layout_homemember_add_09"><![CDATA["멤버 초대는 초대한 시점부터 익일 오전 6시까지만 유효합니다."]]></string>
 
   <string name="layout_message_center_01"><![CDATA["Message box"]]></string>
   <string name="layout_message_center_02"><![CDATA["View"]]></string>

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

@@ -28,14 +28,14 @@
   <dimen name="MyActionBar_Height">50dp</dimen>
 
   <dimen name="size_font_01">12dp</dimen>
-  <dimen name="size_font_02">16dp</dimen>
-  <dimen name="size_font_03">15dp</dimen>
-  <dimen name="size_font_04">14dp</dimen>
-  <dimen name="size_font_05">18dp</dimen>
-  <dimen name="size_font_06">12dp</dimen>
-  <dimen name="size_font_07">30dp</dimen>
-  <dimen name="size_font_08">18dp</dimen>
-  <dimen name="size_font_09">15dp</dimen>
+  <dimen name="size_font_02">18dp</dimen>
+  <dimen name="size_font_03">17dp</dimen>
+  <dimen name="size_font_04">16dp</dimen>
+  <dimen name="size_font_05">22dp</dimen>
+  <dimen name="size_font_06">14dp</dimen>
+  <dimen name="size_font_07">34dp</dimen>
+  <dimen name="size_font_08">20dp</dimen>
+  <dimen name="size_font_09">17dp</dimen>
   <!--<dimen name="size_font_01">13dp</dimen>-->
   <!--<dimen name="size_font_02">15dp</dimen>-->
   <!--<dimen name="size_font_03">16dp</dimen>-->

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

@@ -69,7 +69,7 @@
   <string name="layout_homemember_add_06"><![CDATA["정답 날짜 입력"]]></string>
   <string name="layout_homemember_add_07"><![CDATA["초대"]]></string>
   <string name="layout_homemember_add_08"><![CDATA["초대할 멤버의 휴대폰 번호"]]></string>
-  <string name="layout_homemember_add_09"><![CDATA["멤버 초대는 초대한 시점부터 익일 오전 6시까지만\n유효합니다."]]></string>
+  <string name="layout_homemember_add_09"><![CDATA["멤버 초대는 초대한 시점부터 익일 오전 6시까지만 유효합니다."]]></string>
 
   <string name="layout_message_center_01"><![CDATA["메시지 박스"]]></string>
   <string name="layout_message_center_02"><![CDATA["확인하기"]]></string>

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

@@ -36,8 +36,8 @@
   <string name="SEND_G_homegrp_members" translatable="false">/customer/%1$s/group/%2$s/member</string>
   <!--3.2.1.3 홈그룹 멤버 초대 POST /v3/homegrp_members 홈그룹의 멤버를 초대한다.-->
   <string name="SEND_P_homegrp_members" translatable="false">/homegrp_members</string>
-  <!--3.2.1.4 홈그룹 멤버 강퇴 / 초대 취소 DELETE /v3/homegrp_members 홈그룹으로 초대받은 멤버의 정보를 변경한다.-->
-  <string name="SEND_D_homegrp_members" translatable="false">/homegrp_members</string>
+  <!--R.8.4 홈그룹 멤버 강퇴 / 초대 취소 DELETE /customer/{cust_id}/group/{ctrt_grp_id}/member (소속된)홈그룹의 멤버를 강퇴하거나 초대를 취소한다.-->
+  <string name="SEND_D_homegrp_members" translatable="false">/customer/%1$s/group/%2$s/member</string>
   <!--3.2.1.6 홈그룹 초대 알림 POST /v3/homegrp_members/invitations 홈초대 알림 화면에서 승락/거절 처리를 한다. (+ 초대 수락 처리 후에 나머지 요청은 거절한다.)-->
   <string name="SEND_P_homegrp_members_invitations" translatable="false">
     /homegrp_members/invitations