2 Commits b91b083e5a ... cfa3a552fc

Autor SHA1 Mensaje Fecha
  Yuping Liang cfa3a552fc [TBNPI-2669]CTS问题,去除android.intent.action.BOOT_P0广播接收 hace 10 meses
  Yuping Liang 1458e89b96 解决Reset Shop后没有自动打开酒店模式的问题 hace 10 meses

+ 2 - 2
app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.tcl.customerapi"
         minSdkVersion 29
         targetSdkVersion 29
-        versionCode 1106
-        versionName "1.1.06"
+        versionCode 1108
+        versionName "1.1.08"
 
         multiDexEnabled true
     }

+ 0 - 1
app/src/main/AndroidManifest.xml

@@ -92,7 +92,6 @@
                 <action android:name="com.tcl.customerapi.usb_bootanimation_copy_fail" />
                 <action android:name="com.tcl.customerapi.logo_copy_err" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.BOOT_P0" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_UNMOUNTED" />

+ 4 - 2
app/src/main/java/com/tcl/customerapi/IService.java

@@ -153,14 +153,16 @@ public class IService extends android.app.Service {
     void Init() throws RemoteException {
         SharedPreferences vPreferences = ctx.getSharedPreferences(dataPath, MODE);
         final boolean factoryInit = vPreferences.getBoolean("factory_init", true);
+        final boolean shopReset = SystemProperties.getBoolean("sys.tcl.shop_reset", false);
         final String deviceName = AHDeviceHelper.getDeviceName();
-        Log.d(TAG, "factory_init: " + factoryInit + ", deviceName: " + deviceName);
+        Log.d(TAG, "factoryInit: " + factoryInit
+                +", shopReset: " + shopReset + ", deviceName: " + deviceName);
 
         if (deviceName.isEmpty()) {
             setDeviceName();
         }
 
-        if (!factoryInit) {
+        if (!shopReset && !factoryInit) {
             Log.d(TAG, "already initialized");
             return;
         }

+ 1 - 1
app/src/main/java/com/tcl/customerapi/MyReceiver.java

@@ -98,7 +98,7 @@ public class MyReceiver extends BroadcastReceiver {
 
             Toast.makeText(arg0, "Error!!Copy logo.jpg fail!!", Toast.LENGTH_SHORT).show();
 
-        } else if (tmp.equalsIgnoreCase(defs.BOOT_COMPLETED) || tmp.equalsIgnoreCase(defs.BOOT_P0)) {
+        } else if (tmp.equalsIgnoreCase(defs.BOOT_COMPLETED)) {
             Log.i("api", "power on and check tlc_oatfile  !");
             if (FileUtil.isFile(defs.otaFilePath)) {
                 Log.i("api", "power on and is tcl_oatfile !");