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

[모든 App 공통수정]
1. 모델명 처리 (기존 1010-I 와 동일하게 처리)
- IHN_1010_I_2443 : 대외 2443 대체품 월패드
- WallPadCall 미처리

jglee 3 лет назад
Родитель
Сommit
10327f5945

+ 5 - 2
ManagerSetting/src/main/java/com/artncore/managersetting/ui/activities/SetAddress.java

@@ -127,7 +127,9 @@ public class SetAddress extends Activity
                 else if (ModelType == Version.MODEL_TYPE.IHN_1020B_C) {
                     setContentView(R.layout.activity_set_address_a20_1280x800);
                 }
-                else if (ModelType == Version.MODEL_TYPE.IHN_1010 || ModelType == Version.MODEL_TYPE.IHN_1010_I) {
+                else if (ModelType == Version.MODEL_TYPE.IHN_1010 || ModelType == Version.MODEL_TYPE.IHN_1010_I
+                        || ModelType == Version.MODEL_TYPE.IHN_1010_I_2443
+                ) {
                     setContentView(R.layout.activity_set_address_1010);
                 }
                 else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101_I || ModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
@@ -223,7 +225,8 @@ public class SetAddress extends Activity
         if (ModelType == Version.MODEL_TYPE.IHN_1020GL) {
             initView_GLE();
         }
-        else if (ModelType == Version.MODEL_TYPE.IHN_1010 || ModelType == Version.MODEL_TYPE.IHN_1010_I) {
+        else if (ModelType == Version.MODEL_TYPE.IHN_1010 || ModelType == Version.MODEL_TYPE.IHN_1010_I
+                || ModelType == Version.MODEL_TYPE.IHN_1010_I_2443) {
             initView_1010();
         }
         else if (ModelType == Version.MODEL_TYPE.IHN_D101 || ModelType == Version.MODEL_TYPE.IHN_D101K || ModelType == Version.MODEL_TYPE.IHN_1010GL

+ 4 - 2
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/AdminSettingFragment.java

@@ -120,7 +120,8 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
         }
         else {
             int modelType = Version.getModelType();
-            if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I) {
+            if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I
+                    || modelType == Version.MODEL_TYPE.IHN_1010_I_2443) {
                 inputmenuItem = new String[menuItem.length-1]; // 1010의 경우에만 서브월패드 설정 화면 나오도록 함.
                 Log.d(TAG, "[onViewCreated] inputmenuItem.length [" + inputmenuItem.length + "]");
 
@@ -213,7 +214,8 @@ public class AdminSettingFragment extends Fragment implements AdminSubMenu.SubMe
                     getActivity().getSupportFragmentManager().beginTransaction()
                             .replace(R.id.menu_content, fragment).commit();
                 }
-                else if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I) {
+                else if (modelType == Version.MODEL_TYPE.IHN_1010 || modelType == Version.MODEL_TYPE.IHN_1010_I
+                        || modelType == Version.MODEL_TYPE.IHN_1010_I_2443) {
                     SettingSubWpdSettingFragment fragment = new SettingSubWpdSettingFragment();
                     getActivity().getSupportFragmentManager().beginTransaction()
                             .replace(R.id.menu_content, fragment).commit();

+ 2 - 1
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java

@@ -2108,7 +2108,8 @@ public class wallpaddbmgr {
                 }
             }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_1010 || mModelType == Version.MODEL_TYPE.IHN_1010_I) {
+        else if (mModelType == Version.MODEL_TYPE.IHN_1010 || mModelType == Version.MODEL_TYPE.IHN_1010_I
+                || mModelType == Version.MODEL_TYPE.IHN_1010_I_2443) {
             for (int i = 0; i < iHN1010_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 InsertinitDeviceData("subdev_list"

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

@@ -259,6 +259,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_T1010:
                 case MODEL_TYPE.IHN_T1010_I:
                 case MODEL_TYPE.IHN_HS101:

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

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

+ 5 - 2
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/manual/MANUAL_MAIN.java

@@ -121,7 +121,8 @@ public class MANUAL_MAIN extends WpadScreen {
                 IMG_GUIDE_02_MAINSCREEN = new WpadImageView(context, TOUCH_KIND.NONE, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101).W, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101).H, R.drawable.img_manual_example_main_ihnd101, 0, ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101);
                 ViewRegistration(layout, IMG_GUIDE_02_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHND101).Y);
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            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) {
                 IMG_GUIDE_02_MAINSCREEN = new WpadImageView(context, TOUCH_KIND.NONE, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010).W, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010).H, R.drawable.img_manual_example_main_ihn1010, 0, ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010);
                 ViewRegistration(layout, IMG_GUIDE_02_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.IMAGES.GUIDE_02_MAINSCREEN_IHN1010).Y);
             }
