Ver código fonte

아이콘 정리, 일부 예외처리, 타이머 주기 조절,

jslee(madeinlab) 3 anos atrás
pai
commit
aa53e81824
18 arquivos alterados com 58 adições e 47 exclusões
  1. BIN
      ManagerSetting/libs/WallPadAPI.jar
  2. BIN
      ManagerSetting/libs/WallPadSupport.jar
  3. 1 1
      ManagerSetting/src/main/AndroidManifest.xml
  4. 4 4
      ManagerSetting/src/main/java/com/artncore/managersetting/dao/MainDatabaseManager.java
  5. BIN
      WallPadAPI/jar/WallPadAPI.jar
  6. BIN
      WallPadAPI/jar/WallPadAPIforSVC.jar
  7. 5 6
      WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java
  8. 1 0
      WallPadAPI/src/main/java/com/artncore/commons/define.java
  9. BIN
      WallPadDevService/libs/WallPadAPIforSVC.jar
  10. 7 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java
  11. 20 14
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java
  12. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2TestScreen.java
  13. 0 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java
  14. 1 1
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java
  15. 11 9
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java
  16. BIN
      WallPadMain/libs/WallPadAPI.jar
  17. 4 4
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/IconManager.java
  18. 3 3
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

BIN
ManagerSetting/libs/WallPadAPI.jar


BIN
ManagerSetting/libs/WallPadSupport.jar


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

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.managersetting"
     android:versionCode="23"
-    android:versionName="2021.11.03.01">
+    android:versionName="2021.12.08.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 4 - 4
ManagerSetting/src/main/java/com/artncore/managersetting/dao/MainDatabaseManager.java

