## [1.3.42] version 124 - 2022-03-18

- 增加手动配置服务器ip地址功能

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 123
+    ext.app_version_code = 124
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.3.41"
+    ext.app_version = "1.3.42"
 
     /**
      * 项目依赖库

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchEventDetailActivity.kt

@@ -29,6 +29,7 @@ import com.wdkl.ncs.android.lib.vo.MessageEvent
 import com.wdkl.ncs.android.middleware.api.ApiManager
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
+import com.wdkl.ncs.android.middleware.model.ServerIpInfo
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.ChannelDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
@@ -295,6 +296,10 @@ class WatchEventDetailActivity : BaseActivity<WatchHomeActivityPresenter, WatchA
 
     }
 
+    override fun setServerInfo(serverIpInfo: ServerIpInfo) {
+
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
         if (messageEvent.tag == 4) {

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -39,6 +39,7 @@ import com.wdkl.ncs.android.lib.vo.MessageEvent
 import com.wdkl.ncs.android.middleware.common.Constants
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
+import com.wdkl.ncs.android.middleware.model.ServerIpInfo
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.ChannelDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
@@ -48,9 +49,11 @@ import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.model.vo.WatchContactVO
 import com.wdkl.ncs.android.middleware.tcp.NettyClient
 import com.wdkl.ncs.android.middleware.tcp.TcpClientHandler
+import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import com.wdkl.ncs.android.middleware.utils.ContactHelper
 import com.wdkl.ncs.keepbackground.utils.SpManager
 import com.wdkl.ncs.keepbackground.work.DaemonEnv
+import com.wdkl.rtc.util.JanusConstant
 import io.reactivex.Observable
 import kotlinx.android.synthetic.main.watch_activity_home2.*
 import kotlinx.android.synthetic.main.watch_activity_register.*
@@ -178,6 +181,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         if (SettingConfig.getVoiceCallType(BaseApplication.appContext) == -1) {
             SettingConfig.setVoiceCallType(BaseApplication.appContext, SettingConfig.SIP_CALL)
         }
+
+        tv_server_ip.text = CommonUtils.getUrl(BaseApplication.appContext)
     }
 
     private fun regReceiver() {
@@ -221,7 +226,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
      * 返回的tcp信息
      */
     override fun setTcpServerHost(tcpSeverDTO: TcpSeverDTO) {
-        Log.d(TAG, "获取服务器IP完成")
+        /*Log.d(TAG, "获取服务器IP完成")
         if (tcpSeverDTO.publicIp != null && tcpSeverDTO.tcpPort != null && tcpSeverDTO.readerIdleTime != null) {
             Constants.tcpServer = tcpSeverDTO.publicIp
             Constants.tcpPort = tcpSeverDTO.tcpPort
@@ -237,6 +242,29 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
             }
 
             presenter.getDeviceVO(Constants.imei)
+        }*/
+    }
+
+    override fun setServerInfo(serverIpInfo: ServerIpInfo) {
+        if (serverIpInfo.tcpPublicIp != null && serverIpInfo.tcpPort != null && serverIpInfo.tcpIdleSeconds != null) {
+            Constants.tcpServer = serverIpInfo.tcpPublicIp
+            Constants.tcpPort = serverIpInfo.tcpPort
+            Constants.heartBeat = serverIpInfo.tcpIdleSeconds
+            tv_server_ip.text = serverIpInfo.tcpPublicIp
+
+            JanusConstant.JANUS_URL = "ws://" + serverIpInfo.rtcLocalIp + ":" + serverIpInfo.rtcPort
+            JanusConstant.STUN_SERVER = arrayOf<String>(serverIpInfo.stunServer)
+            //JanusConstant.TURN_SERVER = data.turnServer
+
+            //成功获取到数据后再启动keepService并连接tcp服务器
+            if (DaemonEnv.app == null && !Strings.isNullOrEmpty(Constants.tcpServer) && !WdKeepAliveService.instanceCreated) {
+                Log.d(TAG, "开始 WdKeepAliveService")
+                //保活守护进程
+                DaemonEnv.init(this)
+                DaemonEnv.startServiceSafely(this, WdKeepAliveService::class.java)
+            }
+
+            presenter.getDeviceVO(Constants.imei)
         }
     }
 
@@ -425,10 +453,10 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
     }
 
     //写手机通讯录
