瀏覽代碼

[WallPadMain]
1. 보드 명 추가(대외향 월패드 6410)
- 인터페이스, 거실조명(KCC), 멀티스위치(KCC), 마그네틱 센서 신호, 내부동체 신호, 외부동체 신호, ShortCutBox, 업그레이드
2. 버전업
- 2022.08.23.01 -> 2022.09.20.01
3. 최신 APK 등록

jglee 2 年之前
父節點
當前提交
5adeb29fbc

二進制
10_Release/WallPadMain.apk


+ 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="2022.08.23.01">
+    android:versionName="2022.09.20.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 1 - 0
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/IOInterface.java

@@ -260,6 +260,7 @@ public class IOInterface {
                 case MODEL_TYPE.IHN_1010:
                 case MODEL_TYPE.IHN_1010_I:
                 case MODEL_TYPE.IHN_1010_I_2443:
+                case MODEL_TYPE.IHN_1010_I_6410:
                 case MODEL_TYPE.IHN_T1010:
                 case MODEL_TYPE.IHN_T1010_I:
                 case MODEL_TYPE.IHN_HS101:

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

@@ -430,7 +430,7 @@ public class MainActivity extends WpadActivity {
                 }
             }
             else if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I
-            || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443
+            || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443  || Version.getModelType() == MODEL_TYPE.IHN_1010_I_6410
             ) {
                 Log.i(TAG, "[initLivinglightPreset] Initialize preset for IHN-1010(-I)");
                 if (getKCCDimmingCtrl()) {

+ 2 - 2
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/screen/MAIN.java

@@ -332,7 +332,7 @@ public class MAIN extends WpadScreen {
                 }
             }
             else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I
-                    || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_2443) {
+                    || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_6410) {
                 if (getKCCDimmingCtrl()) {
                     Log.w(TAG, "[registerLightCtrlBTN] Register 4 preset buttons!! -> IHN_1010(-I)");
                     BTN_LIGHT_PRESET_01_DIMMING = new WpadImageView(mContext, TOUCH_KIND.BUTTON, getPosition(ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_PRESET_01_DIMMING).W, getPosition(ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_PRESET_01_DIMMING).H, new int[] { R.drawable.main_btn_preset01_dim_normal_normal, R.drawable.main_btn_preset01_dim_normal_pressed }, new int[] { R.drawable.main_btn_preset01_dim_normal_selected, R.drawable.main_btn_preset01_dim_normal_pressed }, ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_PRESET_01_DIMMING);
@@ -581,7 +581,7 @@ public class MAIN extends WpadScreen {
                 else HDCLivingLightDriverCheckHandler.sendEmptyMessage(0);
             }
             else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I
-                    || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_2443) {
+                    || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_6410) {
                 if (getKCCDimmingCtrl()) {
                     mMultiSwitchData = new MultiSwitchAPI.Data();
                     if (loadMultiSwitchController(mWallPadAPI) >= 0) updateMultiSwitchStatus(false, (byte) 0x00);

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

@@ -666,7 +666,7 @@ public class ShortcutBox {
                 }
             }
             else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I
-					|| Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_2443) {
+					|| Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_6410) {
                 // 엘리베이터
                 if (strElevEnable!=null && strElevEnable.contains("사용함")) {
                     allWidget[nWidgetCnt++] = new IconUnitInfo(ID.SHORTCUTS.IDS.ELEVATOR, ID.SHORTCUTS.NAMES.ELEVATOR, ID.LINKEDSCREEN.OtherFunc.ELEVATOR_CALL,

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

@@ -545,6 +545,7 @@ public class WallPadiMAPUpgrade {
 	public static final String IHN_1010GL_I_2443_ID = "IHN1010GL-I-2443";   // 현산향 2443 대체품 월패드 (중국생산)
 	public static final String IHN_1010GL_I_6410_ID = "IHN1010GL-I-6410";   // 현산향 6410 대체품 월패드 (중국생산)
 	public static final String IHN_1010_I_2443_ID = "IHN1010-I-2443";   // 대외향 2443 대체품 월패드 (중국생산)
+	public static final String IHN_1010_I_6410_ID = "IHN1010-I-6410";   // 대외향 2443 대체품 월패드 (중국생산)
 	public static final String IHN_T1010_I_ID = "IHNT1010-I";   // 힘찬건설향 월패드 (중국생산)
 	public static final String IHN_HS101_I_ID = "IHNHS101-I";   //  효성건설향 월패드 (중국생산)
 	public static final String IHN_1030_I_ID = "IHN1030-I";   // 보급형(엔트리급) 월패드 (중국생산)
@@ -652,6 +653,14 @@ public class WallPadiMAPUpgrade {
 						return false;
 					}
 				}
+				else if(Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_6410) {
+					// V40 플랫폼 업그레이드
+					if (!(astrFileName[1].equals(DEV_V40_ARCH_ID) || astrFileName[1].equals(DEV_A40i_ARCH_ID)) || !astrFileName[2].equals(IHN_1010_I_6410_ID)  || (astrFileName[3].length() != 14)) {
+						Log.d( TAG ,  "[checkDownloadFilename] astrFileName[1] : + " + astrFileName[1] + ", DEV_V40_ARCH_ID :" + DEV_V40_ARCH_ID);
+						Log.d( TAG ,  "[checkDownloadFilename] astrFileName[3].length() : + " + astrFileName[3].length());
+						return false;
+					}
+				}
                 else if(Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL) {
                     // V40 플랫폼 업그레이드
                     if (!(astrFileName[1].equals(DEV_V40_ARCH_ID) || astrFileName[1].equals(DEV_A40i_ARCH_ID)) || !astrFileName[2].equals(IHN_1010GL_ID)  || (astrFileName[3].length() != 14)) {

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

@@ -2463,7 +2463,7 @@ public class iMapServer extends Service {
 						if (MgrAppRun) return;
 
                         if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I
-                                || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443) {
+                                || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443 || Version.getModelType() == MODEL_TYPE.IHN_1010_I_6410) {
 							WallPadInterface mWallPadInterface = new WallPadInterface();
 							int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MAG0_STATE, 0);
 							if (sensorMag == 0) return;
@@ -2543,7 +2543,7 @@ public class iMapServer extends Service {
                         }
 
                             if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I
-                                    || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443) {
+                                    || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443 || Version.getModelType() == MODEL_TYPE.IHN_1010_I_6410) {
                                 WallPadInterface mWallPadInterface = new WallPadInterface();
                                 int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MOTIN_STATE, 0);
                                 if (sensorMag == 0) return;
@@ -2579,7 +2579,7 @@ public class iMapServer extends Service {
                         }
 
                         if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I
-                                || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443) {
+                                || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443 || Version.getModelType() == MODEL_TYPE.IHN_1010_I_6410) {
                             WallPadInterface mWallPadInterface = new WallPadInterface();
                             int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MOTOUT_STATE, 0);
                             if (sensorMag == 0) return;