@@ -1598,7 +1598,7 @@ public class MainDatabaseManager {
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_NOTICE:
-                        devInfo = "1(1:공지사항(사용함))";
+                        devInfo = "1(1:공지사항(사용함))";
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_WEATHER:
@@ -1614,7 +1614,7 @@ public class MainDatabaseManager {
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_SCHEDULE:
-                        devInfo = "1(1:일정표(사용함))";
+                        devInfo = "1(1:일정표(사용함))";
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_PARKING:
@@ -1638,7 +1638,7 @@ public class MainDatabaseManager {
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_CCTV:
-                        devInfo = "1(1:CCTV(사용함)종류( 삼성테크윈 )버튼(IP:10.0.1.80*Camera:1*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터1)버튼(IP:10.0.1.80*Camera:2*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터2)버튼(IP:10.0.1.80*Camera:3*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터3)버튼(IP:10.0.1.40*Camera:4*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터4)버튼(IP:10.0.1.80*Camera:5*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터5))";
+                        devInfo = "1(1:CCTV(사용함)종류( 삼성테크윈 )버튼(IP:10.0.1.80*Camera:1*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터1)버튼(IP:10.0.1.80*Camera:2*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터2)버튼(IP:10.0.1.80*Camera:3*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터3)버튼(IP:10.0.1.40*Camera:4*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터4)버튼(IP:10.0.1.80*Camera:5*Pass:333*vPort:6801*cPort:6800*Site:admin*Where:놀이터5))";
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_CARGUEST:
@@ -1754,7 +1754,7 @@ public class MainDatabaseManager {
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_ELECTRIC_CAR:
-                        devInfo = "1(1:전기차충전(사용함)IP(10.0.1.1:10000))";
+                        devInfo = "1(1:전기차충전(사용함)IP(10.0.1.1:10000))";
                         break;
 
                     case SETTING_ITEM_SUB_DEVICE_LH_ADD_FUNCTION:

BIN
WallPadAPI/jar/WallPadAPI.jar


BIN
WallPadAPI/jar/WallPadAPIforSVC.jar


+ 5 - 6
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java

@@ -149,7 +149,7 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_MOOD_LIGHT, define.DEVICE_DISABLE, "종류(하단등)"}, //17.11.02 사용안함으로 변경(현정배CJ 요청)
 
             {"1", "1", define.DEVICE_ID_PARKING, define.DEVICE_DISABLE, "종류(아이콘트롤스)IP(10.0.1.10:10000)"},
-            {"1", "1", define.DEVICE_ID_ELECTRIC_CAR, define.DEVICE_DISABLE, "IP(10.0.1.1:10000)"},
+            {"1", "1", define.DEVICE_ID_ELECTRIC_CAR, define.DEVICE_ENABLE, "IP(10.0.1.1:10000)"},
             {"1", "1", define.DEVICE_ID_ENERGY_SERVER_CONNECT, define.DEVICE_DISABLE, "IP(10.0.1.1:10000)검침일사용자설정(사용안함)"},
             {"1", "1", define.DEVICE_ID_BLE_SMARTKEY, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_SUBPHONE_BAUDRATE, define.DEVICE_ENABLE, "종류(9600)"},
@@ -160,7 +160,9 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_GATEWAY_MODEL_KIND, define.DEVICE_ENABLE, "종류(IGW300)"},
             {"1", "1", define.DEVICE_ID_ESCAPELADDER_DOWN_SEND, define.DEVICE_ENABLE, "종류(윗집)"},
             {"1", "1", define.DEVICE_ID_MOBILEAPP_AUTH_USE, define.DEVICE_ENABLE, ""},
-            {"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_ENABLE, "종류(스마트분전반)"},
+            {"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_ENABLE, "종류(KNX분전반)"},
+            {"1", "1", define.DEVICE_ID_CONCENT, define.DEVICE_DISABLE, ""},
+            {"1", "1", define.DEVICE_ID_CONCENT, define.DEVICE_DISABLE, ""},
     };
 
 
@@ -2600,8 +2602,7 @@ public class wallpaddbmgr {
      * **/
     public void initWidgetData() {
         if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
-                || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
-                ) {
+                || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I) {
             InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_ELEVATOR.getID());
             InsertinitWidgetData(1, define.ICONS.MENUS.TALK_FRONT.getID());
             InsertinitWidgetData(2, define.ICONS.MENUS.TALK_GUARD.getID());
@@ -2614,8 +2615,6 @@ public class wallpaddbmgr {
             InsertinitWidgetData(9, define.ICONS.MENUS.SECURITY_SETARMED.getID());
             InsertinitWidgetData(10, define.ICONS.MENUS.ADD_CCTV.getID());
             InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());
-
-
         }
         else if(mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2 || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF){
             InsertinitWidgetData(0, define.ICONS.MENUS.TALK_NEIGHBOR.getID());

+ 1 - 0
WallPadAPI/src/main/java/com/artncore/commons/define.java

@@ -645,6 +645,7 @@ public class define {
 	public static final String DEVICE_ID_BATCHLIGHT    = "스마트스위치&일괄소등";
 	public static final String DEVICE_ID_REMOTECON     = "무선리모컨";
 	public static final String DEVICE_ID_DOORCAM       = "현관카메라";
+	public static final String DEVICE_ID_CONCENT       = "콘센트";
 
 	public static final String DEVICE_ID_ENERGY_DEVICES           = "에너지제품군";
 	public static final String DEVICE_ID_IPARKENERGY              = "아이파크에너지"; //에너지미터

BIN
WallPadDevService/libs/WallPadAPIforSVC.jar


+ 7 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_heating/HeatingV2MainScreen.java

@@ -907,8 +907,13 @@ public class HeatingV2MainScreen extends WpadScreen {
                 }
             }
             else {
-
-                byte pos = (byte) ROOM_POS[index];
+                int pos = 0;
+                for(int i = 0 ; i<ROOM_POS.length;i++){
+                    if(index==ROOM_POS[i]){
+                        pos = i;
+                        break;
+                    }
+                }
 
                 if (!checkRoomIndex(pos)) return;
 

+ 20 - 14
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HeatingV2PopupTestScreen.java

@@ -241,15 +241,17 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
     }
 
     private void startRefreshTimer(int delay){
-        resetTimer();
-        TT = new TimerTask() {
-            @Override
-            public void run() {
-                // 반복실행할 구문
-                updateData();
-            }
-        };
-        timer.schedule(TT, delay, 5000); //Timer 실행
+        try {
+            resetTimer();
+            TT = new TimerTask() {
+                @Override
+                public void run() {
+                    // 반복실행할 구문
+                    updateData();
+                }
+            };
+            timer.schedule(TT, delay, 2500); //Timer 실행
+        }catch (Exception e){}
     }
     private void resetTimer(){
         if(TT != null)
@@ -744,12 +746,14 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                     super.setPopupResult(data);
 
                     super.finish();
-                } else if (TargetId == ID.heatingV2Popup.button.MANUAL) {
+                }
+                else if (TargetId == ID.heatingV2Popup.button.MANUAL) {
                     Log.i(TAG, "onTouchEvent [MANUAL] BUTTON !!!");
                     Sound().Play(SND.effect.TOUCH_LATCHED);
 
                     ((PopupActivity) getContext()).StartManual(ID.MANUAL.MANUAL_HeatingPop);
-                } else if (TargetId == ID.heatingV2Popup.button.ROOMSEL_LEFT) {
+                }
+                else if (TargetId == ID.heatingV2Popup.button.ROOMSEL_LEFT) {
                     DebugLogOutput("onTouchEvent [ROOMSEL_LEFT] BUTTON !!!");
                     Sound().Play(SND.effect.TOUCH_LATCHED);
 
@@ -770,7 +774,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                     Draw_TitleChange(mCurrentRoomIndex);
                     //if (OPERATION_MODE == Common.MODE_NOMAL) Device_SetPollingMode(POLLING_MODE.FixRoom, (byte) mCurrentRoomIndex);
                     drawUpdate((byte) mCurrentRoomIndex);
-                } else if (TargetId == ID.heatingV2Popup.button.ROOMSEL_RIGHT) {
+                }
+                else if (TargetId == ID.heatingV2Popup.button.ROOMSEL_RIGHT) {
                     DebugLogOutput("onTouchEvent [ROOMSEL_RIGHT] BUTTON !!!");
                     Sound().Play(SND.effect.TOUCH_LATCHED);
 
@@ -790,7 +795,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
                     Draw_TitleChange(mCurrentRoomIndex);
                     //if (OPERATION_MODE == Common.MODE_NOMAL) Device_SetPollingMode(POLLING_MODE.FixRoom, (byte) mCurrentRoomIndex);
                     drawUpdate((byte) mCurrentRoomIndex);
-                } else if ((TargetId >= ID.heatingV2Popup.text.TAB_DEFAULT) && (TargetId <= ID.heatingV2Popup.text.TAB_SLEEP)) {
+                }
+                else if ((TargetId >= ID.heatingV2Popup.text.TAB_DEFAULT) && (TargetId <= ID.heatingV2Popup.text.TAB_SLEEP)) {
                     int index = TargetId - ID.heatingV2Popup.text.TAB_DEFAULT;
                     DebugLogOutput("onTouchEvent [TAB_" + (index + 1) + "] BUTTON !!!");
 
@@ -1432,7 +1438,7 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
         mData.TempSetDelayedEnable = true;
 
         // 4. 핸들러에 메시지 전송
-        mDeviceTempSetHandler.sendEmptyMessageDelayed(DEVICE_CMD_TEMP_CHANGE, 600);
+        mDeviceTempSetHandler.sendEmptyMessageDelayed(DEVICE_CMD_TEMP_CHANGE, 300);
 
         return true;
     }

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

@@ -623,7 +623,7 @@ public class HeatingV2TestScreen extends WpadScreen {
                     updateData();
                 }
             };
-            timer.schedule(TT, delay, 2500); //Timer 실행
+            timer.schedule(TT, delay, 1500); //Timer 실행
         }catch (Exception e){}
     }
 

+ 0 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/KnxSystemAirconMainTestScreen.java

@@ -878,8 +878,6 @@ 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){

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

@@ -562,7 +562,7 @@ public class LightKnxMainTestScreen extends WpadScreen {
                     updateData();
                 }
             };
