手动修改服务器IP时增加判空处理

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/ServerConfigDialogHelper.java

@@ -2,6 +2,7 @@ package com.wdkl.app.ncs.callingdoor.helper;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -18,6 +19,7 @@ import android.widget.Toast;
 import com.wdkl.app.ncs.callingdoor.R;
 import com.wdkl.app.ncs.callingdoor.adapter.NumAdapter;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.lib.utils.ExtendMethodsKt;
 import com.wdkl.ncs.android.middleware.utils.CommonUtils;
 
 
@@ -99,12 +101,18 @@ public class ServerConfigDialogHelper {
         saveConfig.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                //保存配置
-                CommonUtils.setUrl(BaseApplication.appContext, editUrl.getText().toString());
-                CommonUtils.setUrlPort(BaseApplication.appContext, editPort.getText().toString());
-                //CommonUtils.setSipUrl(BaseApplication.appContext, editSipUrl.getText().toString());
-                //CommonUtils.setSipPort(BaseApplication.appContext, editSipPort.getText().toString());
-                dismissCallDialog();
+                String url = editUrl.getText().toString();
+                String port = editPort.getText().toString();
+                if (TextUtils.isEmpty(url) || TextUtils.isEmpty(port)) {
+                    ExtendMethodsKt.showMessage("参数不能为空");
+                } else {
+                    //保存配置
+                    CommonUtils.setUrl(BaseApplication.appContext, editUrl.getText().toString());
+                    CommonUtils.setUrlPort(BaseApplication.appContext, editPort.getText().toString());
+                    //CommonUtils.setSipUrl(BaseApplication.appContext, editSipUrl.getText().toString());
+                    //CommonUtils.setSipPort(BaseApplication.appContext, editSipPort.getText().toString());
+                    dismissCallDialog();
+                }
             }
         });
         cancelConfig.setOnClickListener(new View.OnClickListener() {

middleware/src/main/code/com/wdkl/ncs/android/middleware/utils/CommonUtils.java

@@ -23,6 +23,9 @@ public class CommonUtils {
 
 
     public static String getUrl(Context context) {
+        if (TextUtils.isEmpty(getSP(context).getString(KEY_SP_URL, DEFAULT_URL))) {
+            return DEFAULT_URL;
+        }
         return getSP(context).getString(KEY_SP_URL, DEFAULT_URL);
     }
 
@@ -31,6 +34,9 @@ public class CommonUtils {
     }
 
     public static String getUrlPort(Context context) {
+        if (TextUtils.isEmpty(getSP(context).getString(KEY_SP_URL_PORT, DEFAULT_URL_PORT))) {
+            return DEFAULT_URL_PORT;
+        }
         return getSP(context).getString(KEY_SP_URL_PORT, DEFAULT_URL_PORT);
     }