Selaa lähdekoodia

[WallPadMain]
1. 조명제어기 사용안함 일 경우, 메인 조명 아이콘 안보이게 수정
2. 버전업
- 2022.01.19.01 -> 2022.08.23.01
3. 최신 APK 등록

jglee 2 vuotta sitten
vanhempi
commit
db7045ea54

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

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

@@ -360,13 +360,17 @@ public class MAIN extends WpadScreen {
                 Log.w(TAG, "[registerLightCtrlBTN] Register HDC living light control buttons!! -> IHN_1010GL(-I)");
                 int[] nHDCLivingLightInfo = getHDCLivingLightUsage();
 
-                int nID = ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_01;
-                for (int  i = 0; i < nHDCLivingLightInfo[2]; i++) {
-                    int nImageID = nID - ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_01;
-                    BTN_HDCLIVINGLIGHT[i] = new WpadImageView(mContext, TOUCH_KIND.BUTTON, getPosition(nID).W, getPosition(nID).H, new int[] { img_hdclight_normal[nImageID], img_hdclight_pressed[nImageID] } , new int[] { img_hdclight_selected[nImageID], img_hdclight_pressed[nImageID] }, nID);
-                    ViewRegistration(layout, BTN_HDCLIVINGLIGHT[i], getPosition(nID).X, getPosition(nID).Y);
-                    if(BTN_HDCLIVINGLIGHT[i]!=null) BTN_HDCLIVINGLIGHT[i].setTouchDelayMs(500);
-                    nID++;
+                //2022.08.26 jglee - 조명을 사용하는 경우만 기본 조명을 살림
+                if(nHDCLivingLightInfo[0] == WallpadDeviceSet.DO_USE)
+                {
+                    int nID = ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_01;
+                    for (int  i = 0; i < nHDCLivingLightInfo[2]; i++) {
+                        int nImageID = nID - ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_01;
+                        BTN_HDCLIVINGLIGHT[i] = new WpadImageView(mContext, TOUCH_KIND.BUTTON, getPosition(nID).W, getPosition(nID).H, new int[] { img_hdclight_normal[nImageID], img_hdclight_pressed[nImageID] } , new int[] { img_hdclight_selected[nImageID], img_hdclight_pressed[nImageID] }, nID);
+                        ViewRegistration(layout, BTN_HDCLIVINGLIGHT[i], getPosition(nID).X, getPosition(nID).Y);
+                        if(BTN_HDCLIVINGLIGHT[i]!=null) BTN_HDCLIVINGLIGHT[i].setTouchDelayMs(500);
+                        nID++;
+                    }
                 }
             }
             else {