Browse Source

<设置中增加手动升级功能>

weizhengliang 4 years ago
parent
commit
912d16543a

+ 10 - 1
app/src/main/java/com/wdkl/callingmainnurse/ui/activity/MainFragmentActivity.java

@@ -48,6 +48,7 @@ import com.wdkl.callingmainnurse.util.SipUtil.SipCallBackI;
 import com.wdkl.callingmainnurse.util.SipUtil.SipHelperUtil;
 import com.wdkl.callingmainnurse.util.StringUtils;
 import com.wdkl.callingmainnurse.util.TimeUtil;
+import com.wdkl.callingmainnurse.util.ToastUtil;
 import com.wdkl.callingmainnurse.util.UIUtils;
 import com.wdkl.callingmainnurse.util.VoiceMessageRoomWardInformationUtil;
 import com.wdkl.callingmainnurse.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil;
@@ -393,7 +394,7 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
     /**
      * 检查APP更新版本
      */
-    private void appCheckUpdate() {
+    public void appCheckUpdate() {
         if (!StringUtils.notEmpty(Constants.URL)) return;
         if (!StringUtils.notEmpty(Constants.PartID)) return;
         try {
@@ -405,6 +406,7 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
                         public void onError(Call call, Exception e, int id) {
                             LogUtil.d("appCheckUpdate", "2===onError");
                             Constants.UPDATE_APP_FLAG = false;
+                            ToastUtil.showToast("检查APP版本失败,请检查网络或服务器配置");
                         }
 
                         @Override
@@ -428,10 +430,17 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
                                             Intent intent = new Intent(MainFragmentActivity.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();

+ 5 - 1
app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/SystemSettingFragment.java

@@ -20,6 +20,7 @@ import com.wdkl.callingmainnurse.adapter.SettingAdapter;
 import com.wdkl.callingmainnurse.base.BaseFragment;
 import com.wdkl.callingmainnurse.common.Constants;
 import com.wdkl.callingmainnurse.entity.MessageEvent;
+import com.wdkl.callingmainnurse.ui.activity.MainFragmentActivity;
 import com.wdkl.callingmainnurse.ui.activity.SysBrightSetActivity;
 import com.wdkl.callingmainnurse.ui.activity.SysCallingVolSetActivity;
 import com.wdkl.callingmainnurse.ui.activity.SysLedSetActivity;
@@ -146,6 +147,7 @@ public class SystemSettingFragment extends BaseFragment implements SettingAdapte
         itemNameList.add("系统声音设置");
         itemNameList.add("系统LED设置");
         itemNameList.add("系统通话音量设置");
+        itemNameList.add("检查升级");
         settingAdapter.updateList(itemNameList);
     }
 
@@ -223,7 +225,9 @@ public class SystemSettingFragment extends BaseFragment implements SettingAdapte
             case 3:
                 getActivity().startActivity(new Intent(getActivity(), SysCallingVolSetActivity.class));
                 break;
-
+            case 4:
+                ((MainFragmentActivity)getActivity()).appCheckUpdate();
+                break;
         }
 
     }

+ 2 - 1
app/src/main/java/com/wdkl/callingmainnurse/util/SpeechUtil.java

@@ -34,7 +34,8 @@ public class SpeechUtil {
                 if (status == TextToSpeech.SUCCESS) {
                     int supported = textToSpeech.setLanguage(Locale.CHINESE);
                     if ((supported != TextToSpeech.LANG_AVAILABLE) && (supported != TextToSpeech.LANG_COUNTRY_AVAILABLE)) {
-                        ToastUtil.showToast("当前不支持中文!");
+                        //ToastUtil.showToast("当前不支持中文!");
+                        LogUtil.d(TAG, "onInit: 当前不支持中文");
                     } else {
                         LogUtil.d(TAG, "onInit: 支持中文");
                     }