Prechádzať zdrojové kódy

[WallPadMain]
1. 1010GL 베이스의 서브월패드의 경우에도 DevService 실행되도록 수정
2. 버전업
- 2022.11.11.01 -> 2022.11.11.02
3. 최신APK 등록

jglee 2 rokov pred
rodič
commit
74f7e433d6

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

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

@@ -2461,7 +2461,9 @@ public class MainActivity extends WpadActivity {
                 WallpadDeviceSet mWallpadDeviceSet = new WallpadDeviceSet(this);
                 int[] naSubWallPadLight = mWallpadDeviceSet.GetSubWpdDirect_Light();
                 mWallpadDeviceSet.closeDB();
-                if(naSubWallPadLight!=null && naSubWallPadLight.length == 2 && naSubWallPadLight[1] == WallpadDeviceSet.SUBWPD_CTR_DIRECT)
+
+                //2022.10.26 jglee - 6410 GL을 사용하는 경우에만 1010GL용 서브폰이 활성홤 되도록 수정
+                if((naSubWallPadLight!=null && naSubWallPadLight.length == 2 && naSubWallPadLight[1] == WallpadDeviceSet.SUBWPD_CTR_DIRECT) || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I_6410)
                 {
                     ActivityManager mActivityManager = (ActivityManager)getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE);
                     List<ActivityManager.RunningAppProcessInfo> RunningAppList = mActivityManager.getRunningAppProcesses();