Browse Source

去掉无网络时反复重启以太网

weizhengliang 3 years ago
parent
commit
74776f030d
2 changed files with 3 additions and 3 deletions
  1. 1 1
      app/build.gradle
  2. 2 2
      app/src/main/java/com/wdkl/callingdoor/ui/InitActivity.java

+ 1 - 1
app/build.gradle

@@ -32,7 +32,7 @@ android {
         minSdkVersion 15
         minSdkVersion 15
         targetSdkVersion 26
         targetSdkVersion 26
         versionCode 1
         versionCode 1
-        versionName "1.67"
+        versionName "1.68"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         multiDexEnabled true
 
 

+ 2 - 2
app/src/main/java/com/wdkl/callingdoor/ui/InitActivity.java

@@ -340,10 +340,10 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
             } else {
             } else {
                 //updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);
                 //updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);
                 //showNetErrorView("MAC地址: " + macAddress + "\nError:无网络连接;以太网是否连接正常?" + "\n" + AutoRebootUtil.getTextTip());
                 //showNetErrorView("MAC地址: " + macAddress + "\nError:无网络连接;以太网是否连接正常?" + "\n" + AutoRebootUtil.getTextTip());
-                if (ethreRoobt) {
+                /*if (ethreRoobt) {
                     AutoRebootUtil.ethreboot();
                     AutoRebootUtil.ethreboot();
                 }
                 }
-                ethreRoobt = !ethreRoobt;
+                ethreRoobt = !ethreRoobt;*/
                 showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError:无网络连接;以太网是否连接正常?");// wuyq modify
                 showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError:无网络连接;以太网是否连接正常?");// wuyq modify
                 ToastUtil.showToast("无网络连接;以太网是否连接正常?");
                 ToastUtil.showToast("无网络连接;以太网是否连接正常?");
                 if (null != MyApplication.serialPortUtil)
                 if (null != MyApplication.serialPortUtil)