Explorar el Código

[WallPadMain]
1. App Ver. 갱신
- 2022.01.05.01
2. 제휴서버 연동 모듈 비활성화
- 해당모델은 제휴서버 연동이 필요없는 analog모델이므로, 해당 모듈을 비활성화 함
3. LCD keeper 동작시, LCD keeper 화면을 최상위로 설정하여 flipper 화면 표시기(화면 하단 점) 안보이도록 개선

Changwoo Nam hace 4 años
padre
commit
7285294943

+ 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.04.01">
+    android:versionName="2022.01.05.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

+ 13 - 6
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java

@@ -885,9 +885,12 @@ public class MainActivity extends WpadActivity {
                         Intent intent = new Intent(getApplicationContext(), iMapServer.class);
                         startService(intent);
 
-                        Intent intentMobile = new Intent(getApplicationContext(), MobileProcService.class);
-                        Log.w(TAG, "[onCreate] ========== start MobileProcServicee ========== [secondary db]");
-                        startService(intentMobile);
+                        if (Version.getModelType() != MODEL_TYPE.IHN_1010_I_ALT) {
+                            // IHN-1010-I-ALT는 analog 제품(IHN-1000) 대체품이므로 제휴서버 연동 모듈이 필요없음
+                            Intent intentMobile = new Intent(getApplicationContext(), MobileProcService.class);
+                            Log.w(TAG, "[onCreate] ========== start MobileProcServicee ========== [secondary db]");
+                            startService(intentMobile);
+                        }
                     }
 	                MAINStatus = MAIN_NORMAL;   
 			    }
@@ -899,9 +902,12 @@ public class MainActivity extends WpadActivity {
                     Intent intent = new Intent(this, iMapServer.class);
                     startService(intent);
 
-                    Intent intentMobile = new Intent(getApplicationContext(), MobileProcService.class);
-                    Log.w(TAG, "[onCreate] ========== start MobileProcServicee ========== [secondary db]");
-                    startService(intentMobile);
+                    if (Version.getModelType() != MODEL_TYPE.IHN_1010_I_ALT) {
+                        // IHN-1010-I-ALT는 analog 제품(IHN-1000) 대체품이므로 제휴서버 연동 모듈이 필요없음
+                        Intent intentMobile = new Intent(getApplicationContext(), MobileProcService.class);
+                        Log.w(TAG, "[onCreate] ========== start MobileProcServicee ========== [secondary db]");
+                        startService(intentMobile);
+                    }
                 }
 				MAINStatus = MAIN_NORMAL;	
 			}
@@ -8440,6 +8446,7 @@ public class MainActivity extends WpadActivity {
             }
 
             IMG_LCD_KEEPER = (ImageView) findViewById(R.id.view_lcdkeeper);
+            IMG_LCD_KEEPER.bringToFront();
             IMG_LCD_KEEPER.setVisibility(View.INVISIBLE);
             Log.i(TAG, "[registerLCDKeeper] ===== END =====");
         } catch (Exception e) {