فهرست منبع

null 체크 추가. 테스트 코드 삭제.

jslee(madeinlab) 3 سال پیش
والد
کامیت
5d01972cb6
13فایلهای تغییر یافته به همراه50 افزوده شده و 42 حذف شده
  1. 8 9
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java
  2. 2 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconPopupScreen.java
  3. 1 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV1MainScreen.java
  4. 5 3
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java
  5. 5 3
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java
  6. 6 3
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java
  7. 7 5
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconPopupTestScreen.java
  8. 5 3
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java
  9. 5 3
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java
  10. 1 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_purity/PurityMainScreen.java
  11. 0 4
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java
  12. 0 2
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java
  13. 5 5
      WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java

+ 8 - 9
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java

@@ -979,8 +979,6 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
     }
 
     private void Draw_CurrentPage(KnxSystemAircon.Info info, int startIdx) {
-
-        Log.e(TAG, "[Exception] Draw_CurrentPage(KnxSystemAircon.Info info, int startIdx)");
         try {
             //에어컨 연동상태를 체크해서 에어컨 연동완료 일때만 UI를 그려준다. 그 이전에 alarm 문구 노출.
             if(info.AirconStatus!= KnxSystemAircon.Status.COMPLETE){
@@ -1041,7 +1039,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                 Draw_TitleUpdate(i);
             }
         } catch (Exception e) {
-            Log.e(TAG, "[Exception] Draw_CurrentPage(KnxSystemAircon.Info info, int startIdx)");
+            Log.e(TAG, "[Exception] Draw_CurrentPage");
             e.printStackTrace();
         }
     }
@@ -1073,15 +1071,15 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
     /**
      * 방명칭 전체를 화면에 업데이트한다.
      */
-    private void Draw_TitleUpdate(int idx)
+    private void Draw_TitleUpdate(int index)
     {
-        if(mData == null) return;
-        int room_title = ROOM_POS[idx];
-        if(idx<mRoomNameList.length)
-            Draw_TitleChange(idx, mRoomNameList[room_title]);
+        if(!Draw_RangeChecker(index)) return;
+        int room_title = ROOM_POS[index];
+        if(index<mRoomNameList.length)
+            Draw_TitleChange(index, mRoomNameList[room_title]);
             //Draw_TitleChange(idx, mRoomNameList[idx]);
         else{
-            Draw_TitleChange(idx, "temp");
+            Draw_TitleChange(index, "temp");
         }
     }
 
@@ -1239,6 +1237,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
         if(index < 0) return false;
         if(roomView == null) return false;
         if(roomView.length <= index) return false;
+        if(roomView[index]==null) return false;
         return true;
     }
 

+ 2 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconPopupScreen.java

@@ -218,11 +218,11 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
         ViewRegistration(layout, ExitBtn, Common.PopupNomalMarginLEFT(1050), Common.PopupNomalMarginTOP(70));
 
         RoomPrevBtn = new WpadImageView(context, WpadImageView.TOUCH_KIND.BUTTON, 110, 90, R.drawable.top_but_back, R.drawable.top_but_back_p, ID.KNxSystemAirconPopup.button.ROOM_PREV);
-        ViewRegistration(layout, RoomPrevBtn, Common.PopupNomalMarginLEFT(400), Common.PopupNomalMarginTOP(31));
+        ViewRegistration(layout, RoomPrevBtn, Common.PopupNomalMarginLEFT(400), 0);
         RoomPrevBtn.setTouchDelayMs(Common.BTN_DELAY_DEVCTRL);
 
         RoomNextBtn = new WpadImageView(context, WpadImageView.TOUCH_KIND.BUTTON, 110, 90, R.drawable.top_but_next, R.drawable.top_but_next_p, ID.KNxSystemAirconPopup.button.ROOM_NEXT);
-        ViewRegistration(layout, RoomNextBtn, Common.PopupNomalMarginLEFT(740), Common.PopupNomalMarginTOP(31));
+        ViewRegistration(layout, RoomNextBtn, Common.PopupNomalMarginLEFT(740), 0);
         RoomNextBtn.setTouchDelayMs(Common.BTN_DELAY_DEVCTRL);
 
         KnxSystemAircon.Info info = mData.airconData.Device.info;

+ 1 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV1MainScreen.java

@@ -626,6 +626,7 @@ public class HeatingV1MainScreen extends WpadScreen
         if(index < 0) return false;
         if(roomView == null) return false;
         if(roomView.length <= index) return false;
+        if(roomView[index]==null) return false;
         return true;
     }
 

+ 5 - 3
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java

@@ -195,9 +195,11 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
             }
 
             String titleName = heatingData.getTitle_name();
