Просмотр исходного кода

모델명 수정, 버그 일부 수정.

jslee(madeinlab) 3 лет назад
Родитель
Сommit
067c6ebcfb
21 измененных файлов с 172 добавлено и 133 удалено
  1. 7 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/PopupActivity.java
  2. 4 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/declare/ID.java
  3. 30 15
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java
  4. 13 10
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconPopupScreen.java
  5. 12 6
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java
  6. 2 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2PopupScreen.java
  7. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java
  8. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxPopupRoomScreen.java
  9. 2 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupBoilerTestScreen.java
  10. 10 13
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java
  11. 18 12
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java
  12. 55 51
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java
  13. 7 5
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconPopupTestScreen.java
  14. 1 6
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java
  15. 2 5
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java
  16. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/SystemAirconTestScreen.java
  17. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/VentiPopupReservationTestScreen.java
  18. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/VentilationMainTestScreen.java
  19. 1 1
      WallPadMain/src/main/AndroidManifest.xml
  20. 1 1
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/WallPadiMAPUpgrade.java
  21. 2 0
      WallPadSupport/src/main/java/kr/co/icontrols/wallpadsupport/Version.java

+ 7 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/PopupActivity.java

@@ -661,6 +661,13 @@ public class PopupActivity extends WpadActivity
                     }
                     break;
 
