增加进入系统设置按钮，增加启动三代系统app按钮，升级版本到1.85

app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 1
-        versionName "1.84"
+        versionName "1.85"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/InitActivity.java

@@ -21,6 +21,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.wdkl.callingmainnurse.MyApplication;
@@ -298,6 +299,16 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
         }
 
         dateRefresh();
+
+
+        //检查设备上是否安装了三代系统app，如果安装了则直接启动
+        /*Intent intent = AutoRebootUtil.getNewAppIntent(MyApplication.getAppContext());
+        if (intent != null) {
+            Toast.makeText(InitActivity.this, "新V3系统app已安装,即将启动...", Toast.LENGTH_SHORT).show();
+            startActivity(intent);
+        } else {
+            Toast.makeText(InitActivity.this, "新V3系统app未安装,请先安装新系统app...", Toast.LENGTH_SHORT).show();
+        }*/
     }
 
 
@@ -742,6 +753,25 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
                     }
                 }
             });
+
+            Button btnNewApp = dialogView.findViewById(R.id.btn_new_app);
+            btnNewApp.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = AutoRebootUtil.getNewAppIntent(MyApplication.getAppContext());
+                    if (intent != null) {
+                        Toast.makeText(InitActivity.this, "新V3系统app已安装,即将启动...", Toast.LENGTH_SHORT).show();
+                        startActivity(intent);
+                    } else {
+                        Toast.makeText(InitActivity.this, "新V3系统app未安装,请先安装新系统app...", Toast.LENGTH_SHORT).show();
+                    }
+
+                    if (testDialog != null) {
+                        testDialog.dismiss();
+                    }
+                }
+            });
+
             testDialog.setView(dialogView);
         }
 

app/src/main/java/com/wdkl/callingmainnurse/util/AutoRebootUtil.java

@@ -2,11 +2,15 @@ package com.wdkl.callingmainnurse.util;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.SystemProperties;
 import android.util.Log;
 
 import com.wdkl.callingmainnurse.MyApplication;
 
+import java.util.List;
+
 import serialporttest.utils.SerialPortUtil;
 
 import static com.wdkl.callingmainnurse.common.Constants.NET_ERROR_FIVE_AFTER_TOAST;
@@ -141,4 +145,26 @@ public class AutoRebootUtil {
     public static String getTextTip() {
         return "系统将在40秒后重新启动";
     }
+
+
+    public static Intent getNewAppIntent(Context context) {
+        Intent intent = null;
+        try {
+            String newAppName = "com.wdkl.app.ncs.nursehost";
+            List<PackageInfo> packageInfos = context.getPackageManager().getInstalledPackages(PackageManager.GET_ACTIVITIES |
+                    PackageManager.GET_SERVICES);
+            for (PackageInfo info : packageInfos) {
+                String pkg = info.packageName;
+                if (newAppName.equals(pkg)) {
+                    intent = context.getPackageManager().getLaunchIntentForPackage(pkg);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    return intent;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return intent;
+    }
 }

app/src/main/java/com/wdkl/callingmainnurse/widget/loading/VaryViewHelperController.java

@@ -1,17 +1,20 @@
 package com.wdkl.callingmainnurse.widget.loading;
 
 
+import android.content.Intent;
 import android.graphics.drawable.AnimationDrawable;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.wdkl.callingmainnurse.MyApplication;
 import com.wdkl.callingmainnurse.R;
 
 
-public class VaryViewHelperController {
+public class VaryViewHelperController implements View.OnLongClickListener {
 
     private IVaryViewHelper helper;
 
@@ -36,6 +39,7 @@ public class VaryViewHelperController {
             againBtn.setOnClickListener(onClickListener);
         }
         helper.showLayout(layout);
+        layout.setOnLongClickListener(this);
     }
 
     public void showNetworkError(View.OnClickListener onClickListener,String str, View.OnClickListener onClickListenerTest) {
@@ -51,6 +55,7 @@ public class VaryViewHelperController {
             testBtn.setOnClickListener(onClickListenerTest);
         }
         helper.showLayout(layout);
+        layout.setOnLongClickListener(this);
     }
 
     public void showEmpty(String emptyMsg) {
@@ -60,14 +65,22 @@ public class VaryViewHelperController {
             textView.setText(emptyMsg);
         }
         helper.showLayout(layout);
+        layout.setOnLongClickListener(this);
     }
 
     public void showLoading() {
         View layout = helper.inflate(R.layout.view_loading_loading);
         helper.showLayout(layout);
+        layout.setOnLongClickListener(this);
     }
 
     public void restore() {
         helper.restoreView();
     }
+
+    @Override
+    public boolean onLongClick(View view) {
+        MyApplication.getAppContext().startActivity(new Intent(Settings.ACTION_SETTINGS));
+        return true;
+    }
 }

app/src/main/res/layout/dialog_test.xml

@@ -19,4 +19,11 @@
         android:layout_marginLeft="20dp"
         android:layout_weight="1"
         android:text="喇叭测试"/>
+    <Button
+        android:id="@+id/btn_new_app"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_weight="1"
+        android:text="启动新版本"/>
 </LinearLayout>