-            String[] strTitleName = titleName.split("_");
-            for (int i = 0; i < strDataSeq.length; i++) {
-                mRoomNameList[i] = strTitleName[i];
+            if(titleName!=null) {
+                String[] strTitleName = titleName.split("_");
+                for (int i = 0; i < strDataSeq.length; i++) {
+                    mRoomNameList[i] = strTitleName[i];
+                }
             }
 
             DataClasses.HeatingV2.Info info = mData.heatingV2.Device.info;

+ 5 - 3
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java

@@ -344,9 +344,11 @@ public class HeatingV2TestScreen extends WpadScreen {
             }
 
             String titleName = heatingData.getTitle_name();
-            String[] strTitleName = titleName.split("_");
-            for (int i = 0; i < strDataSeq.length; i++) {
-                astrRoomTitle[i] = strTitleName[i];
+            if(titleName!=null) {
+                String[] strTitleName = titleName.split("_");
+                for (int i = 0; i < strDataSeq.length; i++) {
+                    astrRoomTitle[i] = strTitleName[i];
+                }
             }
 
             DataClasses.HeatingV2.Info info = mData.heatingV2.Device.info;

+ 6 - 3
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java

@@ -305,9 +305,11 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             }
 
             String titleName = airconData.getTitle_name();
-            String[] strTitleName = titleName.split("_");
-            for (int i = 0; i < strDataSeq.length; i++) {
-                mRoomNameList[i] = strTitleName[i];
+            if(titleName!=null) {
+                String[] strTitleName = titleName.split("_");
+                for (int i = 0; i < strDataSeq.length; i++) {
+                    mRoomNameList[i] = strTitleName[i];
+                }
             }
 
             KnxSystemAircon.Info info = mData.systemAircon.Device.info;
@@ -1133,6 +1135,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
         if(index < 0) return false;
         if(roomView == null) return false;
         if(roomView.length <= index) return false;
+        if(roomView[index]==null) return false;
         return true;
     }
 

+ 7 - 5
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconPopupTestScreen.java

@@ -133,9 +133,11 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
             }
 
             String titleName = airconData.getTitle_name();
