修改APP更新代码逻辑

.idea/codeStyles/Project.xml

@@ -1,116 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/AmDemo_R/AmDemo_R.iml" filepath="$PROJECT_DIR$/AmDemo_R/AmDemo_R.iml" />
       <module fileurl="file://$PROJECT_DIR$/CallingMainNurse_center2.iml" filepath="$PROJECT_DIR$/CallingMainNurse_center2.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/listenvision/listenvision.iml" filepath="$PROJECT_DIR$/listenvision/listenvision.iml" />
       <module fileurl="file://$PROJECT_DIR$/nurseMainLib/nurseMainLib.iml" filepath="$PROJECT_DIR$/nurseMainLib/nurseMainLib.iml" />
       <module fileurl="file://$PROJECT_DIR$/test/test.iml" filepath="$PROJECT_DIR$/test/test.iml" />
     </modules>

app/build.gradle

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

app/src/main/java/com/wdkl/callingmainnurse/common/Constants.java

@@ -61,7 +61,8 @@ public class Constants {
     //网关地址
     public static String URL = "";
     //端口号
-    public static final String URL_END = ":81";
+//    public static final String URL_END = ":81";
+    public static final String URL_END = ":8005";
     //初始化数据
     public static final String CALLINGMAINNURSE_INIT = "/WDHS-I/callingMainNurse_init.aspx";
     //病房数据

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

@@ -425,7 +425,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
                                 JSONObject object = new JSONObject(data);
                                 if (object.getString("Code").equals("OK!")) {
                                     LogUtil.d("appCheckUpdate", "4===object==" + object.toString());
-                                    float APPVersion = StringUtils.parseFloat(StringUtils.deleteCharAt(object.getString("APPVersion"), 0));
+                                    float APPVersion = StringUtils.parseFloat(object.getString("APPVersion"));
                                     float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(InitActivity.this));
                                     String downloadURL = object.getString("downloadURL");
                                     if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功

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

@@ -427,9 +427,10 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
                                 JSONObject object = new JSONObject(data);
                                 if (object.getString("Code").equals("OK!")) {
                                     LogUtil.d("appCheckUpdate", "4===object==" + object.toString());
-                                    float APPVersion = StringUtils.parseFloat(StringUtils.deleteCharAt(object.getString("APPVersion"), 0));
+                                    float APPVersion = StringUtils.parseFloat(object.getString("APPVersion"));
                                     float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(MainFragmentActivity.this));
                                     String downloadURL = object.getString("downloadURL");
+
                                     if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功
                                         LogUtil.d("appCheckUpdate", "5===APPVersion==" + APPVersion);
                                         if (StringUtils.notEmpty(downloadURL)) {