1. 사용자 푸시 노티 수신여부 설정 완료.

2. 서비스 약관, 개인 정보 처리 방침 임시 url 연결.

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

@@ -116,6 +116,9 @@ public interface Constants {
   //    final static int KEY_URL = KEY_URL_KNEET_V2;
   //    final static int KEY_URL = KEY_URL_KNEET_V2_DEV_CUSTOM;
 
+  String URL_TERMS_OF_SERVICE = "http://61.40.220.23:7794/document/terms.html";
+  String URL_TERMS_OF_POLICY = "http://61.40.220.23:7794/document/private-polish.html";
+
   static final char MASK_CHAR = '*';
   // 구글이나 아니냔
   final static String PACKAGE_NAME1 = "com.ntels.onecable";

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

@@ -1522,15 +1522,14 @@ public class HttpSend {
     }
 
     /**
-     * [PUT]알림 수신 여부 설정(알림 수신 여부를 설정 한다. (예 : 홈모드가 바뀔 때, 집이 빌 때))
+     * [PUT]회원의 푸시 노티 수신여부를 설정(예 : 홈모드가 바뀔 때).
      *
      * @param keyPushTypeModeChgYn  모드가 바뀔 때 알림 설정 여부 (Y : 받음, N : 안받음)
-     * @param keyPushTypePrsncChgYn 집이 빌때 알림 설정 여부 (Y : 받음, N : 안받음)
      */
-    public void P_member_push_noti(String keyPushTypeModeChgYn, String keyPushTypePrsncChgYn) {
+    public void putMemberPushNoti(String keyPushTypeModeChgYn) {
 
         String url = "";
-        String interface_Id = "";
+        String interfaceId = "";
         String sendType = "";
         String body = "";
         String fileParamName = "";
@@ -1538,12 +1537,12 @@ public class HttpSend {
         ArrayList<HashMap<String, Object>> alPost = new ArrayList<HashMap<String, Object>>();
         ArrayList<String> alFilePath = new ArrayList<String>();
         try {
-            interface_Id = mUtil.getString(context, R.string.API_VERSION) + mUtil.getString(context, R.string.SEND_P_member_push_noti);
+            interfaceId = mUtil.getString(context, R.string.API_VERSION) + mUtil.getString(context, R.string.SEND_P_member_push_noti, mAppConfig.getCustId(),
+                    mAppConfig.getCtrtGroupId(), mAppConfig.getLoginMemberId());
             sendType = Constants.SEND_TYPE_PUT;
             /* 이메일 ID */
             addParameter(alPost, Constants.KEY_PUSH_TYPE_MODE_CHG_YN, keyPushTypeModeChgYn);
-            addParameter(alPost, Constants.KEY_PUSH_TYPE_PRSNC_CHG_YN, keyPushTypePrsncChgYn);
-            setHttp(url, interface_Id, sendType, alPost, body, fileParamName, filePath, alFilePath);
+            setHttp(url, interfaceId, sendType, alPost, body, fileParamName, filePath, alFilePath);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -36,10 +36,12 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import java.util.HashMap;
 
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 import static com.ntels.onecable.common.Constants.EXTRA_ERROR_CODE;
@@ -78,6 +80,7 @@ public class Setting extends CustomActivity implements View.OnClickListener,
     private int alarmType = 0;
     private SwipeRefreshLayout mSwipeRefreshLayout;
     private boolean loading = false;
+    @BindView(R.id.tvQuiz) TextView mQuiz;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -164,6 +167,7 @@ public class Setting extends CustomActivity implements View.OnClickListener,
         }
         mUtil.getTextView(mActivity, R.id.tvCellphone).setText(mUtil.insertHyphenPhone(mAppConfig.getPhone()));
         mUtil.getTextView(mActivity, R.id.tvAppVersion).setText(mUtil.getVersionName(mActivity));
+        mQuiz.setText(mAppConfig.getQuiz());
 
         mIsAutoLogin = mAppConfig.getIsAutoLogin();
         mIsSaveId = mAppConfig.getSaveId();
@@ -236,18 +240,18 @@ public class Setting extends CustomActivity implements View.OnClickListener,
                     pushTypeModeChgYn = "Y";
                     alarmType = ALRAM_MODE_ON;
                 }
-                mComHandler.sendMessageDelayed(mComHandler.obtainMessage(MSG_COM_P_MEMBER_PUSH_NOTI), 10);
+                mComHandler.sendMessageDelayed(mComHandler.obtainMessage(MSG_COM_P_MEMBER_PUSH_NOTI), Constants.HANDLER_DELAY_MILLIS);
                 break;
             case R.id.llGotoService:
                 mIntent = new Intent(Intent.ACTION_VIEW);
                 mIntent.addCategory(Intent.CATEGORY_DEFAULT);
-                mIntent.setData(Uri.parse("http://home-api.allofthings.com/guide/20001/service"));
+                mIntent.setData(Uri.parse(Constants.URL_TERMS_OF_SERVICE));
                 startActivity(mIntent);
                 break;
             case R.id.llGotoPolicy:
                 mIntent = new Intent(Intent.ACTION_VIEW);
                 mIntent.addCategory(Intent.CATEGORY_DEFAULT);
-                mIntent.setData(Uri.parse("http://home-api.allofthings.com/guide/20001/policy"));
+                mIntent.setData(Uri.parse(Constants.URL_TERMS_OF_POLICY));
                 startActivity(mIntent);
                 break;
             case R.id.btnWithdrawal:
@@ -337,7 +341,7 @@ public class Setting extends CustomActivity implements View.OnClickListener,
             });
 
             //공통 변수 입력
-            httpSend.P_member_push_noti(pushTypeModeChgYn, pushTypeRuleExcYn);
+            httpSend.putMemberPushNoti(pushTypeModeChgYn);
         } catch (Exception ex) {
             ex.printStackTrace();
         }
