Bläddra i källkod

[WallPadAPI]
1. 초기값 변경
- 월패드 카메라 사용안함
- 단지서버 : Blended

[ManagerSetting]
1. WallPadAPI jar 파일 최신 업데이트
2. 최신 APK 등록

[WallPadHomeCtrl]
1. 전동커튼 사용 유무에 따른 메뉴 설정 보이는 여부

[WallPadMain]
1. 이전 로비에서 월패드 비밀정보를 숫자로 전송(따라서 0000 일 경우 0만 옴)
- 비밀번호가 4자리가 안되는 경우, 강제로 앞에 0을 채움
2. 버전 업데이트(2011.11.26.01 -> 2021.12.15.01)
3. 최신 APK 등록

[WallPadAddService]
1. 모델 설정에 따른 현관카메라 사용여부 지우기(설정에 따라 움직이도록 다시 변경)
2. 최신 APK등록

jglee 3 år sedan
förälder
incheckning
dcbebd14ae

BIN
10_Release/ManagerSetting.apk


BIN
10_Release/WallPadAddService.apk


BIN
10_Release/WallPadMain.apk


BIN
ManagerSetting/libs/WallPadAPI.jar


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

@@ -158,6 +158,8 @@ public class wallpaddbmgr {
     // 첫번째 - 기기개수(기본 1로 입력), 두번째 - 회로수(방개수 등), 세번째 - 디바이스 이름, 네번째 - 사용여부, 다섯번째 - 기타정보
     private static String[][] iHN1010_DevicesSettingInitData = new String[][] {
 
+            {"1", "1", define.DEVICE_ID_WALLPAD_CAMERA, define.DEVICE_DISABLE, ""},
+            {"1", "1", define.DEVICE_ID_NEW_DANJI_SERVER, define.DEVICE_ENABLE, "종류(Blended)"},
             {"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, "종류(무선)"},
@@ -177,7 +179,6 @@ public class wallpaddbmgr {
             {"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_WALLPAD_CAMERA, define.DEVICE_ENABLE, ""},
             {"1", "1", define.DEVICE_ID_GUARDCALL_VIDEO_ON, define.DEVICE_DISABLE, ""},
 
             {"1", "1", define.DEVICE_ID_EMERGENGY_LEDDER, define.DEVICE_DISABLE, ""},

+ 1 - 1
WallPadAddService/src/main/java/kr/co/icontrols/wallpadaddservice/screen/PopupNewMemo.java

@@ -60,7 +60,7 @@ public class PopupNewMemo extends WpadScreen {
 
         Log.d(TAG, "월패드카메라 nWallPadCamUsage : " + nWallPadCamUsage);
 
-        if (nWallPadCamUsage == WallpadDeviceSet.DEV_DATA_ENABLE && mModelType != Version.MODEL_TYPE.IHN_1010_I_2443) {
+        if (nWallPadCamUsage == WallpadDeviceSet.DEV_DATA_ENABLE) {
             m_NewDrawing = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_picture_normal3, R.drawable.btn_picture_pressed3, ID.NewMemoPopupID.button.NEW_DRAWING);
             ViewRegistration(layout, m_NewDrawing, Common.PopupAlarmMarginLEFT(196), Common.PopupAlarmMarginTOP(585));
             m_NewAudio = new WpadImageView(context, TOUCH_KIND.BUTTON, 290, 80, R.drawable.btn_voice_normal3, R.drawable.btn_voice_pressed3, ID.NewMemoPopupID.button.NEW_AUDIO);

BIN
WallPadHomeCtrl/libs/WallPadAPI.jar


+ 8 - 3
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java

@@ -2090,6 +2090,7 @@ public class MainActivity extends WpadActivity {
 			int[] nLightType = mWallpadDeviceSet.Get_Light_info();
 			int[] nDoorlockType = mWallpadDeviceSet.Get_DoorLock_Info();
 			int[] nVentilType = mWallpadDeviceSet.Get_Ventil_Info();
+			boolean bShadingEnable = mWallpadDeviceSet.Get_Shading_Use();
 			int nHeatingUsage = mWallpadDeviceSet.Get_Temper_Info();
 			int nGasValveUsage = mWallpadDeviceSet.Get_GAS_Info();
 			boolean bElecCooktopUsage = mWallpadDeviceSet.Get_ElectricRange_Use();
@@ -2153,9 +2154,13 @@ public class MainActivity extends WpadActivity {
 				nChildCnt++;
 			}
 
-			//전동커튼
-			arrayList.add(API_Menu.SubMenuCtrl.Name_Curtain);
-			nChildCnt++;
+			if (bShadingEnable) {
+				//전동커튼
+				arrayList.add(API_Menu.SubMenuCtrl.Name_Curtain);
+				nChildCnt++;
+			}
+
+
 
 			if (nSystemAirconUsage != WallpadDeviceSet.SYSTEMAIRCON_NONE) {
 				arrayList.add(API_Menu.SubMenuCtrl.Name_SystemAircon);

BIN
WallPadMain/libs/WallPadAPI.jar


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

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

@@ -9660,6 +9660,12 @@ public class iMapServer extends Service {
 		Node text = item.getFirstChild();
 		String passwd = trimquotation(text.getNodeValue());
 
+		if(passwd!=null && passwd.length() < 4)
+        {
+            int temp_length = 4 - passwd.length();
+            for(int i = 0 ; i < temp_length; i++)
+                passwd = "0"+passwd;
+        }
 		WallpadStatusData DBMGR = new WallpadStatusData(getApplicationContext());
 		String settedpasswd = DBMGR.GetUserPW();
 		DBMGR.closeDB();