Explorar o código

[WallPadAPI]
1. API Ver. 갱신
- 2022.04.11.01
2. 성북동 고급주택용 설정 추가
- IHN-D101-I-LX2 모델명 따라 설정정보 추가
- 메인화면 즐겨찾기 수정

Changwoo Nam %!s(int64=3) %!d(string=hai) anos
pai
achega
9408a901a3

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

@@ -165,6 +165,51 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_CONCENT, define.DEVICE_DISABLE, ""},
     };
 
+    private static String[][] iHND101_I_LX2_DevicesSettingInitData = new String[][] {
+
+            {"1", "1", define.DEVICE_ID_GAS, define.DEVICE_ENABLE, ""},
+            {"1", "1", define.DEVICE_ID_ELECTRIC_RANGE, define.DEVICE_DISABLE, ""},
+            {"1", "1", define.DEVICE_ID_DOORLOCK, define.DEVICE_ENABLE, "종류(무선)"},
+            {"1", "4", define.DEVICE_ID_THERMO, define.DEVICE_ENABLE, ""},
+            {"1", "2", define.DEVICE_ID_LIGHT, define.DEVICE_ENABLE, "종류(현산향일체형조명일괄소등병합형)"},
+            {"1", "5", define.DEVICE_ID_REALTIMEMETER, define.DEVICE_ENABLE, ""},
+            {"1", "1", define.DEVICE_ID_BATCHLIGHT, define.DEVICE_ENABLE, "종류(현산향LCD스마트스위치)L1설정(2)L2설정(3)"},
+            {"1", "1", define.DEVICE_ID_REMOTECON, define.DEVICE_ENABLE, ""},
+            {"1", "1", define.DEVICE_ID_DOORCAM, define.DEVICE_ENABLE, "종류(스마트IOT현관카메라)"},
+            {"1", "1", define.DEVICE_ID_VENTIL, define.DEVICE_ENABLE, "종류(기본)"},
+            {"1", "1", define.DEVICE_ID_SYSTEMAIRCON, define.DEVICE_ENABLE, "종류(LG냉난방)"},
+
+            {"1", "1", define.DEVICE_ID_ENERGY_DEVICES, define.DEVICE_ENABLE, ""},
+            {"1", "1", define.DEVICE_ID_IDLE_POWER_SAVING_SWITCH, define.DEVICE_ENABLE, ""},
+            {"1", "1", define.DEVICE_ID_ENERGY_MODULE, define.DEVICE_DISABLE, ""},
+            {"1", "5", define.DEVICE_ID_REMOTE_METER, define.DEVICE_ENABLE, "EMS(사용함)요금테이블(사용안함)"},
+            {"1", "1", define.DEVICE_ID_SENSOR, define.DEVICE_ENABLE, "외부동체사용(사용함)내부동체사용(사용안함)외부동체를내부동체로사용(사용안함))"},
+            {"1", "1", define.DEVICE_ID_EMERGENGY_LEDDER, define.DEVICE_DISABLE, ""},
+
+            {"1", "1", define.DEVICE_ID_GUARDCALL_VIDEO_ON, define.DEVICE_DISABLE, ""},
+            {"1", "1", define.DEVICE_ID_KITCHEN_TV_PSTN_CALL, define.DEVICE_DISABLE, ""},
+            {"1", "1", define.DEVICE_ID_BATH_TV_PSTN_CALL, define.DEVICE_DISABLE, ""},
+            {"1", "1", define.DEVICE_ID_BATH_PSTN_CALL, define.DEVICE_ENABLE, ""},
+
+            {"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_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)"},
+            {"1", "1", define.DEVICE_ID_MAIN_GUI_SELECT, define.DEVICE_ENABLE, "종류(기본)"},
+            {"1", "1", define.DEVICE_ID_SMART_LIGHT_ALARM_SET, define.DEVICE_ENABLE,
+                    "EM전압상한값(3.0)EM전압하한값(5.0)EM온도(60)LED전압상한값(2.0)LED전압하한값(7.0)LED온도(80)" +
+                            "DCAPU전력일괄(425)DCAPU전력개별1(0)DCAPU전력개별2(0)누적전력초기화(0)"},
+            {"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, "종류(KNX분전반)"},
+            {"1", "1", define.DEVICE_ID_CONCENT, define.DEVICE_DISABLE, ""},
+            {"1", "1", define.DEVICE_ID_CONCENT, define.DEVICE_DISABLE, ""},
+    };
+
 
 
     private static String[][] iHND101_K_DevicesSettingInitData = new String[][] {
@@ -2107,6 +2152,47 @@ public class wallpaddbmgr {
                 );
             }
         }
