方法添加注释 2.优化APP更新提示

.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="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

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

@@ -428,7 +428,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
                                     float APPVersion = StringUtils.parseFloat(StringUtils.deleteCharAt(object.getString("APPVersion"), 0));
                                     float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(InitActivity.this));
                                     String downloadURL = object.getString("downloadURL");
-                                    if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功
+                                    if (APPVersion_Now != APPVersion) { //本来是“<”的；但有个别机器老是不升级成功
                                         LogUtil.d("appCheckUpdate", "5===APPVersion==" + APPVersion);
                                         if (StringUtils.notEmpty(downloadURL)) {
                                             LogUtil.d("appCheckUpdate", "6===downloadURL==" + downloadURL);
@@ -437,13 +437,22 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
                                             Intent intent = new Intent(InitActivity.this, APPUpdateActivity.class);
                                             intent.putExtra("downLoadURL", Constants.URL + Constants.URL_END + "/" + downloadURL);
                                             startActivity(intent);
+                                        }else {
+                                            ToastUtil.showToast("APP下载地址为空，请检查服务器配置");
                                         }
+                                    }else {
+                                        ToastUtil.showToast("已是最新版本! 当前版本: " + APPVersion_Now + ", 服务器版本: " + APPVersion);
                                     }
+                                }else {
+                                    ToastUtil.showToast("获取APP版本失败，请检查服务器是否上传新版本");
                                 }
                             } catch (Exception e) {
+                                ToastUtil.showToast("检查APP版本失败，请检查网络或服务器配置");
                                 LogUtil.d("appCheckUpdate", "7===Exception==");
                                 Constants.UPDATE_APP_FLAG = false;
                                 e.printStackTrace();
+                            }finally {
+                                Constants.UPDATE_APP_FLAG = false;
                             }
                         }
                     });

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

@@ -431,7 +431,7 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
                                     float APPVersion_Now = StringUtils.parseFloat(StringUtils.getAppVersionName(MainFragmentActivity.this));
                                     String downloadURL = object.getString("downloadURL");
 
-                                    if (APPVersion_Now != APPVersion) {//本来是“<”的；但有个别机器老是不升级成功
+                                    if (APPVersion_Now != APPVersion) { //本来是“<”的；但有个别机器老是不升级成功
                                         LogUtil.d("appCheckUpdate", "5===APPVersion==" + APPVersion);
                                         if (StringUtils.notEmpty(downloadURL)) {
                                             LogUtil.d("appCheckUpdate", "6===downloadURL==" + downloadURL);

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

@@ -2819,6 +2819,10 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         }
     }
 
+    /**
+     * 通知外部该通话已被接听
+     * @param udpEntity
+     */
     private void sendRemoveCall(UdpEntity udpEntity) {
         if (null != udpEntity) {
             InitDataEntity initdataentity = ((MainFragmentActivity) getActivity()).getInitDataEntity();

build.gradle

@@ -3,10 +3,11 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+//        maven {
+//            url 'https://maven.google.com/'
+//            name 'Google'
+//        }
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
@@ -19,10 +20,11 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+//        maven {
+//            url 'https://maven.google.com/'
+//            name 'Google'
+//        }
+        google()
     }
 }