Jelajahi Sumber

[REST API 수정]
- 3.5.1.2 현재 모드 변경
- 3.6.2.3 알림 목록 조회

aaron 9 tahun lalu
induk
melakukan
18d6612d29

+ 2 - 1
kneet_v2/src/main/java/com/ntels/kneet/v2/common/AppConfig.java

@@ -392,7 +392,8 @@ public class AppConfig extends MultiDexApplication {
     }
     public String getSelect_Homegrp_Homehub_Online_State() {
 
-        return sSelect_Homegrp_Homehub_Online_State;
+        // TODO : 테스트 끝나면 주석해제.
+        return "ON";//sSelect_Homegrp_Homehub_Online_State;
     }
 
     public void setPush_Type_Mode_Chg_Yn(String str) {

+ 1 - 1
kneet_v2/src/main/java/com/ntels/kneet/v2/common/Constants.java

@@ -797,7 +797,7 @@ public interface Constants {
     final static String HTTP_rules                     = "rules";
     final static String HTTP_active_count              = "active_count";
     final static String HTTP_notice_list               = "notice_list";
-    final static String HTTP_push_hist_id              = "push_hist_id";
+    final static String HTTP_push_noti_hist_id         = "push_noti_hist_id";
     /** 제품명 */
     final static String HTTP_prd_name                  = "prd_name";
     /** 모델넘버 */

+ 4 - 9
kneet_v2/src/main/java/com/ntels/kneet/v2/common/http/HttpSend.java

@@ -1104,13 +1104,8 @@ 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_modes_mode_id_current_mode);
-            sSendType = Constants.SEND_TYPE_POST;
-
-            sInterface_Id = util.convGetRestReplace(sInterface_Id, Constants.HTTP_mode_id, sHTTP_mode_id);
-            //            /** 이름 */
-            //            sInterface_Id = util.convGetRestReplace(sInterface_Id, Constants.HTTP_member_id, sHTTP_member_id);
-            //            /** 이름 */
-            //            addParameter(alPost, Constants.HTTP_, sHTTP_);
+            sSendType = Constants.SEND_TYPE_PUT;
+            addParameter(alPost, Constants.HTTP_mode_id, sHTTP_mode_id);
             setHttp(sUrl, sInterface_Id, sSendType, alPost, sBody, sFileParamName, sFilePath, alFilePath);
         } catch (Exception e) {
             e.printStackTrace();
@@ -1252,7 +1247,7 @@ public class HttpSend {
      * 5. Created   : 2015. 10.
      * </PRE>
      */
-    public void G_notices_personal(String sHTTP_push_hist_id, String sHTTP_paging_type) {
+    public void G_notices_personal(String sHTTP_push_noti_hist_id, String sHTTP_paging_type) {
 
         String sUrl = "";
         String sInterface_Id = "";
@@ -1266,7 +1261,7 @@ public class HttpSend {
             sInterface_Id = util.getString(context, R.string.API_VERSION) + util.getString(context, R.string.SEND_G_notices_personal);
             sSendType = Constants.SEND_TYPE_GET;
             /** 이메일 인증키 */
-            addParameter(alPost, Constants.HTTP_push_hist_id, sHTTP_push_hist_id);
+            addParameter(alPost, Constants.HTTP_push_noti_hist_id, sHTTP_push_noti_hist_id);
             addParameter(alPost, Constants.HTTP_paging_type, sHTTP_paging_type);
             setHttp(sUrl, sInterface_Id, sSendType, alPost, sBody, sFileParamName, sFilePath, alFilePath);
         } catch (Exception e) {

+ 1 - 1
kneet_v2/src/main/java/com/ntels/kneet/v2/view/main_more/Message_Center.java

@@ -347,7 +347,7 @@ public class Message_Center extends CustomActionBarActivity implements View.OnCl
                     for ( int iRow = 0; iRow < alList.size(); iRow++ ) {
                         HashMap<String, Object> hmTemp = new HashMap<String, Object>();
                         hmTemp = alList.get(iRow);
-                        String sHTTP_push_hist_id = hmTemp.get(Constants.HTTP_push_hist_id).toString();
+                        String sHTTP_push_hist_id = hmTemp.get(Constants.HTTP_push_noti_hist_id).toString();
                         if ( sMinHist_id.equals("") ) {
                             sMinHist_id = sHTTP_push_hist_id;
                         } else if ( util.str2long(sMinHist_id) > util.str2long(sHTTP_push_hist_id) ) {

+ 1 - 1
kneet_v2/src/main/java/com/ntels/kneet/v2/view/main_more/Message_Center_Adapter.java

@@ -198,7 +198,7 @@ public class Message_Center_Adapter extends RecyclerView.Adapter<RecyclerView.Vi
             if ( holder instanceof vhItem ) {
                 vhItem vhItemView = (vhItem) holder;
 
-                String sHTTP_push_hist_id = util.null2string(hmItem.get(Constants.HTTP_push_hist_id));
+                String sHTTP_push_hist_id = util.null2string(hmItem.get(Constants.HTTP_push_noti_hist_id));
                 String sHTTP_content = util.null2string(hmItem.get(Constants.HTTP_content));
                 String sHTTP_create_datetime = util.null2string(hmItem.get(Constants.HTTP_create_datetime));
                 String sHTTP_read_datetime = util.null2string(hmItem.get(Constants.HTTP_read_datetime));

+ 1 - 1
kneet_v2/src/main/java/com/ntels/kneet/v2/view/main_more/Notice_Adapter.java

@@ -192,7 +192,7 @@ public class Notice_Adapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             if ( holder instanceof vhItem ) {
                 vhItem vhItemView = (vhItem) holder;
 
-                String sHTTP_push_hist_id = util.null2string(hmItem.get(Constants.HTTP_push_hist_id));
+                String sHTTP_push_hist_id = util.null2string(hmItem.get(Constants.HTTP_push_noti_hist_id));
                 String sHTTP_content = util.null2string(hmItem.get(Constants.HTTP_content));
                 String sHTTP_create_datetime = util.null2string(hmItem.get(Constants.HTTP_create_datetime));
                 String sHTTP_read_datetime = util.null2string(hmItem.get(Constants.HTTP_read_datetime));

+ 2 - 2
kneet_v2/src/main/res/values/strings_send_url.xml

@@ -73,8 +73,8 @@
     <!--20 대시보드/홈로그/홈모드   -->
     <!--20.1 홈모드 조회 GET /v2/modes 홈그룹의 홈모드 목록을 불러온다.-->
     <string name="SEND_G_modes" translatable="false">/modes</string>
-    <!--20.2 현재 홈모드 변경 POST /v2/modes/:mode_id/current_mode 현재 홈모드를 변경한다.-->
-    <string name="SEND_P_modes_mode_id_current_mode" translatable="false">/modes/:mode_id/current_mode</string>
+    <!--3.5.1.2 현재 홈모드 변경 PUT /v3/modes/current_mode 현재 홈모드를 변경한다.-->
+    <string name="SEND_P_modes_mode_id_current_mode" translatable="false">/modes/current_mode</string>
     <!--20.3 대시보드 정보 조회 GET /v2/dashboard 홈그룹 모드 조회, 공지, 알림 갯수 조회 등-->
     <string name="SEND_G_dashboard" translatable="false">/dashboard</string>
     <!--20.4 [폐기] 홈로그 조회 GET /v2/homelog 홈로그 목록을 조회한다.-->