+                case ID.screen.KnxSystemAirconPopupScreen:
+                    if (nDistributionPanelType == Version.DISTRIBUTION_MODEL.KNX_DIST) {
+                        knxSystemAirconPopupScreen = new KnxSystemAirconPopupScreen(mContext, AllLayout, wpapi, OPERATION_MODE);
+                        super.setCurrentScreen(knxSystemAirconPopupScreen);
+                    }
+                    break;
+
                 case ID.screen.SystemAirconPopupTestScreen:
                     if (nDistributionPanelType == Version.DISTRIBUTION_MODEL.KNX_DIST) {
                         knxSystemAirconPopupTestScreen = new KnxSystemAirconPopupTestScreen(mContext, AllLayout, wpapi, OPERATION_MODE);

+ 4 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/declare/ID.java

@@ -76,6 +76,8 @@ public final class ID
 		public final static int SystemAirconPopupScreen = 51000;          // 시스템에어컨 - 팝업
 		public final static int SystemAirconTest1Screen = 52000;          // 시스템에어컨 - 멀티제어1
 		public final static int SystemAirconPopupTestScreen = 53000;          // 시스템에어컨 - 멀티팝업제어1
+		public final static int KnxSystemAirconMainScreen = 54000;          // 시스템에어컨 - 메인
+		public final static int KnxSystemAirconPopupScreen = 55000;          // 시스템에어컨 - 팝업
 		public final static int KnxSystemAirconMainTestScreen = 56000;          // KNX시스템에어컨 - 멀티제어1
 		public final static int KnxSystemAirconPopupTestScreen = 57000;          // KNX시스템에어컨 - 멀티팝업제어1
 
@@ -3103,7 +3105,7 @@ public final class ID
 	 * ==========================================================================
 	 * ========================================================================== */
 	public static final class KnxSystemAirconMain {
-		final static int BASE = screen.SystemAirconMainScreen;
+		final static int BASE = screen.KnxSystemAirconMainScreen;
 
 		public final static String BR_AIRCON = BR_ACTION_BASE + "AIRCON_MAIN" + "(" + BASE + ")";
 		public final static String BR_LOUVER = BR_ACTION_BASE + "LOUVER_MAIN" + "(" + BASE + ")";
@@ -3214,7 +3216,7 @@ public final class ID
 	}
 
 	public static final class KNxSystemAirconPopup {
-		public final static int BASE = screen.SystemAirconPopupScreen;
+		public final static int BASE = screen.KnxSystemAirconPopupScreen;
 
 		public final static String BR_AIRCON = BR_ACTION_BASE + "AIRCON_POPUP" + "(" + BASE + ")";
 

+ 30 - 15
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_aircon/KnxSystemAirconMainScreen.java

@@ -298,7 +298,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
         DebugLogOutput("[Create] - Step1 : Data Create");
         OPERATION_MODE = operationMode;
         //for test
-        OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
+        //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
         //
         if (roomNameList==null) mRoomNameList = mDefaultRoomNameList;
         else mRoomNameList = roomNameList;
@@ -356,7 +356,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
 
         AllRoomTxt = new WpadTextView(context, false, 210, 56, Gravity.CENTER, Color.WHITE, Common.fontsize._36, true, ID.KnxSystemAirconMain.text.TITLE);
 		ViewRegistration(layout, AllRoomTxt, Common.ImgPosion.GetX(990), Common.ImgPosion.GetY(179 - yMarginWithPage));
-		AllRoomTxt.setText("[전체]");
+		AllRoomTxt.setText("[전체]");
 
 		AllOnOffBtn = new WpadImageView(getContext(), WpadImageView.TOUCH_KIND.BUTTON, 140, 100,
 				new int[] { R.drawable.btn_heat_onoff_off, R.drawable.btn_heat_onoff_off },
@@ -406,7 +406,6 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
         int[] mPageFontSize = {Common.fontsize._36, Common.fontsize._44};
         PageNumText = new WpadTextView(getContext(), false, 264, 110, Gravity.CENTER, Color.WHITE, mPageFontSize[UX_MODE], false, ID.KnxSystemAirconMain.text.PAGE_TEXT);
         ViewRegistration(getLayout(), PageNumText, Common.ImgPosion.GetX(372), Common.ImgPosion.GetY(670));
-        PageNumText.setText(CurrentPageNum + "/" + TotalPageNum);
 
         AlarmText = new WpadTextView(getContext(), false, 880, 110, Gravity.CENTER, Color.WHITE, mPageFontSize[UX_MODE], false, ID.PurityMain.text.ALARM_TEXT);
         ViewRegistration(getLayout(), AlarmText, Common.ImgPosion.GetX(60), Common.ImgPosion.GetY(375));
@@ -416,6 +415,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
 
         CurrentPageNum = 1;
         Draw_CurrentPage(info, (CurrentPageNum - 1) * ROOM_CNT);
+        PageNumText.setText(CurrentPageNum + "/" + TotalPageNum);
 
         //     6.3. update
         try
@@ -602,7 +602,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
     protected void onPopupResult(Intent intent) {
         if (intent != null) {
             int Screen = intent.getIntExtra("SCREEN", -1);
-            if (Screen == ID.screen.SystemAirconPopupScreen) {
+            if (Screen == ID.screen.KnxSystemAirconPopupScreen) {
                 boolean bRefresh = intent.getBooleanExtra("REFRESH", false);
                 if (bRefresh) {
                     WallpadStatusData wallpadStatusData = new WallpadStatusData(getContext().getApplicationContext());
@@ -670,7 +670,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                     //Sample_AllControl(!bCurrentAllOnOff, true, nCurrentAllModeIdx);
                     Sound().Play(SND.effect.TOUCH_LATCHED);
                 }
-            } else if (nTargetId == ID.KnxSystemAirconMain.button.ALL_MODE_PREV) {
+            }
+            else if (nTargetId == ID.KnxSystemAirconMain.button.ALL_MODE_PREV) {
                 Sound().Play(SND.effect.TOUCH_LATCHED);
                 Draw_AllMode(false);
             } else if (nTargetId == ID.KnxSystemAirconMain.button.ALL_MODE_NEXT) {
@@ -692,12 +693,13 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                 data.putExtra("ROOM_NAME_ARRAY", mRoomNameList); // 룸 명칭 리스트
 
                 if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) {
+                    int nAirconCount =  mData.systemAircon.Device.info.InsideAirconCount;
                     data.putExtra("ROOM_COUNT", mData.systemAircon.Device.info.InsideAirconCount);
-                    double [] CurTempArray = new double [] { 0.0, 0.0, 0.0, 0.0, 0.0 };
-                    double [] SetTempArray = new double [] { 0.0, 0.0, 0.0, 0.0, 0.0 };
-                    byte   [] ModeArray    = new byte   [] { 0, 0, 0, 0, 0 };
-                    byte   [] VolumeArray  = new byte   [] { 0, 0, 0, 0, 0 };
-                    byte   [] OnOffArray  = new byte   [] { 0, 0, 0, 0, 0 };
+                    double [] CurTempArray = new double [nAirconCount];
+                    double [] SetTempArray = new double [nAirconCount];
+                    byte   [] ModeArray    = new byte   [nAirconCount];
+                    byte   [] VolumeArray  = new byte   [nAirconCount];
+                    byte   [] OnOffArray  = new byte   [nAirconCount];
 
                     for (int i = 0; i < mData.systemAircon.Device.info.InsideAirconCount; i++) {
                         CurTempArray[i] = mData.systemAircon.Device.Aircon[i].NowTemp;
@@ -713,7 +715,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                     data.putExtra("VOLUME_ARRAY" , VolumeArray);
                     data.putExtra("ONOFF_ARRAY" , OnOffArray);
 
-                    ((MainActivity) (getContext())).StartPopup(ID.screen.SystemAirconPopupScreen, data);
+                    ((MainActivity) (getContext())).StartPopup(ID.screen.KnxSystemAirconPopupScreen, data);
                 } else if (OPERATION_MODE == Common.MODE_NOMAL) {
                     int airconCount = mData.systemAircon.Device.info.InsideAirconCount;
                     data.putExtra("ROOM_COUNT", airconCount);
@@ -734,7 +736,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                     data.putExtra("MODE_ARRAY"   , ModeArray);
                     data.putExtra("VOLUME_ARRAY" , VolumeArray);
 
-                    ((MainActivity) (getContext())).StartPopup(ID.screen.SystemAirconPopupScreen, data);
+                    ((MainActivity) (getContext())).StartPopup(ID.screen.KnxSystemAirconPopupScreen, data);
                 }
             } else if ((nTargetId >= ID.KnxSystemAirconMain.button.ROOM_ONOFF_1) && (nTargetId <= ID.KnxSystemAirconMain.button.ROOM_ONOFF_MAX))
             {
@@ -978,6 +980,8 @@ 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){
@@ -1018,7 +1022,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
 
             if (startIdx > 0 && startIdx % ROOM_CNT == 0) {
                 for (int j = 0; j < startIdx; j++) {
-                    roomView[j].setVisible(false);
+                    if (roomView[j] != null)
+                        roomView[j].setVisible(false);
                 }
             } else {
                 for (int j = ROOM_CNT; j < info.InsideAirconCount; j++) {
@@ -1037,7 +1042,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                 Draw_TitleUpdate(i);
             }
         } catch (Exception e) {
-            Log.e(TAG, "[Exception] Draw_CurrentPage(HeatingV2.Info info, int startIdx)");
+            Log.e(TAG, "[Exception] Draw_CurrentPage(KnxSystemAircon.Info info, int startIdx)");
             e.printStackTrace();
         }
     }
@@ -1595,7 +1600,7 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
      */
     private void Sample_DataDefaultSetting() {
         mData.systemAircon = new KnxSystemAirconAPI.Data();
-        int nRoomCount = 5;
+        int nRoomCount = 15;
         byte hRoomCount = (byte) nRoomCount;
         mData.systemAircon.Device.SetAirconCount(hRoomCount);
         DebugLogOutput("[Sample_DataDefaultSetting] nRoomCount [" + nRoomCount + "]");
@@ -1611,6 +1616,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
             KnxSystemAircon.AirData roomData = mData.systemAircon.Device.Aircon[i];
             switch (i) {
                 case 0:
+                case 5:
+                case 10:
                     roomData.OnOff = KnxSystemAircon.ONOFF.AirconON;
                     roomData.Mode = KnxSystemAircon.MODE.Cold;
                     roomData.Volume = KnxSystemAircon.VOLUME.Strong;
@@ -1619,6 +1626,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                     break;
 
                 case 1:
+                case 6:
+                case 11:
                     roomData.OnOff = KnxSystemAircon.ONOFF.AirconON;
                     roomData.Mode = KnxSystemAircon.MODE.Venti;
                     roomData.Volume = KnxSystemAircon.VOLUME.Weak;
@@ -1627,6 +1636,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                     break;
 
                 case 2:
+                case 7:
+                case 12:
                     roomData.OnOff = KnxSystemAircon.ONOFF.AirconON;
                     roomData.Mode = KnxSystemAircon.MODE.Dry;
                     roomData.Volume = KnxSystemAircon.VOLUME.Auto;
@@ -1635,6 +1646,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                     break;
 
                 case 3:
+                case 8:
+                case 13:
                     roomData.OnOff = KnxSystemAircon.ONOFF.AirconON;
                     roomData.Mode = KnxSystemAircon.MODE.Cold;
                     roomData.Volume = KnxSystemAircon.VOLUME.Medium;
@@ -1643,6 +1656,8 @@ public class KnxSystemAirconMainScreen extends WpadScreen {
                     break;
 
                 case 4:
+                case 9:
+                case 14:
                     roomData.OnOff = KnxSystemAircon.ONOFF.AirconON;
                     roomData.Mode = KnxSystemAircon.MODE.Auto;
                     roomData.Volume = KnxSystemAircon.VOLUME.Auto;

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

@@ -115,7 +115,7 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
     // =================================================================================================
     public KnxSystemAirconPopupScreen(Context context, RelativeLayout layout, WallPadAPI wpapi, int operationMode) {
         super(context, layout);
-        Log.i(TAG, "[START - SystemAirconPopupScreen] --------------------------------------------");
+        Log.i(TAG, "[START - KnxSystemAirconPopupScreen] --------------------------------------------");
 
         // 1. Data Create
         DebugLogOutput("[Create] - Step1 : Data Create");
@@ -344,8 +344,11 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
         super.onOutSideTouchExit();
 
         // (영업샘플모드) 변경 데이터 전달
-        if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) Sample_setPopupResult();
+        //if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) Sample_setPopupResult();
         if (edit_state == EDIT_STATE.Normal) setPopupResult();
+        if (OPERATION_MODE == Common.MODE_NOMAL) {
+            Device_NowAllSet();
+        }
     }
 
     // =================================================================================================
@@ -365,7 +368,7 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
         if (nMoveEvent == MotionEvent.ACTION_UP) {
             if (nTargetId == ID.KNxSystemAirconPopup.button.EXIT) {
                 Sound().Play(SND.effect.TOUCH_LATCHED);
-                if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) Sample_setPopupResult();
+                //if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) Sample_setPopupResult();
                 if (edit_state == EDIT_STATE.Normal) setPopupResult();
                 super.finish();
             } else if (nTargetId == ID.KNxSystemAirconPopup.button.ROOM_PREV) {
@@ -1022,7 +1025,7 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
         Intent data = new Intent();
 
         // SCREEN
-        data.putExtra("SCREEN", ID.screen.SystemAirconPopupScreen);
+        data.putExtra("SCREEN", ID.screen.KnxSystemAirconPopupScreen);
         data.putExtra("REFRESH", true);
 
         super.setPopupResult(data);
@@ -1056,11 +1059,11 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
      */
     private void Sample_setPopupResult() {
         Intent data = new Intent();
-
-        double[] CurTempArray = new double[]{0.0, 0.0, 0.0, 0.0, 0.0};
-        double[] SetTempArray = new double[]{0.0, 0.0, 0.0, 0.0, 0.0};
-        byte[] ModeArray = new byte[]{0, 0, 0, 0, 0};
-        byte[] VolumeArray = new byte[]{0, 0, 0, 0, 0};
+        int nAirconCount = mData.airconData.Device.info.InsideAirconCount;
+        double[] CurTempArray = new double[nAirconCount];
+        double[] SetTempArray = new double[nAirconCount];
+        byte[] ModeArray = new byte[nAirconCount];
+        byte[] VolumeArray = new byte[nAirconCount];
 
         for (byte i = 0; i < mData.airconData.Device.info.InsideAirconCount; i++) {
             CurTempArray[i] = mData.airconData.Device.Aircon[i].NowTemp;
@@ -1069,7 +1072,7 @@ public class KnxSystemAirconPopupScreen extends WpadScreen {
             VolumeArray[i] = mData.airconData.Device.Aircon[i].Volume;
         }
 
-        data.putExtra("SCREEN", ID.screen.SystemAirconPopupScreen);
+        data.putExtra("SCREEN", ID.screen.KnxSystemAirconPopupScreen);
         data.putExtra("CURTEMP_ARRAY", CurTempArray);
         data.putExtra("SETTEMP_ARRAY", SetTempArray);
         data.putExtra("MODE_ARRAY", ModeArray);

+ 12 - 6
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java

@@ -482,10 +482,14 @@ public class HeatingV2MainScreen extends WpadScreen {
                     nImgID_Unset_PuaseOut_Pressed = R.drawable.btn_release_goout_pressed_easymode;
                 }
                 else {
-                    nImgID_Set_PuaseOut_Normal = R.drawable.control_heat_btn_all_goout_ok_normal;          // 전체방 외출 [실행]
-                    nImgID_Set_PuaseOut_Pressed = R.drawable.control_heat_btn_all_goout_ok_pressed;
-                    nImgID_Unset_PuaseOut_Normal = R.drawable.control_heat_btn_all_goout_cancel_normal;        // 전체방 외출 [해제]
-                    nImgID_Unset_PuaseOut_Pressed = R.drawable.control_heat_btn_all_goout_cancel_pressed;
+                    //nImgID_Set_PuaseOut_Normal = R.drawable.control_heat_btn_all_goout_ok_normal;          // 전체방 외출 [실행]
+                    nImgID_Set_PuaseOut_Normal = R.drawable.btn_heating_run_normal;          // 전체방 외출 [실행]
+                    //nImgID_Set_PuaseOut_Pressed = R.drawable.control_heat_btn_all_goout_ok_pressed;
+                    nImgID_Set_PuaseOut_Pressed = R.drawable.btn_heating_run_pressed;
+                    //nImgID_Unset_PuaseOut_Normal = R.drawable.control_heat_btn_all_goout_cancel_normal;        // 전체방 외출 [해제]
+                    nImgID_Unset_PuaseOut_Normal = R.drawable.btn_heating_release_normal;        // 전체방 외출 [해제]
+                    //nImgID_Unset_PuaseOut_Pressed = R.drawable.control_heat_btn_all_goout_cancel_pressed;
+                    nImgID_Unset_PuaseOut_Pressed = R.drawable.btn_heating_release_pressed;
                 }
                 bImageIDSet = true;
                 Heating_Manual_Str += "Batch:Outing/";
@@ -982,8 +986,10 @@ public class HeatingV2MainScreen extends WpadScreen {
                         AllReleaseDisableImageID = R.drawable.btn_release_goout_disabeld_easymode;
                     }
                     else {
-                        AllExecutionDisableImageID = R.drawable.control_heat_btn_all_goout_ok_disabled;
-                        AllReleaseDisableImageID = R.drawable.control_heat_btn_all_goout_cancel_disabled;
+                        //AllExecutionDisableImageID = R.drawable.control_heat_btn_all_goout_ok_disabled;
+                        AllExecutionDisableImageID = R.drawable.btn_heating_run_disabled;
+                        //AllReleaseDisableImageID = R.drawable.control_heat_btn_all_goout_cancel_disabled;
+                        AllReleaseDisableImageID = R.drawable.btn_heating_release_disabled;
                     }
                 }
 

+ 2 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2PopupScreen.java

@@ -212,6 +212,8 @@ public class HeatingV2PopupScreen extends WpadScreen {
         // 1. Data Create
         DebugLogOutput("[Create] - Step1 : Data Create");
         OPERATION_MODE = operationMode;
+        //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
+
         mData = new Data();
         if (wallpadStatusData == null) wallpadStatusData = new WallpadStatusData(context);
 

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java

@@ -324,7 +324,7 @@ public class LightKnxMainScreen extends WpadScreen {
         // 1. Data Create
         DebugLogOutput("[Create] - Step1 : Data Create");
         OPERATION_MODE = operationMode;
-        OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
+        //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
         mData = new Data_KnxLiv();
 
         // 2. Device API Load & Update

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxPopupRoomScreen.java

@@ -242,7 +242,7 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
         // 1. Data Create
         DebugLogOutput("[Create] - Step1 : Data Create");
         OPERATION_MODE = operationMode;
-        OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
+        //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
         mData = new Data_KnxLiv();
         if (wallpadStatusData == null) wallpadStatusData = new WallpadStatusData(context);
 

+ 2 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupBoilerTestScreen.java

@@ -131,7 +131,8 @@ public class HeatingV2PopupBoilerTestScreen extends WpadScreen
             mData.heatingV2.Boiler.ErrorCode = (byte)heatingBoilerData.getBoiler_error_code();
 
             // 보일러 A/S 연락처 표시
-            mData.ASNotiStr = "우리보일러 AS 콜센터 1588-XXXX";
+            //mData.ASNotiStr = "우리보일러 AS 콜센터 1588-XXXX";
+            mData.ASNotiStr = "";
 
             // 3. Image Create
             DebugLogOutput("[Create] - Step3 : Image Create");

+ 10 - 13
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java

@@ -775,6 +775,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                     if (mCurrentTabStatus != TargetId) {
                         Sound().Play(SND.effect.TOUCH_LATCHED);
                         //탭이 변경되면 상태 값을 새로 받아 온다.
+                        if (timer != null)
+                            timer.cancel();
                         updateData();
 
                         if (OPERATION_MODE == Common.MODE_NOMAL) {
@@ -792,7 +794,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                     }
                 }
             }
-        } else if ((TargetId >= ID.heatingV2Popup.tabDefault.BASE) && (TargetId < ID.heatingV2Popup.tabReserbation.BASE)) {
+        }
+        else if ((TargetId >= ID.heatingV2Popup.tabDefault.BASE) && (TargetId < ID.heatingV2Popup.tabReserbation.BASE)) {
             ////////////////////////////////////////////////////
             // 기본설정 탭
             ////////////////////////////////////////////////////
@@ -853,25 +856,17 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                 } else if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_UP) {
                     DebugLogOutput("onTouchEvent [DefaultTab-TEMP_UP(short)] BUTTON !!!");
                     //Sound().Play(SND.effect.TOUCH_LATCHED);
-
-
                     Data_TempUpDn(true);
-
                     Device_TempSetDelayed();
                     //Sample_ChangeValveReflect();
-
-                    drawUpdate((byte) mCurrentRoomIndex);
+                    //drawUpdate((byte) mCurrentRoomIndex);
                 } else if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_DN) {
                     DebugLogOutput("onTouchEvent [DefaultTab-TEMP_DN(short)] BUTTON !!!");
                     //Sound().Play(SND.effect.TOUCH_LATCHED);
-
-
                     Data_TempUpDn(false);
-
                     Device_TempSetDelayed();
                     //Sample_ChangeValveReflect();
-
-                    drawUpdate((byte) mCurrentRoomIndex);
+                    //drawUpdate((byte) mCurrentRoomIndex);
                 }
             } else if (MoveEvent == MotionEvent.ACTION_POINTER_DOWN) {
                 if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_UP) {
@@ -899,7 +894,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                     drawUpdate((byte) mCurrentRoomIndex);
                 }
             }
-        } else if ((TargetId >= ID.heatingV2Popup.tabReserbation.BASE) && (TargetId < ID.heatingV2Popup.tabSleep.BASE)) {
+        }
+        else if ((TargetId >= ID.heatingV2Popup.tabReserbation.BASE) && (TargetId < ID.heatingV2Popup.tabSleep.BASE)) {
             ////////////////////////////////////////////////////
             // 예약설정 탭
             ////////////////////////////////////////////////////
@@ -930,7 +926,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                     mData.ChangeReservation = true;
                 }
             }
-        } else if ((TargetId >= ID.heatingV2Popup.tabSleep.BASE) && (TargetId < ID.heatingV2Popup.tabSleep.BASE + 100)) {
+        }
+        else if ((TargetId >= ID.heatingV2Popup.tabSleep.BASE) && (TargetId < ID.heatingV2Popup.tabSleep.BASE + 100)) {
             ////////////////////////////////////////////////////
             // 취침설정 탭
             ////////////////////////////////////////////////////

+ 18 - 12
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java

@@ -503,6 +503,8 @@ public class HeatingV2TestScreen extends WpadScreen {
     }
 
     private void requestMultiCommand(int kind, int reason, int position, String category, int number, int state){
+        if (timer != null)
+            timer.cancel();
         position = ROOM_POS[position];
         ((MainActivity) mContext).requestMultiControl(handler, JSON.MENU.HEATING, kind, reason, position, category, number, state);
     }
@@ -525,6 +527,7 @@ public class HeatingV2TestScreen extends WpadScreen {
     }
 
     Timer timer;
+    TimerTask TT;
 
     @SuppressLint("HandlerLeak")
     final Handler handler = new Handler() {
@@ -542,15 +545,7 @@ public class HeatingV2TestScreen extends WpadScreen {
                         if(resultData.getType().equals("controlResponse")&&resultData.getResult().equals("ok")) {
                             //제어 명령을 내리고 제대로 응답이 오면 상태를 다시 조회해서 UI 갱신하도록 한다.
                             Sound().Play(SND.effect.TOUCH_LATCHED);
-                            timer = new Timer();
-                            TimerTask TT = new TimerTask() {
-                                @Override
-                                public void run() {
-                                    // 반복실행할 구문
-                                    updateData();
-                                }
-                            };
-                            timer.schedule(TT, 500, 2000); //Timer 실행
+                            startRefreshTimer();
                         }
                         else if(resultData.getType().equals("updateResponse")) {
                             //상태 조회 응답이 오면, data를 갱신한다.
@@ -593,10 +588,23 @@ public class HeatingV2TestScreen extends WpadScreen {
         else astrRoomTitle = roomNameList;
 
         mData = new Data();
-        updateData();
+        startRefreshTimer();
+        //updateData();
         //Sample_DataDefaultSetting();
     }
 
+    private void startRefreshTimer(){
+        timer = new Timer();
+        TT = new TimerTask() {
+            @Override
+            public void run() {
+                // 반복실행할 구문
+                updateData();
+            }
+        };
+        timer.schedule(TT, 500, 3500); //Timer 실행
+    }
+
     /**
      * 본 스크린 종료시 호출됨
      */
@@ -700,8 +708,6 @@ public class HeatingV2TestScreen extends WpadScreen {
             }
             else if ((TargetId >= ID.heatingV2main.button.ROOM_ONOFF_1) && (TargetId <= ID.heatingV2main.button.ROOM_ONOFF_8)) {
                 // 각방 ON/OFF 클릭
-                if (timer != null)
-                    timer.cancel();
                 int index = TargetId - ID.heatingV2main.button.ROOM_ONOFF_1;
                 DebugLogOutput("onTouchEvent [ROOM_ONOFF_" + (index+1) + "] BUTTON !!!");
                 byte DeiveMode = HeatingV2.MODE.HeatingON;

+ 55 - 51
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java

@@ -51,7 +51,7 @@ import kr.co.icontrols.wallpadsupport.WpadTextView;
 
 public class KnxSystemAirconMainTestScreen extends WpadScreen {
 
-    private final String TAG = "KnxSysAirconMainTestScrn";
+    private final String TAG = "KnxAirconMainTestScrn";
     private Context mContext;
 
     private final boolean DEBUG_LOG_ON = true;
@@ -233,7 +233,6 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             ViewRegistration(getLayout(), VolumeImg, Common.ImgPosion.GetX(left + mVolumePos[UX_MODE][0]), Common.ImgPosion.GetY(top + mVolumePos[UX_MODE][1]));
         }
 
-
         public void setVisible(boolean set) {
             if (set) {
                 Background.setVisibility(View.VISIBLE);
@@ -316,7 +315,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             //info.Support.bModeFan = airconData.getSupportFan();
             //info.Support.bModeHeating = airconData.getSupportHeating();
 
-            DebugLogOutput("[Sample_DataDefaultSetting] info.RoomCount [" + mData.systemAircon.Device.info.InsideAirconCount + "]");
+            DebugLogOutput("aircontest--[makeDeviceData] info.RoomCount [" + mData.systemAircon.Device.info.InsideAirconCount + "]");
             for (byte i = 0; i < mData.systemAircon.Device.info.InsideAirconCount; i++) {
                 KnxSystemAircon.AirData roomData = mData.systemAircon.Device.Aircon[i];
                 AirconArrayData airconDataArray = gson.fromJson(jsonArray.get(i).toString(), AirconArrayData.class);
@@ -346,7 +345,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
 
                 AllRoomTxt = new WpadTextView(mContext, false, 210, 56, Gravity.CENTER, Color.WHITE, Common.fontsize._36, true, ID.KnxSystemAirconMain.text.TITLE);
                 ViewRegistration(getLayout(), AllRoomTxt, Common.ImgPosion.GetX(990), Common.ImgPosion.GetY(179 - yMarginWithPage));
-                AllRoomTxt.setText("[전체]");
+                AllRoomTxt.setText("[전체]");
 
                 AllOnOffBtn = new WpadImageView(getContext(), WpadImageView.TOUCH_KIND.BUTTON, 140, 100,
                         new int[]{R.drawable.btn_heat_onoff_off, R.drawable.btn_heat_onoff_off},
@@ -414,9 +413,9 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             {
                 //     6.3. update
                 if (OPERATION_MODE == Common.MODE_NOMAL) {
-                    if (louverAPI != null) {
-                        Draw_Update(INDEX_LOUVER);
-                    }
+                    //if (louverAPI != null) {
+                    //    Draw_Update(INDEX_LOUVER);
+                    //}
                 }
             }
             catch(Exception e)
@@ -434,10 +433,14 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
     }
 
     private void requestMultiCommand(int kind, int reason, int position, String category, int number, int state){
+        if (timer != null)
+            timer.cancel();
         ((MainActivity) mContext).requestMultiControl(handler, JSON.MENU.AIRCON, kind, reason, position, category, number, state);
     }
 
     private void requestMultiCommand(int kind, int reason, int position, String category, int number, double state) {
+        if (timer != null)
+            timer.cancel();
         ((MainActivity) mContext).requestMultiControl(handler, JSON.MENU.AIRCON, kind, reason, position, category, number, state);
     }
 
@@ -459,6 +462,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
     }
 
     Timer timer;
+    TimerTask TT;
 
     @SuppressLint("HandlerLeak")
     final Handler handler = new Handler() {
@@ -476,15 +480,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
                         if(resultData.getType().equals("controlResponse")&&resultData.getResult().equals("ok")) {
                             //제어 명령을 내리고 제대로 응답이 오면 상태를 다시 조회해서 UI 갱신하도록 한다.
                             Sound().Play(SND.effect.TOUCH_LATCHED);
-                            timer = new Timer();
-                            TimerTask TT = new TimerTask() {
-                                @Override
-                                public void run() {
-                                    // 반복실행할 구문
-                                    updateData();
-                                }
-                            };
-                            timer.schedule(TT, 500, 4000); //Timer 실행
+                            startRefreshTimer(2000);
                         }
                         else if(resultData.getType().equals("updateResponse")) {
                             //상태 조회 응답이 오면, data를 갱신한다.
@@ -542,22 +538,26 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
         }
 
         //에어컨 전체 상태 조회. 조회해서 data에 대입해준다.
-        updateData();
+        startRefreshTimer(300);
+        //updateData();
+    }
+
+    private void startRefreshTimer(int delay){
+        timer = new Timer();
+        TT = new TimerTask() {
+            @Override
+            public void run() {
+                // 반복실행할 구문
+                updateData();
+            }
+        };
+        timer.schedule(TT, delay, 4000); //Timer 실행
     }
 
 
     @Override
     protected void onClose() {
         super.onClose();
-        ((MainActivity) getContext()).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        WallpadStatusData wd = new WallpadStatusData(this.getContext());
-        Log.d(TAG, "close db val = " + wd.GetCurrentScreenIDValue());
-
-        wd.SetCurrentScreenIDValue(0);
-        Log.d(TAG, "change close db val = " + wd.GetCurrentScreenIDValue());
-
-        wd.closeDB();
 
         if (timer != null)
             timer.cancel();
@@ -596,11 +596,8 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             }
             if (nTargetId == ID.KnxSystemAirconMain.button.ALL_ONOFF) {
                 DebugLogOutput("onTouchEvent [ALL_ONOFF] BUTTON !!!");
-                if (timer != null)
-                    timer.cancel();
                 if (OPERATION_MODE == Common.MODE_NOMAL) {
                     byte onoff = KnxSystemAircon.ONOFF.AirconON;
-                    //madeinLab**
                     if(bCurrentAllOnOff) {
                         onoff = KnxSystemAircon.ONOFF.AirconOFF;
                     }
@@ -618,7 +615,8 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
                     //Sample_AllControl(!bCurrentAllOnOff, true, nCurrentAllModeIdx);
                     Sound().Play(SND.effect.TOUCH_LATCHED);
                 }
-            } else if ((nTargetId >= ID.KnxSystemAirconMain.button.ROOM_TITLE_1) && (nTargetId <= ID.KnxSystemAirconMain.button.ROOM_TITLE_MAX)) {
+            }
+            else if ((nTargetId >= ID.KnxSystemAirconMain.button.ROOM_TITLE_1) && (nTargetId <= ID.KnxSystemAirconMain.button.ROOM_TITLE_MAX)) {
                 if (timer != null)
                     timer.cancel();
                 Sound().Play(SND.effect.TOUCH_LATCHED);
@@ -679,14 +677,12 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
 
                     ((MainActivity) (getContext())).StartPopup(ID.screen.SystemAirconPopupTestScreen, data);
                 }
-            } else if ((nTargetId >= ID.KnxSystemAirconMain.button.ROOM_ONOFF_1) && (nTargetId <= ID.KnxSystemAirconMain.button.ROOM_ONOFF_MAX))
+            }
+            else if ((nTargetId >= ID.KnxSystemAirconMain.button.ROOM_ONOFF_1) && (nTargetId <= ID.KnxSystemAirconMain.button.ROOM_ONOFF_MAX))
             {
                 // 각방 ON/OFF 클릭
                 int index = nTargetId - ID.KnxSystemAirconMain.button.ROOM_ONOFF_1;
                 DebugLogOutput("onTouchEvent [ROOM_ONOFF_" + (index+1) + "] BUTTON !!!");
-                if (timer != null)
-                    timer.cancel();
-
                 if (OPERATION_MODE == Common.MODE_NOMAL)
                 {
                     int pos = ROOM_POS[index];
@@ -728,20 +724,16 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             }
             else if((nTargetId >= ID.KnxSystemAirconMain.button.AUTO_MODE) && (nTargetId <= ID.KnxSystemAirconMain.button.HEAT_MODE))
             {
-                if (timer != null)
-                    timer.cancel();
                 int mode = nTargetId - ID.KnxSystemAirconMain.button.AUTO_MODE;
                 int ret = Device_AllMode((byte)mode);
-                if (ret >= 0) {
-                    Sound().Play(SND.effect.TOUCH_LATCHED);
-                    savedMode = (byte)mode;         //모드저장
-                }
-                else Sound().Play(SND.effect.TOUCH_UNLATCHED);
+                //if (ret >= 0) {
+                //    Sound().Play(SND.effect.TOUCH_LATCHED);
+                //    savedMode = (byte)mode;         //모드저장
+                //}
+                //else Sound().Play(SND.effect.TOUCH_UNLATCHED);
             }
             else if((nTargetId >= ID.KnxSystemAirconMain.button.AUTO_VOLUME) && (nTargetId <= ID.KnxSystemAirconMain.button.STRONG_VOLUME))
             {
-                if (timer != null)
-                    timer.cancel();
                 int volume = nTargetId - ID.KnxSystemAirconMain.button.AUTO_VOLUME;
                 int ret = Device_AllVolume((byte)volume);
                 if (ret >= 0) {
@@ -749,8 +741,6 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
                 }
                 else Sound().Play(SND.effect.TOUCH_UNLATCHED);
             }
-
-
         }
     }
 
@@ -764,7 +754,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             public void run() {
                 updateData();
             }
-        }, 5000);
+        }, 2000);
 
     }
 
@@ -779,6 +769,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
 
 
     private void Draw_Update(byte index) {
+        DebugLogOutput("aircontest--[Draw_Update]" );
         int startIdx = (CurrentPageNum - 1) * ROOM_CNT;
         KnxSystemAircon.Info info = mData.systemAircon.Device.info;
         //에어컨 연동상태를 체크해서 에어컨 연동완료 일때만 UI를 그려준다. 그 이전에 alarm 문구 노출.
@@ -850,8 +841,8 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
 
 
             //루버 상태 update draw
-            LouverAPI.Data louverData = mDataLouver.louver;
-            Draw_LouverStatusChange(louverData.LouverStatus);
+            //LouverAPI.Data louverData = mDataLouver.louver;
+            //Draw_LouverStatusChange(louverData.LouverStatus);
         } else if(index == INDEX_LOUVER){
             //루버 상태 update draw
             LouverAPI.Data louverData = mDataLouver.louver;
@@ -869,6 +860,8 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
     }
 
     private void Draw_CurrentPage(KnxSystemAircon.Info info, int startIdx) {
+        Log.e(TAG, "aircontest--Draw_CurrentPage(int startIdx)" + startIdx  + "(int CurrentPageNum)" + CurrentPageNum);
+
         try {
             //에어컨 연동상태를 체크해서 에어컨 연동완료 일때만 UI를 그려준다. 그 이전에 alarm 문구 노출.
             if(info.AirconStatus!= KnxSystemAircon.Status.COMPLETE){
@@ -906,10 +899,11 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
                 RightMoveBtn.setVisibility(View.INVISIBLE);
                 PageNumText.setVisibility(View.INVISIBLE);
             }
-
+/*
             if (startIdx > 0 && startIdx % ROOM_CNT == 0) {
                 for (int j = 0; j < startIdx; j++) {
-                    roomView[j].setVisible(false);
+                    if (roomView[j] != null)
+                        roomView[j].setVisible(false);
                 }
             } else {
                 for (int j = ROOM_CNT; j < info.InsideAirconCount; j++) {
@@ -917,6 +911,12 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
                         roomView[j].setVisible(false);
                 }
             }
+*/
+            if (startIdx >= 0 && startIdx % ROOM_CNT == 0) {
+                for (int j = 0; j < roomView.length; j++) {
+                    if (roomView[j] != null) roomView[j].setVisible(false);
+                }
+            }
 
             int left, top;
             for (int i = startIdx; i < info.InsideAirconCount && i < startIdx + ROOM_CNT; i++) {
@@ -928,7 +928,6 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
                 Draw_TitleUpdate(i);
             }
         } catch (Exception e) {
-            Log.e(TAG, "[Exception] Draw_CurrentPage(HeatingV2.Info info, int startIdx)");
             e.printStackTrace();
         }
     }
@@ -939,6 +938,8 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
      * @param bNext - (boolean) true이면 다음 이동, false이면 이전 이동
      */
     private void MovePage(boolean bNext) {
+        //if (timer != null)
+        //    timer.cancel();
         try {
             if (bNext) {
                 CurrentPageNum++;
@@ -982,6 +983,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
         if (!Draw_RangeChecker(index)) return;
 
         DebugLogOutput("[Draw_ModeChange] Aircon[" + index + "].OnOff = " + mData.systemAircon.Device.Aircon[index].OnOff);
+        DebugLogOutput("aircontest--[Draw_OnOffChange]" );
         int pos = ROOM_POS[index];
         if (mData.systemAircon.Device.Aircon[pos].OnOff == KnxSystemAircon.ONOFF.AirconON)
             roomView[index].OnOffBtn.setButtonRearImage();
@@ -1139,6 +1141,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
     private void Draw_TitleChange(int index, String value)
     {
         if(!Draw_RangeChecker(index)) return;
+        roomView[index].TitleText.setText(value);
         roomView[index].TitleText.setTextSize(0, Common.fontsize._30);
         if(value.length() == 6)
         {
@@ -1331,6 +1334,7 @@ public class KnxSystemAirconMainTestScreen extends WpadScreen {
             byte vVolume = KnxSystemAircon.VOLUME.Auto;
             byte vMode = mode;
             byte controlValue = (byte) (vOnOff+(vVolume<<2)+(vMode<<4));
+            savedMode = (byte)mode;         //모드저장
             requestMultiCommand(JSON.KIND.All,JSON.REASON.Control,0, "switch",0, controlValue);
             //ret = Device_AllControl(controlValue);
         }

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

@@ -226,7 +226,6 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
     // =================================================================================================
     public KnxSystemAirconPopupTestScreen(Context context, RelativeLayout layout, WallPadAPI wpapi, int operationMode) {
         super(context, layout);
-        Log.i(TAG, "[START - SystemAirconPopupScreen] --------------------------------------------");
         mContext = context;
         // 1. Data Create
         DebugLogOutput("[Create] - Step1 : Data Create");
@@ -388,8 +387,6 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
             e.printStackTrace();
         }
 
-
-
         super.onClose();
     }
 
@@ -402,6 +399,8 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
 
         // (영업샘플모드) 변경 데이터 전달
         if (OPERATION_MODE == Common.MODE_BUSINESS_SAMPLE) Sample_setPopupResult();
+        Intent data = new Intent();
+        super.setPopupResult(data);
     }
 
     // =================================================================================================
@@ -429,7 +428,8 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
                 super.finish();
             } else if (nTargetId == ID.KNxSystemAirconPopup.button.ROOM_PREV) {
                 DebugLogOutput("onTouchEvent [ROOM_PREV] BUTTON !!!");
-                Sound().Play(SND.effect.TOUCH_LATCHED);
+                //Sound().Play(SND.effect.TOUCH_LATCHED);
+                Device_NowAllSet();  //방이동시 변경사항 적용.
                 mCurrentOriginRoomIndex--;
                 if (mCurrentOriginRoomIndex < 0)
                     mCurrentOriginRoomIndex = (int) (mData.systemAircon.Device.info.InsideAirconCount - 1);
@@ -438,7 +438,8 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
                 Draw_Update((byte) mCurrentRoomIndex);
             } else if (nTargetId == ID.KNxSystemAirconPopup.button.ROOM_NEXT) {
                 DebugLogOutput("onTouchEvent [ROOM_PREV] BUTTON !!!");
-                Sound().Play(SND.effect.TOUCH_LATCHED);
+                //Sound().Play(SND.effect.TOUCH_LATCHED);
+                Device_NowAllSet();  //방이동시 변경사항 적용.
                 mCurrentOriginRoomIndex++;
                 if (mCurrentOriginRoomIndex >= (int) mData.systemAircon.Device.info.InsideAirconCount)
                     mCurrentOriginRoomIndex = 0;
@@ -447,6 +448,7 @@ public class KnxSystemAirconPopupTestScreen extends WpadScreen {
                 Draw_Update((byte) mCurrentRoomIndex);
             } else if (nTargetId == ID.KNxSystemAirconPopup.button.ONOFF) {
                 // 각방 ON/OFF 클릭
+                Sound().Play(SND.effect.TOUCH_LATCHED);
                 byte hOnOff = mData.systemAircon.Device.Aircon[mCurrentRoomIndex].OnOff;
                 if (hOnOff == KnxSystemAircon.ONOFF.AirconOFF)
                     hOnOff = KnxSystemAircon.ONOFF.AirconON;

+ 1 - 6
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java

@@ -182,10 +182,6 @@ public class LightKnxMainTestScreen extends WpadScreen {
             "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "임시", "임시", "임시", "임시"};
 
 
-    private String[] mDefaultRoomNameList_PH = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "임시", "임시", "임시", "임시"};
-
-
     // [Class]
 
     /**
@@ -359,7 +355,6 @@ public class LightKnxMainTestScreen extends WpadScreen {
                 mData.Light_Switch[i] = LightSwitch;
             }
 
-
             //     6.3. update
             try {
                 AllEMcount = mData.MasterController.Info.Light_SwitchCount + mData.MasterController.Info.Bad_EnergyMeterCount + mData.MasterController.Info.Liv_EnergyMeterCount;
@@ -472,7 +467,7 @@ public class LightKnxMainTestScreen extends WpadScreen {
                                     updateData();
                                 }
                             };
-                            timer.schedule(TT, 500, 2000); //Timer 실행
+                            timer.schedule(TT, 500, 3500); //Timer 실행
 /*
                             new Handler().postDelayed(new Runnable() {
                                 @Override

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

@@ -109,10 +109,7 @@ public class LightKnxPopupTestScreen extends WpadScreen {
     private int[] ROOM_POS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
 
 
-    private String[] mDefaultRoomNameList = new String[]{"거실!", "거실!", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2","보조주방","욕실3","욕실4","욕실5","복도2", "현관", "신발장", "창고", "주방2", "간이주방"};
-
-    private String[] mDefaultRoomNameList_PH = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
+    private String[] mDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
             "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "임시", "임시", "임시", "임시"};
 
 
@@ -395,7 +392,7 @@ public class LightKnxPopupTestScreen extends WpadScreen {
                                     updateData();
                                 }
                             };
-                            timer.schedule(TT, 1000, 2500); //Timer 실행
+                            timer.schedule(TT, 1000, 3500); //Timer 실행
                         }
                         else if(resultData.getType().equals("updateResponse")) {
                             //상태 조회 응답이 오면, data를 갱신한다.

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/SystemAirconTestScreen.java

@@ -492,7 +492,7 @@ public class SystemAirconTestScreen extends WpadScreen {
             mContext = context;
             OPERATION_MODE = operationMode;
             //for test
-            OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
+            //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
             bLouverUsage = checkLouverUsage();
 
             //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/VentiPopupReservationTestScreen.java

@@ -309,7 +309,7 @@ public class VentiPopupReservationTestScreen extends WpadScreen {
                                     updateData();
                                 }
                             };
-                            timer.schedule(TT, 500, 2000); //Timer 실행
+                            timer.schedule(TT, 500, 3500); //Timer 실행
                         } else if (resultData.getType().equals("updateResponse")) {
                             //상태 조회 응답이 오면, data를 갱신한다.
                             makeDeviceData(jsonObject);

+ 1 - 1
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/VentilationMainTestScreen.java

@@ -547,7 +547,7 @@ public class VentilationMainTestScreen extends WpadScreen {
                                     updateData();
                                 }
                             };
-                            timer.schedule(TT, 500, 2000); //Timer 실행
+                            timer.schedule(TT, 500, 3500); //Timer 실행
                         } else if (resultData.getType().equals("updateResponse")) {
                             //상태 조회 응답이 오면, data를 갱신한다.
                             makeDeviceData(jsonObject);

+ 1 - 1
WallPadMain/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadmain"
     android:versionCode="17"
-    android:versionName="2021.11.15.01">
+    android:versionName="2021.11.17.02">
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

+ 1 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/WallPadiMAPUpgrade.java

@@ -537,7 +537,7 @@ public class WallPadiMAPUpgrade {
     public static final String IHN_1040_ID = "IHN1040";   // 보급형(엔트리급) 월패드
     public static final String IHN_1050_ID = "IHN1050";   // 대우건설향 월패드
 	public static final String IHN_D101_I_ID = "IHND101-I";   // 조그월패드 (중국생산)
-	public static final String IHN_D101_I_LX2_ID = "IHND101-I-LX";   // 조그월패드 (중국생산)
+	public static final String IHN_D101_I_LX2_ID = "IHND101-I-LX2";   // 조그월패드 (중국생산)
 	public static final String IHN_D101K_I_ID = "IHND101K-I";   // 카카오 조그월패드 (중국생산)
 	public static final String IHN_D101_I_OCF_ID = "IHND101-I-OCF";   // 조그월패드 (OCF 월패드, 중국생산)
 	public static final String IHN_1010_I_ID = "IHN1010-I";   // 대외향 월패드 (중국생산)

+ 2 - 0
WallPadSupport/src/main/java/kr/co/icontrols/wallpadsupport/Version.java

@@ -413,6 +413,8 @@ public class Version {
         else if (ModelName.equals("ILP-300FR-2443")) mPlatformType = PLATFORM_TYPE.A40i;
         else if (ModelName.equals("ILP-300-6410")) mPlatformType = PLATFORM_TYPE.A40i;
         else if (ModelName.equals("ILP-300FR-6410")) mPlatformType = PLATFORM_TYPE.A40i;
+        else if (ModelName.equals("IHN-D101-I_LX2")) mPlatformType = PLATFORM_TYPE.A40i;
+        else if (ModelName.equals("IHN-1010-I_LX2")) mPlatformType = PLATFORM_TYPE.A40i;
         else mPlatformType = PLATFORM_TYPE.OTHER;
 
         return mPlatformType;