-    override fun setContact(contactVOs: List<WatchContactVO>) {
-        if (contactVOs != null && contactVOs.size > 0) {
+    override fun setContact(contactsVOs: List<WatchContactVO>) {
+        if (contactsVOs != null && contactsVOs.size > 0) {
             Thread {
-                for (contactVO in contactVOs) {
+                for (contactVO in contactsVOs) {
                     if (!Strings.isNullOrEmpty(contactVO.name) && !Strings.isNullOrEmpty(contactVO.phoneNumber)) {
                         ContactHelper.setContact(this, contactVO.name, contactVO.phoneNumber)
                     }
@@ -523,6 +551,10 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         tv_restart_app.setOnClickListener {
             AppUtils.restartApp()
         }
+
+        tv_config_server.setOnClickListener {
+            ServerConfigDialogHelper.showPasswordDialog(activity)
+        }
     }
 
     override fun enableHeadsetVoiceMsg(): Boolean {
@@ -531,7 +563,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
     fun initTcp() {
         if (!Strings.isNullOrEmpty(Constants.tcpServer)) {    //有网且得到了服务器IP
-            presenter.getTcpServerHost()
+            //presenter.getTcpServerHost()
+            presenter.getServerInfo()
             return
         }
 
@@ -540,7 +573,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
             while (isUnRegister && count > 0 && Strings.isNullOrEmpty(Constants.tcpServer)) {
                 //DaemonEnv.sendStopWorkBroadcast(this)
                 Log.i(TAG, "获取TCP服务器IP和端口")
-                presenter.getTcpServerHost()
+                //presenter.getTcpServerHost()
+                presenter.getServerInfo()
 
                 try {
                     Thread.sleep(5000)

home/src/main/code/com/wdkl/ncs/android/component/home/adapter/NumAdapter.java

@@ -0,0 +1,56 @@
+package com.wdkl.ncs.android.component.home.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.wdkl.ncs.android.component.home.R;
+
+public class NumAdapter extends BaseAdapter {
+    private String[] num;
+    private Context context;
+
+    public NumAdapter(String[] numbers, Context context) {
+        this.num = numbers;
+        this.context = context;
+    }
+
+
+    @Override
+    public int getCount() {
+        return num.length;
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return num[position];
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder viewHolder;
+        if (convertView == null) {
+            convertView = LayoutInflater.from(context).inflate(R.layout.digital_item, null);
+            viewHolder = new ViewHolder();
+            viewHolder.numTv = convertView.findViewById(R.id.tv_number);
+            convertView.setTag(viewHolder);
+        } else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+        viewHolder.numTv.setText(num[position]);
+
+        return convertView;
+    }
+
+    static class ViewHolder {
+        TextView numTv;
+    }
+}

home/src/main/code/com/wdkl/ncs/android/component/home/service/AudioSystem.java

@@ -0,0 +1,143 @@
+package com.wdkl.ncs.android.component.home.service;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.os.Build;
+import android.util.Log;
+
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+
+import java.lang.reflect.Method;
+
+import static android.os.Build.VERSION.SDK_INT;
+
+class AudioSystem {
+
+    private static final int REFLECTION_ERROR = -999;
+
+    private static final String DEVICE_OUT_EARPIECE = "DEVICE_OUT_EARPIECE";
+    private static final String DEVICE_OUT_SPEAKER = "DEVICE_OUT_SPEAKER";
+    private static final String DEVICE_OUT_WIRED_HEADSET = "DEVICE_OUT_WIRED_HEADSET";
+    private static final String DEVICE_OUT_WIRED_HEADPHONE = "DEVICE_OUT_WIRED_HEADPHONE";
+    private static final String DEVICE_OUT_USB_HEADSET = "DEVICE_OUT_USB_HEADSET";
+
+    Class<?> mAudioSystem;
+
+    protected AudioSystem() {
+        clearLimit();
+
+        try {
+            mAudioSystem = Class.forName("android.media.AudioSystem");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    private void clearLimit() {
+        if (SDK_INT < Build.VERSION_CODES.P) {
+            return;
+        }
+        try {
+            Method forName = Class.class.getDeclaredMethod("forName", String.class);
+            Method getDeclaredMethod = Class.class.getDeclaredMethod("getDeclaredMethod", String.class, Class[].class);
+            Class<?> vmRuntimeClass = (Class<?>) forName.invoke(null, "dalvik.system.VMRuntime");
+            Method getRuntime = (Method) getDeclaredMethod.invoke(vmRuntimeClass, "getRuntime", null);
+            Method setHiddenApiExemptions = (Method) getDeclaredMethod.invoke(vmRuntimeClass, "setHiddenApiExemptions", new Class[]{String[].class});
+            Object sVmRuntime = getRuntime.invoke(null);
+            setHiddenApiExemptions.invoke(sVmRuntime, new Object[]{new String[]{"L"}});
+        } catch (Throwable e) {
+            Log.e("[error]", "reflect bootstrap failed:", e);
+        }
+    }
+
+    private int getConstantValue(String s) {
+
+        try {
+            return ((Integer) mAudioSystem.getDeclaredField(s).get(int.class)).intValue();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return REFLECTION_ERROR;
+
+    }
+
+
+    private int setDeviceConnectionState(int i, int j, String s) {
+
+        try {
+            String name = getOutputDeviceName(i);
+            Log.e("audio", "device: " + i + ", name: " + name);
+            return (Integer) mAudioSystem.getMethod("setDeviceConnectionState", int.class, int.class, String.class, String.class).invoke(mAudioSystem, i, j, s, name);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return REFLECTION_ERROR;
+    }
+
+    private String getOutputDeviceName(int i) {
+        try {
+            return (String) mAudioSystem.getMethod("getOutputDeviceName", int.class).invoke(mAudioSystem, i);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "";
+    }
+
+    private int setDeviceConnectionState(String deviceName, Boolean state) {
+        return setDeviceConnectionState(getConstantValue(deviceName), (state ? 1 : 0), "");
+    }
+
+    //setForceUse(FOR_MEDIA, FORCE_SPEAKER)
+    private int setForceUse(String var1, String var2) {
+        try {
+            int usage = getConstantValue(var1);
+            int config = getConstantValue(var2);
+            return (Integer) mAudioSystem.getMethod("setForceUse", int.class, int.class).invoke(mAudioSystem, usage, config);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return REFLECTION_ERROR;
+    }
+
+    private void forceWiredHeadphonesMedia() {
+        //AudioManager audioManager = (AudioManager) BaseApplication.appContext.getSystemService(Context.AUDIO_SERVICE);
+
+        setDeviceConnectionState(DEVICE_OUT_EARPIECE, false);
+        setDeviceConnectionState(DEVICE_OUT_SPEAKER, false);
+        setDeviceConnectionState(DEVICE_OUT_WIRED_HEADSET, true);
+        setDeviceConnectionState(DEVICE_OUT_WIRED_HEADPHONE, true);
+
+        int res = setForceUse("FOR_VIBRATE_RINGING", "FORCE_HEADPHONES");
+    }
+
+
+    private void forceSpeakerMedia() {
+        setDeviceConnectionState(DEVICE_OUT_SPEAKER, true);
+        setDeviceConnectionState(DEVICE_OUT_EARPIECE, true);
+        setDeviceConnectionState(DEVICE_OUT_WIRED_HEADPHONE, false);
+        setDeviceConnectionState(DEVICE_OUT_SPEAKER, true);
+    }
+
+    /*public void setWiredDeviceConnectionState(int type, int state, String address, String name) {
+        IAudioService service = getService();
+        try {
+            service.setWiredDeviceConnectionState(type, state, address, name,
+                    mApplicationContext.getOpPackageName());
+        } catch (RemoteException e) {
+            Log.e(TAG, "Dead object in setWiredDeviceConnectionState "+e);
+        }
+    }*/
+
+    public void setSpeakerOn(Boolean state) {
+        if (state) {
+            forceSpeakerMedia();
+        } else {
+            forceWiredHeadphonesMedia();
+        }
+    }
+}

home/src/main/code/com/wdkl/ncs/android/component/home/service/PhoneStateReceiver.java

@@ -7,7 +7,6 @@ import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import com.wdkl.ncs.android.component.home.util.HandleTcpConnect;
-import com.wdkl.ncs.android.component.home.util.MediaPlayHelper;
 import com.wdkl.ncs.android.component.home.util.PhoneCallUtil;
 import com.wdkl.ncs.android.component.home.util.RecordHelper;
 import com.wdkl.ncs.android.lib.vo.MessageEvent;
@@ -16,7 +15,6 @@ import com.wdkl.ncs.android.middleware.tcp.NettyClient;
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel;
 import com.wdkl.ncs.android.middleware.tcp.channel.PhoneUtil;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
-import com.wdkl.rtc.util.Constant;
 
 import org.greenrobot.eventbus.EventBus;
 

home/src/main/code/com/wdkl/ncs/android/component/home/ui/CallSingleActivity.java

@@ -45,7 +45,7 @@ import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
 import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType;
-import com.wdkl.rtc.util.Constant;
+import com.wdkl.rtc.util.JanusConstant;
 import com.wdkl.rtc.entity.Room;
 import com.wdkl.rtc.janus.JanusClient;
 import com.wdkl.rtc.janus.VideoRoomCallback;
@@ -240,7 +240,7 @@ public class CallSingleActivity extends AppCompatActivity {
 
         //================ 信令
         //初始化 janusClient
-        janusClient = new JanusClient(Constant.JANUS_URL, localUserId);
+        janusClient = new JanusClient(JanusConstant.JANUS_URL, localUserId);
 
         //================ 信令
         videoRoomCallback = new VideoRoomCallback(janusClient,room, localUserId, isOutgoing, iLogUpload);

home/src/main/code/com/wdkl/ncs/android/component/home/util/ServerConfigDialogHelper.java

@@ -0,0 +1,151 @@
+package com.wdkl.ncs.android.component.home.util;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.EditText;
+import android.widget.GridView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.wdkl.ncs.android.component.home.R;
+import com.wdkl.ncs.android.component.home.adapter.NumAdapter;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+import com.wdkl.ncs.android.middleware.utils.CommonUtils;
+
+
+public class ServerConfigDialogHelper {
+
+    private static AlertDialog callDialog;
+    private static String pwd = "";
+
+    public static void showPasswordDialog(final Activity activity) {
+        View contentView = LayoutInflater.from(activity).inflate(R.layout.server_config_dialog_lay, null);
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setView(contentView);
+
+        final String[] numbers = {"1","2","3","4","5","6","7","8","9"};
+        final TextView password = contentView.findViewById(R.id.tv_psw_view);
+        final LinearLayout llPwd = contentView.findViewById(R.id.ll_password);
+        final LinearLayout llServer = contentView.findViewById(R.id.ll_server_config);
+        GridView gridView = contentView.findViewById(R.id.grid_psw);
+        NumAdapter adapter = new NumAdapter(numbers, activity);
+        gridView.setAdapter(adapter);
+        gridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (pwd.length() <= 2) {
+                    pwd = pwd + numbers[position];
+                    password.setText(pwd);
+                }
+                Log.d("serverIp", "input password len: " + pwd.length() + "--" + pwd);
+            }
+        });
+
+        TextView delete = contentView.findViewById(R.id.btn_delete);
+        TextView cancel = contentView.findViewById(R.id.btn_cancel);
+        TextView confirm = contentView.findViewById(R.id.btn_confirm);
+        delete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Log.d("serverIp", "delete password len: " + pwd.length() + "--" + pwd);
+                if (pwd.length() > 1) {
+                    pwd = pwd.substring(0, pwd.length()-1);
+                    password.setText(pwd);
+                } else {
+                    pwd = "";
+                    password.setText(pwd);
+                    password.setHint("请输入密码");
+                }
+            }
+        });
+
+        cancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismissCallDialog();
+            }
+        });
+
+        confirm.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if ("666".equals(pwd)) {
+                    llPwd.setVisibility(View.GONE);
+                    llServer.setVisibility(View.VISIBLE);
+                } else {
+                    Toast.makeText(activity, "密码错误", Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+
+        final EditText editUrl = contentView.findViewById(R.id.edit_url);
+        final EditText editPort = contentView.findViewById(R.id.edit_port);
+        final EditText editSipUrl = contentView.findViewById(R.id.edit_sip_url);
+        final EditText editSipPort = contentView.findViewById(R.id.edit_sip_port);
+        TextView saveConfig = contentView.findViewById(R.id.btn_save_config);
+        TextView cancelConfig = contentView.findViewById(R.id.btn_cancel_config);
+        editUrl.setText(CommonUtils.getUrl(BaseApplication.appContext));
+        editPort.setText(CommonUtils.getUrlPort(BaseApplication.appContext));
+        //editSipUrl.setText(CommonUtils.getSipUrl(BaseApplication.appContext));
+        //editSipPort.setText(CommonUtils.getSipPort(BaseApplication.appContext));
+        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();
+            }
+        });
+        cancelConfig.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismissCallDialog();
+            }
+        });
+
+
+        callDialog = builder.create();
+        //callDialog.setCanceledOnTouchOutside(false);
+        //callDialog.setCancelable(false);
+        callDialog.show();
+
+        //设置dialog宽高及位置
+        try {
+            Window window = callDialog.getWindow();
+            window.setFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
+            WindowManager.LayoutParams lp = window.getAttributes();
+            lp.width = 480;
+            lp.height = 720;
+            lp.gravity = Gravity.CENTER;
+            window.setAttributes(lp);
+
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN);
+            window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void dismissCallDialog() {
+        pwd = "";
+        if (callDialog != null && callDialog.isShowing()) {
+            callDialog.dismiss();
+        }
+    }
+}

home/src/main/res/layout/digital_item.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/tv_number"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_gray"
+        android:layout_margin="4dp"
+        android:padding="4dp"
+        android:gravity="center"
+        android:textSize="16sp"
+        android:textColor="@color/main_color"/>
+
+</LinearLayout>

home/src/main/res/layout/server_config_dialog_lay.xml

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--密码框-->
+    <LinearLayout
+        android:id="@+id/ll_password"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_psw_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textSize="16sp"
+            android:hint="请输入密码"
+            android:textColor="@color/main_color"/>
+
+        <GridView
+            android:id="@+id/grid_psw"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:verticalSpacing="5dp"
+            android:horizontalSpacing="5dp"
+            android:numColumns="3"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/btn_delete"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="4dp"
+                android:gravity="center_horizontal"
+                android:text="删除"
+                android:textSize="16sp"
+                android:textColor="@color/main_color"/>
+
+            <TextView
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="4dp"
+                android:gravity="center_horizontal"
+                android:text="取消"
+                android:textSize="16sp"
+                android:textColor="@color/main_color"/>
+            <TextView
+                android:id="@+id/btn_confirm"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="4dp"
+                android:gravity="center_horizontal"
+                android:text="确定"
+                android:textSize="16sp"
+                android:textColor="@color/main_color"/>
+        </LinearLayout>
+    </LinearLayout>
+
+
+    <!--服务器ip配置-->
+    <LinearLayout
+        android:id="@+id/ll_server_config"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="20dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Server IP:"
+                android:textSize="12sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textUri"
+                android:textSize="12sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Port:"
+                android:textSize="12sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="number"
+                android:textSize="12sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Sip IP:"
+                android:textSize="12sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_sip_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textUri"
+                android:textSize="12sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Sip port:"
+                android:textSize="12sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_sip_port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="number"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp">
+            <TextView
+                android:id="@+id/btn_cancel_config"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="取消"
+                android:textSize="16sp"
+                android:textColor="@color/black"/>
+
+            <TextView
+                android:id="@+id/btn_save_config"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="保存"
+                android:textSize="16sp"
+                android:textColor="@color/black" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>

home/src/main/res/layout/watch_activity_register.xml

@@ -91,6 +91,19 @@
                 android:gravity="center"
                 android:text="重启app"
                 android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/tv_config_server"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="30dp"
+                android:layout_marginBottom="20dp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:text="配置服务器"
+                android:textSize="18sp" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>

janus/src/main/java/com/wdkl/rtc/rtc/WebRTCEngine.java

@@ -15,19 +15,17 @@ import android.util.Log;
 import android.view.View;
 
 import com.wdkl.rtc.rtc.observer.CreatePeerConnectionCallback;
-import com.wdkl.rtc.util.Constant;
+import com.wdkl.rtc.util.JanusConstant;
 import com.wdkl.rtc.render.ProxyVideoSink;
 
 import org.webrtc.AudioSource;
 import org.webrtc.AudioTrack;
 import org.webrtc.Camera1Enumerator;
-import org.webrtc.Camera2Enumerator;
 import org.webrtc.CameraEnumerator;
 import org.webrtc.CameraVideoCapturer;
 import org.webrtc.DefaultVideoDecoderFactory;
 import org.webrtc.DefaultVideoEncoderFactory;
 import org.webrtc.EglBase;
-import org.webrtc.IceCandidate;
 import org.webrtc.MediaConstraints;
 import org.webrtc.MediaStream;
 import org.webrtc.PeerConnection;
@@ -113,27 +111,28 @@ public class WebRTCEngine {
     }
 
     private void initIceServer(){
-        PeerConnection.IceServer iceServer = null;
-        for(String stunServer: Constant.STUN_SERVER) {
-            if (stunServer.contains("|"))
-            {
-                String[] stunParams = stunServer.split("|");
-                iceServer = PeerConnection.IceServer
-                        .builder(stunParams[0])
-                        .setUsername(stunParams[1])
-                        .setPassword(stunParams[2])
-                        .setTlsCertPolicy(PeerConnection.TlsCertPolicy.TLS_CERT_POLICY_INSECURE_NO_CHECK)
-                        .createIceServer();
-            } else {
-                iceServer = PeerConnection.IceServer
-                        .builder(stunServer)
-                        .setTlsCertPolicy(PeerConnection.TlsCertPolicy.TLS_CERT_POLICY_INSECURE_NO_CHECK)
-                        .createIceServer();
+        PeerConnection.IceServer iceServer;
+        if (JanusConstant.STUN_SERVER != null) {
+            for (String stunServer : JanusConstant.STUN_SERVER) {
+                if (stunServer.contains("|")) {
+                    String[] stunParams = stunServer.split("|");
+                    iceServer = PeerConnection.IceServer
+                            .builder(stunParams[0])
+                            .setUsername(stunParams[1])
+                            .setPassword(stunParams[2])
+                            .setTlsCertPolicy(PeerConnection.TlsCertPolicy.TLS_CERT_POLICY_INSECURE_NO_CHECK)
+                            .createIceServer();
+                } else {
+                    iceServer = PeerConnection.IceServer
+                            .builder(stunServer)
+                            .setTlsCertPolicy(PeerConnection.TlsCertPolicy.TLS_CERT_POLICY_INSECURE_NO_CHECK)
+                            .createIceServer();
+                }
+                iceServers.add(iceServer);
             }
-            iceServers.add(iceServer);
         }
-        if (Constant.TURN_SERVER != null){
-            for(String turnServer:Constant.TURN_SERVER){
+        if (JanusConstant.TURN_SERVER != null){
+            for(String turnServer: JanusConstant.TURN_SERVER){
                 if (turnServer.contains("|"))
                 {
                     String[] turnParams = turnServer.split("|");

janus/src/main/java/com/wdkl/rtc/util/Constant.java

@@ -1,15 +0,0 @@
-package com.wdkl.rtc.util;
-
-import com.wdkl.ncs.android.middleware.api.UrlManager;
-import com.wdkl.rtc.janus.JanusClient;
-
-import java.math.BigInteger;
-import java.util.Random;
-
-public class Constant {
-    public final static String GATEWAY_URL= UrlManager.Companion.build().getGateway();
-    public final static String JANUS_URL = "ws://"+Constant.GATEWAY_URL+":" + UrlManager.Companion.build().getWsPort();
-
-    public final static String[] STUN_SERVER = new String[]{"stun:"+GATEWAY_URL+":3478"};
-    public final static String[] TURN_SERVER = null; //new String[]{"turn:stun.l.google.com:19302|username|password"};
-}

janus/src/main/java/com/wdkl/rtc/util/JanusConstant.java

@@ -0,0 +1,17 @@
+package com.wdkl.rtc.util;
+
+import com.wdkl.ncs.android.middleware.api.UrlManager;
+
+public class JanusConstant {
+    //public final static String GATEWAY_URL= UrlManager.Companion.build().getGateway();
+    //public final static String JANUS_URL = "ws://"+ JanusConstant.GATEWAY_URL+":" + UrlManager.Companion.build().getWsPort();
+
+    //public final static String[] STUN_SERVER = new String[]{"stun:"+GATEWAY_URL+":3478"};
+    //public final static String[] TURN_SERVER = null; //new String[]{"turn:stun.l.google.com:19302|username|password"};
+
+    public static String JANUS_URL = "ws://119.23.151.229:8188"; //默认的
+    //public static String STUN1 = "stun:" +GATEWAY_URL+ ":3478";
+    public static String[] STUN_SERVER = null; //new String[]{STUN1};
+
+    public static String[] TURN_SERVER = null; //new String[]{"turn:stun.l.google.com:19302|username|password"};
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/UrlManager.kt

@@ -5,6 +5,7 @@ import com.wdkl.ncs.android.lib.utils.Util
 import com.wdkl.ncs.android.middleware.config.WdklNcsConfigCenter
 import com.wdkl.ncs.android.middleware.server.ServerInfoDetail
 import com.wdkl.ncs.android.middleware.server.ServerInfoUtil
+import com.wdkl.ncs.android.middleware.utils.CommonUtils
 
 /**
  * @author LDD
@@ -112,6 +113,7 @@ private class ShowUrlManager : UrlManager{
 
     override val device_url: String
         get() = "${base}:8006/"
+        //get() = "${base}:5006/"
     override val basic: String
         get() = "${base}:7002/"
 }
@@ -139,17 +141,20 @@ private class ProUrlManager : UrlManager{
 }
 
 private class CommonUrlManager: UrlManager{
+    val url: String = CommonUtils.getUrl(BaseApplication.appContext)
+    val httpPort: String = CommonUtils.getUrlPort(BaseApplication.appContext)
+    val rtcPort: String = CommonUtils.getSipPort(BaseApplication.appContext)
 
-    var serverInfoDetail:ServerInfoDetail = ServerInfoUtil.getDetail(Util.getIMEI(BaseApplication.appContext))
+    //var serverInfoDetail:ServerInfoDetail = ServerInfoUtil.getDetail(Util.getIMEI(BaseApplication.appContext))
 
     override val gateway: String
-        get() = serverInfoDetail.httpPublicIp
+        get() = url
     override val wsPort: Int
-        get() = serverInfoDetail.rtcPort
+        get() = rtcPort.toInt()
     override val base: String
         get() = "http://${gateway}"
     override val device_url: String
-        get() = "http://${gateway}:" + serverInfoDetail.httpPort
+        get() = "http://${gateway}:" + httpPort
     override val basic: String
         get() = "http://${gateway}:7002"
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/WatchDeviceInfoAndTCPMailingAddressApi.kt

@@ -16,6 +16,10 @@ interface WatchDeviceInfoAndTCPMailingAddressApi {
     @GET("/ncs_url/getHostIP")
     fun getTcpServerHost(): Observable<ResponseBody>
 
+    //获取服务器地址
+    @GET("/ncs_url/server_info")
+    fun getServerInfo(): Observable<ResponseBody>
+
     //获取设备设置数据
     @GET("/watch/getPartSetting/{partId}")
     fun getDeviceSettingData(@Path("partId")partId:Int): Observable<ResponseBody>

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/home/WatchHomeActivityContract.kt

@@ -1,6 +1,7 @@
 package com.wdkl.ncs.android.middleware.logic.contract.home
 
 import com.wdkl.ncs.android.lib.base.BaseContract
+import com.wdkl.ncs.android.middleware.model.ServerIpInfo
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.ChannelDO
 import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
@@ -18,6 +19,8 @@ interface WatchHomeActivityContract{
         fun setDeviceDo(data : DeviceVO)
         //显示tcp通讯地址
         fun setTcpServerHost(tcpSeverDTO: TcpSeverDTO)
+        //设置服务器配置数据
+        fun setServerInfo(serverIpInfo: ServerIpInfo)
         //设置设备设置数据
         fun setDeviceSettingData(partSettingDO: PartSettingDO)
         //语音频道列表
@@ -34,6 +37,8 @@ interface WatchHomeActivityContract{
         fun getDeviceVO(ethMac:String)
         //获取tcp服务器地址
         fun getTcpServerHost()
+        //获取服务器配置
+        fun getServerInfo()
         //获取设备设置数据
         fun getDeviceSettingData(partId:Int)
         //获取该设备语音频道列表

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/home/WatchHomeActivityPresenter.kt

@@ -17,6 +17,7 @@ import com.wdkl.ncs.android.middleware.api.WatchDeviceInfoAndTCPMailingAddressAp
 import com.wdkl.ncs.android.middleware.api.WatchManageDeviceApi
 import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
+import com.wdkl.ncs.android.middleware.model.ServerIpInfo
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.ChannelDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
@@ -72,6 +73,10 @@ class WatchHomeActivityPresenter @Inject constructor(): RxPresenter<WatchHomeAct
                     providerView().setTcpServerHost(result)
                 }
 
+                is ServerIpInfo -> {
+                    providerView().setServerInfo(result)
+                }
+
                 is PartSettingDO -> {
                     //设备设置数据
                     providerView().complete("")
@@ -194,6 +199,18 @@ class WatchHomeActivityPresenter @Inject constructor(): RxPresenter<WatchHomeAct
                 .subscribe(observer)
     }
 
+    override fun getServerInfo() {
+        registerDeviceApi.getServerInfo()
+            .map {
+                val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                val serverIpInfo = gson.fromJson(it.getJsonString(), ServerIpInfo::class.java)
+
+                return@map serverIpInfo
+            }
+            .compose(ThreadFromUtils.defaultSchedulers())
+            .subscribe(observer)
+    }
+
     override fun getDeviceSettingData(partId: Int) {
         registerDeviceApi.getDeviceSettingData(partId)
             .map {

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ServerIpInfo.java

@@ -0,0 +1,178 @@
+package com.wdkl.ncs.android.middleware.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+
+@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class)
+public class ServerIpInfo implements Serializable {
+    @ApiModelProperty(notes = "局域网TCP服务器IP")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String tcpLocalIp;
+
+    @ApiModelProperty(notes = "互联网TCP服务器IP")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String tcpPublicIp;
+
+    @ApiModelProperty(notes = "TCP端口")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Integer tcpPort;
+
+    @ApiModelProperty(notes = "TCP体征数据库端口")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Integer tcpVsPort;
+
+    @ApiModelProperty(notes = "TCP心跳间隔，单位：秒")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Integer tcpIdleSeconds;
+
+    @ApiModelProperty(notes = "局域网HTTP服务器IP")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String httpLocalIp;
+
+    @ApiModelProperty(notes = "互联网HTTP服务器IP")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String httpPublicIp;
+
+    @ApiModelProperty(notes = "HTTP端口")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Integer httpPort;
+
+    @ApiModelProperty(notes = "RTC Local IP")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String rtcLocalIp;
+
+    @ApiModelProperty(notes = "RTC Public IP")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String rtcPublicIp;
+
+    @ApiModelProperty(notes = "RTC 端口")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Integer rtcPort;
+
+    @ApiModelProperty(notes = "stun地址", example = "stun:xxx.xxx.xxx.xxx:3478")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String stunServer;
+
+    @ApiModelProperty(notes = "turn地址", example = "turn:xxx.xxx.xxx.xxx:3478|username|password")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String[] turnServer;
+
+    private Long serverTime;
+
+    public String getTcpLocalIp() {
+        return tcpLocalIp;
+    }
+
+    public void setTcpLocalIp(String tcpLocalIp) {
+        this.tcpLocalIp = tcpLocalIp;
+    }
+
+    public String getTcpPublicIp() {
+        return tcpPublicIp;
+    }
+
+    public void setTcpPublicIp(String tcpPublicIp) {
+        this.tcpPublicIp = tcpPublicIp;
+    }
+
+    public Integer getTcpPort() {
+        return tcpPort;
+    }
+
+    public void setTcpPort(Integer tcpPort) {
+        this.tcpPort = tcpPort;
+    }
+
+    public Integer getTcpVsPort() {
+        return tcpVsPort;
+    }
+
+    public void setTcpVsPort(Integer tcpVsPort) {
+        this.tcpVsPort = tcpVsPort;
+    }
+
+    public Integer getTcpIdleSeconds() {
+        return tcpIdleSeconds;
+    }
+
+    public void setTcpIdleSeconds(Integer tcpIdleSeconds) {
+        this.tcpIdleSeconds = tcpIdleSeconds;
+    }
+
+    public String getHttpLocalIp() {
+        return httpLocalIp;
+    }
+
+    public void setHttpLocalIp(String httpLocalIp) {
+        this.httpLocalIp = httpLocalIp;
+    }
+
+    public String getHttpPublicIp() {
+        return httpPublicIp;
+    }
+
+    public void setHttpPublicIp(String httpPublicIp) {
+        this.httpPublicIp = httpPublicIp;
+    }
+
+    public Integer getHttpPort() {
+        return httpPort;
+    }
+
+    public void setHttpPort(Integer httpPort) {
+        this.httpPort = httpPort;
+    }
+
+    public String getRtcLocalIp() {
+        return rtcLocalIp;
+    }
+
+    public void setRtcLocalIp(String rtcLocalIp) {
+        this.rtcLocalIp = rtcLocalIp;
+    }
+
+    public String getRtcPublicIp() {
+        return rtcPublicIp;
+    }
+
+    public void setRtcPublicIp(String rtcPublicIp) {
+        this.rtcPublicIp = rtcPublicIp;
+    }
+
+    public Integer getRtcPort() {
+        return rtcPort;
+    }
+
+    public void setRtcPort(Integer rtcPort) {
+        this.rtcPort = rtcPort;
+    }
+
+    public String getStunServer() {
+        return stunServer;
+    }
+
+    public void setStunServer(String stunServer) {
+        this.stunServer = stunServer;
+    }
+
+    public String[] getTurnServer() {
+        return turnServer;
+    }
+
+    public void setTurnServer(String[] turnServer) {
+        this.turnServer = turnServer;
+    }
+
+    public Long getServerTime() {
+        return serverTime;
+    }
+
+    public void setServerTime(Long serverTime) {
+        this.serverTime = serverTime;
+    }
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/server/ServerInfoUtil.java

@@ -39,12 +39,7 @@ public class ServerInfoUtil {
         }
      */
     public static ServerInfo get(String id){
-        //--------------------优先从文件获取
-        JsonResponse jsonResponse = getFromStorageFile();
-        if (jsonResponse != null && jsonResponse.success){
-            JSONObject jsonObject = JSON.parseObject(jsonResponse.data.toString());
-            return new ServerInfo(jsonObject.getString("third_server"), jsonObject.getInteger("third_server_port"));
-        }
+        JsonResponse jsonResponse;
 
         //--------------------HTTP请求全局服务器获取
         OkHttpClient okHttpClient = new OkHttpClient().newBuilder()
@@ -74,14 +69,26 @@ public class ServerInfoUtil {
             JSONObject jsonObject = JSON.parseObject(jsonResponse.data.toString());
             return new ServerInfo(jsonObject.getString("third_server"), jsonObject.getInteger("third_server_port"));
         }
+
+        //--------------------从文件获取
+        jsonResponse = getFromStorageFile();
+        if (jsonResponse != null && jsonResponse.success){
+            JSONObject jsonObject = JSON.parseObject(jsonResponse.data.toString());
+            return new ServerInfo(jsonObject.getString("third_server"), jsonObject.getInteger("third_server_port"));
+        }
+
         return null;
     }
 
     private static JsonResponse getFromStorageFile(){
         String encoding = "UTF-8";
         File file = new File(Environment.getExternalStorageDirectory() + "/server_info.json");
-        Long filelength = file.length();
-        byte[] filecontent = new byte[filelength.intValue()];
+        if (!file.exists()) {
+            return JsonResponse.errorResponse("no file");
+        }
+
+        long filelength = file.length();
+        byte[] filecontent = new byte[(int) filelength];
         try {
             FileInputStream in = new FileInputStream(file);
             in.read(filecontent);

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

@@ -0,0 +1,62 @@
+package com.wdkl.ncs.android.middleware.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class CommonUtils {
+    private static final String SP_NAME = "SP_URL";
+    private static final String KEY_SP_URL = "KEY_SP_URL";
+    private static final String KEY_SP_URL_PORT = "KEY_SP_URL_PORT";
+    private static final String KEY_SP_SIP_URL = "KEY_SP_SIP_URL";
+    private static final String KEY_SP_SIP_PORT = "KEY_SP_SIP_PORT";
+
+    //默认服务器ip端口
+    //private static final String DEFAULT_URL = "172.28.100.100";
+    //private static final String DEFAULT_URL = "8.129.220.143";
+    private static final String DEFAULT_URL = "119.23.151.229";
+    private static final String DEFAULT_URL_PORT = "8006";
+    private static final String DEFAULT_SIP_PORT = "8188";
+
+
+    public static String getUrl(Context context) {
+        return getSP(context).getString(KEY_SP_URL, DEFAULT_URL);
+    }
+
+    public static void setUrl(Context context, String url) {
+        getEditor(context).putString(KEY_SP_URL, url).apply();
+    }
+
+    public static String getUrlPort(Context context) {
+        return getSP(context).getString(KEY_SP_URL_PORT, DEFAULT_URL_PORT);
+    }
+
+    public static void setUrlPort(Context context, String port) {
+        getEditor(context).putString(KEY_SP_URL_PORT, port).apply();
+    }
+
+    public static String getSipUrl(Context context) {
+        return getSP(context).getString(KEY_SP_SIP_URL, DEFAULT_URL);
+    }
+
+    public static void setSipUrl(Context context, String url) {
+        getEditor(context).putString(KEY_SP_SIP_URL, url).apply();
+    }
+
+    public static String getSipPort(Context context) {
+        return getSP(context).getString(KEY_SP_SIP_PORT, DEFAULT_SIP_PORT);
+    }
+
+    public static void setSipPort(Context context, String port) {
+        getEditor(context).putString(KEY_SP_SIP_PORT, port).apply();
+    }
+
+
+
+    private static SharedPreferences getSP(Context context) {
+        return context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
+    }
+
+    private static SharedPreferences.Editor getEditor(Context context) {
+        return getSP(context).edit();
+    }
+}

readme.md

@@ -25,6 +25,9 @@
 在发布新版本时，可以直接将Unreleased区块中的内容移动至新发 布版本的描述区块就可以了
 
 ---
+## [1.3.42] version 124 - 2022-03-18
+- 增加手动配置服务器ip地址功能
+
 ## [1.3.41] version 123 - 2022-03-18
 - 通讯录更新为耗时操作，放到子线程处理，防止主线程被阻塞出现卡死问题
 

resource/src/main/res/values/colors.xml

@@ -82,4 +82,5 @@
     <color name="javashop_color_coupon_b">#ffffff</color>
 
     <color name="warn_orange">#F07928</color>
+    <color name="main_color">#FFBDC3</color>
 </resources>