Browse Source

[WallPadMain]
1. App Ver. 갱신
- 2022.05.09.01
2. 최신 WallPadAPI 적용
- API Ver.: 2022.05.09.01
3. 제어기기 초기화 완료 BR 수신부 추가
- MainActivity에서도 해당 BR을 처리하도록 수정
4. 메인화면에서 거실조명 씬제어 기능 추가
- 총 3개 씬모드 (day, evening, relaxing)
> 씬모드 제어 및 조명상태 동기화 가능
5. 가스밸브 아이콘 노출 조건 변경
- 가스밸브를 사용하지 않더라도 월패드간 제어기기 멀티제어를 사용하는 경우 가스 아이콘을 노출한다.
6. 현관 문열림 기능 개선
- 현관 문열림 접점 유지시간 변경
> 기존: 600ms
> 변경: 2000ms

[WallPadAPI]
1. API Ver. 갱신
- 2022.05.09.01
2. KNX API 수정
- 디밍, 색온도 설정범위 확인 함수 수정
> 기존: 1 ~ 10
> 변경: 0 ~ 10 (0: 설정안함/don't care)

Changwoo Nam 2 years ago
parent
commit
e5b3b63f53

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

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

@@ -2883,6 +2883,7 @@ public class MainActivity extends WpadActivity {
 
                     case define.NOTIFY_DEVICE_INIT_COMPLETION:
                         Log.i(TAG, "[mWallPadNotifyBR] NOTIFY_DEVICE_INIT_COMPLETION: bLCDKeeperUsage [" + bLCDKeeperUsage +"]");
+                        Common.setDeviceServeiceLoadComplite();
                         if (bLCDKeeperUsage) registerLCDKeeper();
                         if (getStrangerRecordingManagerSetting() && getStrangerRecordingUserSetting()) {
                             registerNoticeStrangerRecord();
@@ -3844,6 +3845,7 @@ public class MainActivity extends WpadActivity {
     
 	private void registerBroadcastReceiver() {
 		try {
+		    Log.i(TAG, "[registerBroadcastReceiver] start");
 			IntentFilter mIntentFilter = new IntentFilter();
             mIntentFilter.addAction("WALLPAD_ALERT");
 			registerReceiver(mWallPadAlertBR, mIntentFilter);
@@ -3854,10 +3856,11 @@ public class MainActivity extends WpadActivity {
             mIntentFilter.addAction(Common.BR_MAIN_NOTI.ACNAME_MAIN_NOTI); // ACC 꺼와 구분되는 Noti 추가
             mIntentFilter.addAction(BR_MAIN_LIVE_CHECKER.ACNAME_MAIN_LIVE_CHECKER);
             mIntentFilter.addAction(Common.BR_ACK_WALLPADCALL_LIVE);
+            mIntentFilter.addAction(define.NOTIFY_ACNAME);
 			registerReceiver(mWallPadNotifyBR, mIntentFilter);
 
             registerMainActivityBR();
-
+            Log.i(TAG, "[registerBroadcastReceiver] end");
 		} catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
         }
@@ -11212,7 +11215,7 @@ public class MainActivity extends WpadActivity {
     }
 
     String myIP = "NONE";
-    int ho = 0;
+    public static int ho = 0;
 
     public void requestMultiControl(Handler handler, int menu, int reason, int position) {
         if(position!=ho) {

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

@@ -247,6 +247,7 @@ public final class Common {
     public static final String BR_CALLED_CID_ACK 		= "kr.co.icontrols.wallpad.BR_CALLED_CID_ACK";
     public static final String BR_REQUEST_APK_RUN 		= "kr.co.icontrols.wallpad.BR_REQUEST_APK_RUN";
     public static final String BR_LIVINGLIGHT 		    = "kr.co.icontrols.wallpadhomectrl.BR_LIGHT(3000)";
+    public static final String BR_KNXLIGHT   		    = "kr.co.icontrols.wallpadmain.BR_KNXLIGHT";
     public static final String VISITOR_REMOTE_CALL      = "kr.co.icontrols.wallpad.BR_REMOTE_CALL";
     public static final String BR_CAR_EVENT_GUEST       = "kr.co.icontrols.wallpad.BR_CAR_EVENT_GUEST";
     public static final String BR_PLAY_SOUND       = "kr.co.icontrols.wallpad.BR_PLAY_SOUND";

+ 3 - 0
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/declare/ID.java

@@ -245,6 +245,9 @@ public final class ID {
                     public final static int LIGHT_HDCLIVING_04 = BASE + 241;
                     public final static int LIGHT_HDCLIVING_05 = BASE + 242;
                     public final static int LIGHT_HDCLIVING_06 = BASE + 243;
+                    public final static int LIGHT_SCENE_DAY = BASE + 244;
+                    public final static int LIGHT_SCENE_EVENING = BASE + 245;
+                    public final static int LIGHT_SCENE_RELAXING = BASE + 246;
                 }
 
                 public final class TEXTS {

File diff suppressed because it is too large
+ 408 - 244
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/screen/MAIN.java


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

@@ -178,7 +178,7 @@ public class IconManager {
             nThermostatEnable = mWallpadDeviceSet.Get_Temper_Info();   // 난방제어
             naVentilEnable = mWallpadDeviceSet.Get_Ventil_Info();   // 환기 0 : 사용안함, 1 : 사용함
             //가스는 항상 사용하도록 한다.
-            //nGasValveEnable = mWallpadDeviceSet.Get_GAS_Info();   // 가스밸브 제어
+            nGasValveEnable = mWallpadDeviceSet.Get_GAS_Info();   // 가스밸브 제어
             bElecCooktopEnable = mWallpadDeviceSet.Get_ElectricRange_Use();   // 전기레인지
             nMoodLightEnable = mWallpadDeviceSet.GetDeviceSetted("무드등");
             nAirQualityEnable = mWallpadDeviceSet.GetDeviceSetted("센서AP");   // 공기질 센서

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

@@ -12835,7 +12835,7 @@ public class iMapServer extends Service {
                     try {
                         modbusClient.Connect();
                         modbusClient.WriteSingleCoil(address, true);
-                        Thread.sleep(600);
+                        Thread.sleep(2000);
                         modbusClient.WriteSingleCoil(address, false);
                         modbusClient.Disconnect();
                     } catch (IOException | ModbusException | InterruptedException e) {

BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_day_normal.png


BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_day_pressed.png


BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_day_selected.png


BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_evening_normal.png


BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_evening_pressed.png


BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_evening_selected.png


BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_relax_normal.png


BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_relax_pressed.png


BIN
WallPadMain/src/main/res/drawable-ldpi/btn_scene_relax_selected.png


Some files were not shown because too many files changed in this diff