-            timer.schedule(TT, delay, 3000); //Timer 실행
+            timer.schedule(TT, delay, 2000); //Timer 실행
         }catch (Exception e){}
     }
 

+ 11 - 9
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java

@@ -483,15 +483,17 @@ public class LightKnxPopupTestScreen extends WpadScreen {
     }
 
     private void startRefreshTimer(int delay){
-        resetTimer();
-        TT = new TimerTask() {
-            @Override
-            public void run() {
-                // 반복실행할 구문
-                updateData();
-            }
-        };
-        timer.schedule(TT, delay, 4000); //Timer 실행
+        try {
+            resetTimer();
+            TT = new TimerTask() {
+                @Override
+                public void run() {
+                    // 반복실행할 구문
+                    updateData();
+                }
+            };
+            timer.schedule(TT, delay, 4000); //Timer 실행
+        }catch (Exception e){}
     }
 
     /**

BIN
WallPadMain/libs/WallPadAPI.jar


+ 4 - 4
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/IconManager.java

@@ -470,20 +470,20 @@ public class IconManager {
             }
 
             // CCTV
-            if (nCCTVMonitoringEnable == WallpadDeviceSet.DEV_DATA_ENABLE || nCCTVMonitoringEnable == WallpadDeviceSet.DEV_DATA_NONE) {
+            if (nCCTVMonitoringEnable == WallpadDeviceSet.DEV_DATA_ENABLE) {
                 mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_CCTV.getID(), ID.ICONS.MENUS.ADD_CCTV.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Cctv,
                         R.drawable.icon_add_cctv_normal, R.drawable.icon_add_cctv_pressed, R.drawable.icon_add_cctv_pressed, R.drawable.icon_add_cctv_pressed);
             }
 
             // 주차확인
-            if (nParkingLocationEnable == WallpadDeviceSet.DEV_DATA_ENABLE || nParkingLocationEnable == WallpadDeviceSet.DEV_DATA_NONE) {
+            if (nParkingLocationEnable == WallpadDeviceSet.DEV_DATA_ENABLE) {
                 mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_PARKING.getID(), ID.ICONS.MENUS.ADD_PARKING.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.Parking,
                         R.drawable.icon_add_parking_normal, R.drawable.icon_add_parking_pressed, R.drawable.icon_add_parking_pressed, R.drawable.icon_add_parking_pressed);
             }
 
             // 차량출입내역
-            mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_PARKINGLIST.getID(), ID.ICONS.MENUS.ADD_PARKINGLIST.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.ParkingList,
-                    R.drawable.icon_add_parkinglist_normal, R.drawable.icon_add_parkinglist_pressed, R.drawable.icon_add_parkinglist_pressed, R.drawable.icon_add_parkinglist_pressed);
+            //mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ADD_PARKINGLIST.getID(), ID.ICONS.MENUS.ADD_PARKINGLIST.getNameKR(), ID.LINKEDSCREEN.SubMenuAddService.ParkingList,
+            //        R.drawable.icon_add_parkinglist_normal, R.drawable.icon_add_parkinglist_pressed, R.drawable.icon_add_parkinglist_pressed, R.drawable.icon_add_parkinglist_pressed);
 
             // 전기차충전
             if (nElecVehicleChargingEnable == WallpadDeviceSet.DEV_DATA_ENABLE) {

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

@@ -15979,9 +15979,9 @@ public class iMapServer extends Service {
     private boolean getCallAppRunning() {
         boolean bRunning = false;
         try {
-            WallpadStatusData WallpadStatusData = new WallpadStatusData(getApplicationContext());
-            bRunning = WallpadStatusData.GetCallAPKStatusRunning();
-            WallpadStatusData.closeDB();
+            WallpadStatusData wallpadStatusData = new WallpadStatusData(getApplicationContext());
+            bRunning = wallpadStatusData.GetCallAPKStatusRunning();
+            wallpadStatusData.closeDB();
 
 //            Log.d(TAG, "[getCallAppRunning] bRunning = " + bRunning);
             return bRunning;