@@ -144,7 +145,9 @@ public class MANUAL_MAIN extends WpadScreen {
                 ViewRegistration(layout, TXT_GUIDE_02_INFO_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHND101).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHND101).Y);
                 TXT_GUIDE_02_INFO_MAINSCREEN.setText(strGuide02MainScreen_IHND101);
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            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
+            ) {
                 TXT_GUIDE_02_INFO_MAINSCREEN = new WpadTextView(context, false, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010).W, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010).H, Gravity.LEFT, Color.WHITE, nManualInfoFontSize, false, ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010);
                 ViewRegistration(layout, TXT_GUIDE_02_INFO_MAINSCREEN, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010).X, getPosition(ID.MANUAL.MANUALMAIN.ELEMENTS.TEXTS.GUIDE_02_INFO_MAINSCREEN_IHN1010).Y);
                 TXT_GUIDE_02_INFO_MAINSCREEN.setText(strGuide02MainScreen_IHN1010);

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

@@ -319,7 +319,8 @@ public class MAIN extends WpadScreen {
                     BTN_LIGHT_PRESET_04.setTouchDelayMs(500);
                 }
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            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) {
                 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);
@@ -509,7 +510,8 @@ public class MAIN extends WpadScreen {
                 if (loadHDCLivingLightController(mWallPadAPI) >= 0) updateHDCLivingLightStatus(false);
                 else HDCLivingLightDriverCheckHandler.sendEmptyMessage(0);
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            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) {
                 if (getKCCDimmingCtrl()) {
                     mMultiSwitchData = new MultiSwitchAPI.Data();
                     if (loadMultiSwitchController(mWallPadAPI) >= 0) updateMultiSwitchStatus(false, (byte) 0x00);

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

@@ -665,7 +665,8 @@ public class ShortcutBox {
                     retAllWidget[i] = allWidget[i];
                 }
             }
-            else if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I) {
+            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) {
                 // 엘리베이터
                 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

@@ -544,6 +544,7 @@ public class WallPadiMAPUpgrade {
 	public static final String IHN_1010GL_I_ID = "IHN1010GL-I";   // 연합사업지용 월패드 (중국생산)
 	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_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";   // 보급형(엔트리급) 월패드 (중국생산)
@@ -643,6 +644,14 @@ public class WallPadiMAPUpgrade {
 						return false;
 					}
 				}
+				else if(Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_2443) {
+					// V40 플랫폼 업그레이드
+					if (!(astrFileName[1].equals(DEV_V40_ARCH_ID) || astrFileName[1].equals(DEV_A40i_ARCH_ID)) || !astrFileName[2].equals(IHN_1010_I_2443_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)) {

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

@@ -2461,7 +2461,8 @@ public class iMapServer extends Service {
                         Log.w(TAG, "[mWallPadCTRDevBR] ########## EMERGENCY MAGNETIC ########## KeyCode [" + ReceiveEvt.getKeyCode() + "]");
 						if (MgrAppRun) return;
 
-                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I) {
+                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I
+                                || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443) {
 							WallPadInterface mWallPadInterface = new WallPadInterface();
 							int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MAG0_STATE, 0);
 							if (sensorMag == 0) return;
@@ -2540,7 +2541,8 @@ public class iMapServer extends Service {
                             return;
                         }
 
-                            if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I) {
+                            if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I
+                                    || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443) {
                                 WallPadInterface mWallPadInterface = new WallPadInterface();
                                 int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MOTIN_STATE, 0);
                                 if (sensorMag == 0) return;
@@ -2575,7 +2577,8 @@ public class iMapServer extends Service {
                             return;
                         }
 
-                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I) {
+                        if (Version.getModelType() == MODEL_TYPE.IHN_1010 || Version.getModelType() == MODEL_TYPE.IHN_1010_I
+                                || Version.getModelType() == MODEL_TYPE.IHN_1010_I_2443) {
                             WallPadInterface mWallPadInterface = new WallPadInterface();
                             int sensorMag = mWallPadInterface.DoControl(WallPadInterface.IOCTL_SENSOR_MOTOUT_STATE, 0);
                             if (sensorMag == 0) return;