修改大朝华主机可能出现开机后无法自动启动app问题

android_host/src/main/h10_wke_1h/AndroidManifest.xml

@@ -54,6 +54,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name= "android.manifest.permission.INTERNAL_SYSTEM_WINDOW"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
     <!--     设置屏幕亮度-->
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"
         tools:ignore="ProtectedPermissions" />

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/receiver/WdBootReceiver.java

@@ -15,7 +15,12 @@ public class WdBootReceiver extends BroadcastReceiver {
     public void onReceive(final Context context, Intent intent) {
         if ("android.intent.action.BOOT_COMPLETED".equals(intent.getAction())) {
             Log.d("wdBoot", "收到开机广播，启动app");
-            if ("m3520b_bnkj_zx".equals(Build.MODEL)) {
+
+            Intent startIntent= new Intent(context, NurseHomeActivity.class);
+            startIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(startIntent);
+
+            /*if ("m3520b_bnkj_zx".equals(Build.MODEL)) {
                 //15.6主机开机后延迟5s启动
                 new Handler().postDelayed(new Runnable() {
                     @Override
@@ -25,7 +30,7 @@ public class WdBootReceiver extends BroadcastReceiver {
                 }, 5000L);
             } else {
                 startHome(context);
-            }
+            }*/
 
         }
     }

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/settingconfig/SettingConfig.java

@@ -204,7 +204,7 @@ public class SettingConfig {
 
     public static int getLanguageId(Context context) {
         //0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
-        return getSP(context).getInt(KEY_LANGUAGE_ID, 0);
+        return getSP(context).getInt(KEY_LANGUAGE_ID, 2);
     }
 
     public static void setLanguageId(Context context, int id) {

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/util/AppUpdateHelper.java

@@ -318,7 +318,7 @@ public class AppUpdateHelper {
 
         //重新启动app
         Intent mStartActivity = new Intent(context.getApplicationContext(), NurseHomeActivity.class);
-        mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
         int mPendingIntentId = 123456;
         PendingIntent mPendingIntent = PendingIntent.getActivity(context.getApplicationContext(), mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
         AlarmManager mgr = (AlarmManager) context.getApplicationContext().getSystemService(Context.ALARM_SERVICE);

build.gradle

@@ -55,12 +55,12 @@ buildscript {
 
     if (app_device_type == "zj_h10_z_3128_1") {
         //rk3128 10寸护士主机
-        ext.app_version_code = 59
-        ext.app_version = "1.1.45"
+        ext.app_version_code = 60
+        ext.app_version = "1.1.46"
     } else if (app_device_type == "zj_h10_w_ke_1") {
         //卡尔10寸护士主机
-        ext.app_version_code = 57
-        ext.app_version = "1.1.42"
+        ext.app_version_code = 58
+        ext.app_version = "1.1.43"
     }
     else {
         ext.app_version_code = 48