+        else if (mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2)
+        {
+            for (int i = 0; i < iHND101_I_LX2_DevicesSettingInitData.length; i++) {
+                Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
+                if ((iHND101_I_LX2_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_KITCHEN_TV_PSTN_CALL) == true)
+                        || (iHND101_I_LX2_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_BATH_TV_PSTN_CALL) == true)
+                        || (iHND101_I_LX2_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_BATH_PSTN_CALL) == true))
+                {   //욕실폰, 욕실TV, 주방TV 국선전화 연동 시 "1(1:국선(사용함))" 으로 저장하기 위함.
+                    InsertinitDeviceData("subdev_list"
+                            , iHND101_I_LX2_DevicesSettingInitData[i][2]
+                            , 0
+                            , iHND101_I_LX2_DevicesSettingInitData[i][0]+
+                                    "("
+                                    +iHND101_I_LX2_DevicesSettingInitData[i][1]+
+                                    ":"
+                                    +"국선"+
+                                    "("+
+                                    iHND101_I_LX2_DevicesSettingInitData[i][3]+
+                                    ")"+
+                                    iHND101_I_LX2_DevicesSettingInitData[i][4]+
+                                    ")"
+                    );
+                }
+                else {
+                    InsertinitDeviceData("subdev_list"
+                            , iHND101_I_LX2_DevicesSettingInitData[i][2]
+                            , 0
+                            , iHND101_I_LX2_DevicesSettingInitData[i][0]+
+                                    "("
+                                    +iHND101_I_LX2_DevicesSettingInitData[i][1]+
+                                    ":"
+                                    +iHND101_I_LX2_DevicesSettingInitData[i][2]+
+                                    "("+
+                                    iHND101_I_LX2_DevicesSettingInitData[i][3]+
+                                    ")"+
+                                    iHND101_I_LX2_DevicesSettingInitData[i][4]+
+                                    ")"
+                    );
+                }
+            }
+        }
         else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2
                 || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
         {
@@ -2616,7 +2702,21 @@ public class wallpaddbmgr {
             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){
+        else if(mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF){
+            InsertinitWidgetData(0, define.ICONS.MENUS.TALK_FRONT.getID());        //현관
+            InsertinitWidgetData(1, define.ICONS.MENUS.TALK_NEIGHBOR.getID());      //이웃
+            InsertinitWidgetData(2, define.ICONS.MENUS.TALK_CALLHISTORY.getID());   //통화내역
+            InsertinitWidgetData(3, define.ICONS.MENUS.TALK_VISITORPIC.getID());    //방문자 사진
+            InsertinitWidgetData(4, define.ICONS.MENUS.CTRL_LIGHT.getID());         // 조명
+            InsertinitWidgetData(5, define.ICONS.MENUS.CTRL_HEATING.getID());       //난방
+            InsertinitWidgetData(6, define.ICONS.MENUS.CTRL_GAS.getID());           //가스
+            InsertinitWidgetData(7, define.ICONS.MENUS.CTRL_SYSTEMAIRCON.getID());  //시스템에어컨
+            InsertinitWidgetData(8, define.ICONS.MENUS.CTRL_VENT.getID());          //환기
+            InsertinitWidgetData(9, define.ICONS.MENUS.CTRL_PARKINGDOOR.getID());   //주차출입문
+            InsertinitWidgetData(10, define.ICONS.MENUS.ADD_WEATHER.getID());      //날씨
+            InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());    //환경설정
+        }
+        else if(mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2){
             InsertinitWidgetData(0, define.ICONS.MENUS.TALK_FRONT.getID());        //현관
             InsertinitWidgetData(1, define.ICONS.MENUS.TALK_NEIGHBOR.getID());      //이웃
             InsertinitWidgetData(2, define.ICONS.MENUS.TALK_CALLHISTORY.getID());   //통화내역

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

@@ -4,7 +4,7 @@ import android.os.Environment;
 
 public class define {
 	/** WallPadAPI Version 을 정의합니다. */
-	public static final String WALLPADAPI_VERSION = "2021.11.03.01";
+	public static final String WALLPADAPI_VERSION = "2022.04.11.01";
 	///////////////////////////////////////////////////////////////////////
 	// WallPadDevService 의 각 드라이버와 통신을 위한 드라이버 이름을 정의합니다.
 	///////////////////////////////////////////////////////////////////////
@@ -647,6 +647,7 @@ public class define {
 	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_SYSTEMAIRCON       = "시스템에어컨";
 
 	public static final String DEVICE_ID_ENERGY_DEVICES           = "에너지제품군";
 	public static final String DEVICE_ID_IPARKENERGY              = "아이파크에너지"; //에너지미터