Merge branch 'new_master' into new_for_phone

app/src/main/java/com/bgycc/smartcanteen/MainActivity.java

@@ -130,7 +130,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         SCWebSocketClient.getInstance().getConnectStateEvent().observe(this, event -> {
         SCWebSocketClient.getInstance().getConnectStateEvent().observe(this, event -> {
             if (debugLayoutIsNotInflate()) return;
             if (debugLayoutIsNotInflate()) return;
             String msg;
             String msg;
-            LogUtils.d(TAG, "connect state: " + event.getState());
             switch (event.getState()) {
             switch (event.getState()) {
                 case ConnectState.OFFLINE:
                 case ConnectState.OFFLINE:
                     msg = String.format(getString(R.string.connect_offline), NetworkUtils.getTryingNetworkType(this));
                     msg = String.format(getString(R.string.connect_offline), NetworkUtils.getTryingNetworkType(this));

app/src/main/java/com/bgycc/smartcanteen/command/UpdateCommandHandler.java

@@ -97,6 +97,15 @@ public class UpdateCommandHandler extends CommandHandler {
         }
         }
         start = true;
         start = true;
         FileUtils.delete(updateApk);
         FileUtils.delete(updateApk);
+        boolean createApk = false;
+        try {
+            createApk = updateApk.createNewFile();
+        } catch (IOException e) {
+            LogUtils.e(TAG, "更新包文件创建失败: " + e.getMessage(), e);
+        }
+        if (!createApk) {
+            return failedResult("更新包文件创建失败");
+        }
         if (executor == null) {
         if (executor == null) {
             executor = Executors.newScheduledThreadPool(1);
             executor = Executors.newScheduledThreadPool(1);
         }
         }

app/src/main/java/com/bgycc/smartcanteen/utils/InstallManager.java

@@ -12,18 +12,19 @@ import static com.bgycc.smartcanteen.utils.SmartCanteenUtils.TAG;
 public class InstallManager {
 public class InstallManager {
     public static boolean install(File updateApk) {
     public static boolean install(File updateApk) {
         String model = Build.MODEL;
         String model = Build.MODEL;
-        if (model.contains(DeviceProxy.DEVICE_MODEL_TPS)) {
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
             // 6.0以下安装包需要修改权限才能安装
             // 6.0以下安装包需要修改权限才能安装
             try {
             try {
                 Process p = Runtime.getRuntime().exec("chmod 755 " + updateApk);
                 Process p = Runtime.getRuntime().exec("chmod 755 " + updateApk);
                 p.waitFor();
                 p.waitFor();
-                DangerousUtils.installAppSilent(updateApk);
                 LogUtils.d(TAG, "开始安装");
                 LogUtils.d(TAG, "开始安装");
-                return true;
             } catch (Exception e) {
             } catch (Exception e) {
                 LogUtils.e(TAG, "安装文件权限修改失败");
                 LogUtils.e(TAG, "安装文件权限修改失败");
                 return false;
                 return false;
             }
             }
+        }
+        if (model.contains(DeviceProxy.DEVICE_MODEL_TPS)) {
+            return DangerousUtils.installAppSilent(updateApk);
         } else if (model.contains(DeviceProxy.DEVICE_MODEL_QUAD)) {
         } else if (model.contains(DeviceProxy.DEVICE_MODEL_QUAD)) {
             AppUtils.installApp(updateApk);
             AppUtils.installApp(updateApk);
             return true;
             return true;