@@ -356,18 +360,14 @@ public class Setting extends CustomActivity implements View.OnClickListener,
                 //                Dlog.v(alarmType);
                 if (alarmType == ALRAM_MODE_ON) {
                     mAppConfig.setPush_Type_Mode_Chg_Yn("Y");
-                    tempMsgNum = R.string.MSG815;
+//                    tempMsgNum = R.string.MSG815;
                 } else if (alarmType == ALRAM_MODE_OFF) {
                     mAppConfig.setPush_Type_Mode_Chg_Yn("N");
-                    tempMsgNum = R.string.MSG816;
-                } else if (alarmType == ALRAM_RULE_ON) {
-                    mAppConfig.setPush_Type_Prsnc_Chg_Yn("Y");
-                    tempMsgNum = R.string.MSG815;
-                } else if (alarmType == ALRAM_RULE_OFF) {
-                    mAppConfig.setPush_Type_Prsnc_Chg_Yn("N");
-                    tempMsgNum = R.string.MSG816;
-                }
-                mUtil.setShowToast(mActivity, mUtil.getString(mActivity, tempMsgNum), Toast.LENGTH_SHORT);
+//                    tempMsgNum = R.string.MSG816;
+                } else {
+
+                }
+//                mUtil.setShowToast(mActivity, mUtil.getString(mActivity, tempMsgNum), Toast.LENGTH_SHORT);
                 setDisp();
             } else {
                 JSONObject joResult = new JSONObject(response.getContent());
@@ -382,10 +382,12 @@ public class Setting extends CustomActivity implements View.OnClickListener,
                 } else {
                     mCustomDialog.msgAlert(mActivity, Constants.MSG000, errorMsg);
                 }
+                mUtil.getView(mActivity, R.id.llAlramHomeMode).setEnabled(true);
             }
         } catch (Exception ex) {
             ex.printStackTrace();
             mCustomDialog.msgAlert(mActivity, Constants.MSG807);
+            mUtil.getView(mActivity, R.id.llAlramHomeMode).setEnabled(true);
         }
     }
 

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

@@ -338,7 +338,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_weight="1"
                                             style="@style/list_detail_text"
-                                            android:text="@string/layout_setting_12"/>
+                                            android:text="@string/layout_setting_13"/>
                                     <ImageView
                                             android:layout_width="23dp"
                                             android:layout_height="15dp"

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

@@ -139,8 +139,8 @@
     <!--3.6.4.1 야후날씨 지역코드 목록 조회 GET /v3/codes/weather_location 야후 날씨에 사용할 지역코드목록을 조회한다.-->
     <string name="SEND_G_common_weather_location_codes" translatable="false">/codes/weather_location
   </string>
-    <!--3.1.1.11 알림 수신 여부 설정 PUT /v3/member/push_noti/config 알림 수신 여부를 설정 한다. (예 : 홈모드가 바뀔 때, 집이 빌 때)-->
-    <string name="SEND_P_member_push_noti" translatable="false">/member/push_noti/config</string>
+    <!--R.7.12 회원의 푸시 노티 수신여부를 설정한다. PUT /customer/{cust_id}/group/{ctrt_grp_id}/member/{member_id}/push/noti 알림 수신 여부를 설정 한다. (예 : 홈모드가 바뀔 때)-->
+    <string name="SEND_P_member_push_noti" translatable="false">/customer/%1$s/group/%2$s/member/%3$s/push/noti</string>
 
     <!-- Cloud Gateway -->