-            String[] strTitleName = titleName.split("_");
-            for (int i = 0; i < strDataSeq.length; i++) {
-                mRoomNameList[i] = strTitleName[i];
+            if(titleName!=null) {
+                String[] strTitleName = titleName.split("_");
+                for (int i = 0; i < strDataSeq.length; i++) {
+                    mRoomNameList[i] = strTitleName[i];
+                }
             }
 
             KnxSystemAircon.Info info = mData.systemAircon.Device.info;
@@ -304,11 +306,11 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
         ViewRegistration(layout, ExitBtn, Common.PopupNomalMarginLEFT(1050), Common.PopupNomalMarginTOP(70));
 
         RoomPrevBtn = new WpadImageView(context, WpadImageView.TOUCH_KIND.BUTTON, 110, 90, R.drawable.top_but_back, R.drawable.top_but_back_p, ID.KNxSystemAirconPopup.button.ROOM_PREV);
-        ViewRegistration(layout, RoomPrevBtn, Common.PopupNomalMarginLEFT(400), Common.PopupNomalMarginTOP(31));
+        ViewRegistration(layout, RoomPrevBtn, Common.PopupNomalMarginLEFT(400), 0);
         RoomPrevBtn.setTouchDelayMs(Common.BTN_DELAY_DEVCTRL);
 
         RoomNextBtn = new WpadImageView(context, WpadImageView.TOUCH_KIND.BUTTON, 110, 90, R.drawable.top_but_next, R.drawable.top_but_next_p, ID.KNxSystemAirconPopup.button.ROOM_NEXT);
-        ViewRegistration(layout, RoomNextBtn, Common.PopupNomalMarginLEFT(740), Common.PopupNomalMarginTOP(31));
+        ViewRegistration(layout, RoomNextBtn, Common.PopupNomalMarginLEFT(740), 0);
         RoomNextBtn.setTouchDelayMs(Common.BTN_DELAY_DEVCTRL);
 
         KnxSystemAircon.Info info = mData.systemAircon.Device.info;

+ 5 - 3
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java

@@ -294,9 +294,11 @@ public class LightKnxMainTestScreen extends WpadScreen {
             }
 
             String titleName = lightData.getTitle_name();
-            String[] strTitleName = titleName.split("_");
-            for (int i = 0; i < strDataSeq.length; i++) {
-                mDefaultRoomNameList[i] = strTitleName[i];
+            if(titleName!=null) {
+                String[] strTitleName = titleName.split("_");
+                for (int i = 0; i < strDataSeq.length; i++) {
+                    mDefaultRoomNameList[i] = strTitleName[i];
+                }
             }
 
             JSONArray livDataArray = jsonObject.getJSONArray("liv_data_array");

+ 5 - 3
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java

@@ -214,9 +214,11 @@ public class LightKnxPopupTestScreen extends WpadScreen {
             }
 
             String titleName = lightData.getTitle_name();
-            String[] strTitleName = titleName.split("_");
-            for (int i = 0; i < strDataSeq.length; i++) {
-                mDefaultRoomNameList[i] = strTitleName[i];
+            if(titleName!=null) {
+                String[] strTitleName = titleName.split("_");
+                for (int i = 0; i < strDataSeq.length; i++) {
+                    mDefaultRoomNameList[i] = strTitleName[i];
+                }
             }
 
             JSONArray livDataArray = jsonObject.getJSONArray("liv_data_array");

+ 1 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_purity/PurityMainScreen.java

@@ -835,6 +835,7 @@ public class PurityMainScreen extends WpadScreen {
         if (index < 0) return false;
         if (roomView == null) return false;
         if (roomView.length <= index) return false;
+        if(roomView[index]==null) return false;
         return true;
     }
 

+ 0 - 4
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java

@@ -2117,8 +2117,6 @@ public class MainActivity extends WpadActivity {
      */
     @Override
     protected void onPause() {
-        //테스트
-        sendMessageToService(4, "111");
         m_thisAcitivityRusume = false;
         if(mWallPadAPI != null) mWallPadAPI.Pause();
         bScreenCheck = false;
@@ -11036,8 +11034,6 @@ public class MainActivity extends WpadActivity {
                         msg = Message.obtain(null, iMapServer.MSG_SEND_TO_SERVICE_DEVICES2, str);
                     } else if(index==3) {
                         msg = Message.obtain(null, iMapServer.MSG_SEND_TO_SERVICE_DEVICES3, str);
-                    } else if(index==4) {
-                        msg = Message.obtain(null, 1111, str);
                     }
                     if(msg!=null) {
                         msg.replyTo = mMessenger;

+ 0 - 2
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

@@ -2968,7 +2968,6 @@ public class iMapServer extends Service {
                     remote_get_home_devices3 = (String) msg.obj;  // activity로부터 가져온
                     break;
                 default:
-                    sendMsgToActivity(1234);
                     break;
 
             }
@@ -2980,7 +2979,6 @@ public class iMapServer extends Service {
         try {
             Bundle bundle = new Bundle();
             bundle.putInt("fromService", sendValue);
-            bundle.putString("test", "abcdefg");
             Message msg = Message.obtain(null, MSG_SEND_TO_ACTIVITY);
             msg.setData(bundle);
             mClient.send(msg);      // msg 보내기

+ 5 - 5
WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java

@@ -390,7 +390,7 @@ public class DataSenderService extends Service {
                                     "\"support_dehumidify\" : true, " +
                                     "\"support_fan\" : true, " +
                                     "\"support_heating\" : true, " +
-                                    "\"data_seq\" : \"3_2_1_0\", " +
+                                    "\"data_seq\" : \"4_3_2_1\", " +
                                     "\"data_array\" : [" +
                                     "{ \"roomNumber\" : 1, \"power\" : 1, \"mode\" : " + iValue + ", \"airvol\" : 1,\"setTemp\" : 11,\"nowTemp\" : 21 }," +
                                     "{ \"roomNumber\" : 2, \"power\" : 1, \"mode\" : " + iValue + ", \"airvol\" : 1,\"setTemp\" : 12,\"nowTemp\" : 22 }," +
@@ -444,7 +444,7 @@ public class DataSenderService extends Service {
                                         "\"master_info_switch_count\" : 3, " +
                                         "\"liv_info_install\" : true, " +
                                         "\"liv_info_lightcount\" : 2, " +
-                                        "\"data_seq\" : \"6_5_4_2_3_1_0\", " +
+                                        "\"data_seq\" : \"7_6_5_4_2_3_1\", " +
                                         "\"liv_data_array\" : [" +
                                         "{ \"info_install\" : true, \"info_type\" : 2, \"data_onoff\" : " + onoff + ", \"data_dimming\" : 1 }," +
                                         "{ \"info_install\" : true, \"info_type\" : 2, \"data_onoff\" : " + onoff + ", \"data_dimming\" : 1 } ]," +
@@ -470,7 +470,7 @@ public class DataSenderService extends Service {
                                         "\"master_info_switch_count\" : 2, " +
                                         "\"liv_info_install\" : true, " +
                                         "\"liv_info_lightcount\" : 2, " +
-                                        "\"data_seq\" : \"4_2_3_1_0\", " +
+                                        "\"data_seq\" : \"5_4_2_3_1\", " +
                                         "\"liv_data_array\" : [" +
                                         "{ \"info_install\" : true, \"info_type\" : 2, \"data_onoff\" : " + onoff + ", \"data_dimming\" : 1 }," +
                                         "{ \"info_install\" : true, \"info_type\" : 2, \"data_onoff\" : " + onoff + ", \"data_dimming\" : 1 } ]," +
@@ -495,13 +495,13 @@ public class DataSenderService extends Service {
                                     "{ \"hID\" : 3, \"hStatus\" : 2, \"hType\" : " + iValue + ", \"hErrorStatus\" : 0} ]" +
                                     "}";
 
-                            outputStream.writeObject(result.toString());
+                            //outputStream.writeObject(result.toString());
                             String resultTemp;
                             if (menu == 1003) resultTemp = sampleHeatingResult;
                             else if (menu == 1001) resultTemp = sampleLightResult;
                             else if (menu == 1006) resultTemp = sampleCookTopResult;
                             else resultTemp = sampleAirconResult;
-                            //outputStream.writeObject(resultTemp);
+                            outputStream.writeObject(resultTemp);
                             outputStream.close();
                             Log.d("ServerThread", "result 보냄 : " + resultTemp);
                         } catch (Exception e) {