增加手动配置和自动获取服务器IP地址设置

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/activity/MainActivity.kt

@@ -33,6 +33,8 @@ import com.wdkl.ncs.android.middleware.common.MessageEvent
 import com.wdkl.ncs.android.middleware.common.SipStatus
 import com.wdkl.ncs.android.middleware.logic.contract.conversion_box.MainActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.conversion_box.MainActivityPresenter
+import com.wdkl.ncs.android.middleware.model.ServerInfo
+import com.wdkl.ncs.android.middleware.model.ThirdServerInfo
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
@@ -45,11 +47,16 @@ 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.ncs.android.middleware.udp.ServerInfoUtil
 import com.wdkl.ncs.android.middleware.utils.AppUtil
+import com.wdkl.ncs.android.middleware.utils.CommonUtils
+import com.wdkl.ncs.janus.util.JanusConstant
 import kotlinx.android.synthetic.main.conversion_box_main_lay.*
 import kotlinx.android.synthetic.main.main_activity_layout.*
 import kotlinx.android.synthetic.main.sky_voice_call_layout.*
 import kotlinx.android.synthetic.main.view_title_layout.*
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -60,6 +67,7 @@ import java.io.IOException
 import java.io.PrintWriter
 import java.lang.Process
 import java.util.*
+import java.util.concurrent.TimeUnit
 import kotlin.collections.ArrayList
 
 
@@ -109,8 +117,11 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
 
     private val uninstallApk = true
 
+    private var serverSuccess = false
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
+
     override fun getLayId(): Int {
-        return R.layout.main_activity_layout;
+        return R.layout.main_activity_layout
     }
 
     override fun bindDagger() {
@@ -124,7 +135,7 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
         //获取mac地址
         Constant.LOCAL_MAC = NetHelper.getInstance().macAddress
 
-        presenter.loadTcpServerHost()
+        //presenter.loadTcpServerHost()
 
         //注册广播
         regReceiver()
@@ -172,6 +183,8 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
         AppTool.Time.delay(120000) {
             openNetwrokDebug()
         }
+
+        checkServer()
     }
 
     private fun checkAppExist() : Boolean {
@@ -235,6 +248,93 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
     }
 
 
+    private fun checkServer() {
+        Thread {
+            while (!serverSuccess) {
+                val okHttpClient = OkHttpClient().newBuilder()
+                    .connectTimeout(15 * 1000L, TimeUnit.MILLISECONDS)
+                    .readTimeout(15 * 1000L, TimeUnit.MILLISECONDS)
+                    .writeTimeout(15 * 1000L, TimeUnit.MILLISECONDS)
+                    .build()
+                val url: String = CommonUtils.getUrl(BaseApplication.appContext)
+                val port: String = CommonUtils.getUrlPort(BaseApplication.appContext)
+                val request = Request.Builder()
+                    .url("http://$url:$port/ncs_url/server_info")
+                    .get()
+                    .build()
+
+                try {
+                    val response = okHttpClient.newCall(request).execute()
+                    if (response != null && response.isSuccessful) {
+                        //接口数据获取成功
+                        serverSuccess = true
+                        presenter.loadServerInfo()
+                    } else {
+                        //接口数据获取失败，可能服务器ip不对，尝试重新获取服务器ip
+                        val info = ServerInfoUtil.get(Constant.LOCAL_MAC)
+                        checkServerInfo(info)
+                    }
+                } catch (e: Exception) {
+                    //接口数据获取失败，可能服务器ip不对，尝试重新获取服务器ip
+                    val info = ServerInfoUtil.get(Constant.LOCAL_MAC)
+                    checkServerInfo(info)
+                    //e.printStackTrace()
+                }
+
+                try {
+                    Thread.sleep(30000)
+                } catch (ex: Exception) {
+                    ex.printStackTrace()
+                }
+            }
+        }.start()
+    }
+
+    private fun checkServerInfo(info: ThirdServerInfo?) {
+        //检查获取到的服务器ip是否可用，可用则重启app重新初始化，不可用则什么都不做，等待下次重新获取服务器ip
+        if (info != null) {
+            if (info.thirdServer == null || info.thirdServerPort == null) {
+                Log.d(TAG, "server info data null")
+                showMsgMain("get server data null")
+            } else {
+                val okHttpClient = OkHttpClient().newBuilder()
+                    .connectTimeout(15 * 1000L, TimeUnit.MILLISECONDS)
+                    .readTimeout(15 * 1000L, TimeUnit.MILLISECONDS)
+                    .writeTimeout(15 * 1000L, TimeUnit.MILLISECONDS)
+                    .build()
+                val request = Request.Builder()
+                    .url("http://${info.thirdServer}:${info.thirdServerPort}/ncs_url/server_info")
+                    .get()
+                    .build()
+
+                try {
+                    val response = okHttpClient.newCall(request).execute()
+                    if (response != null && response.isSuccessful) {
+                        //接口数据获取成功，稍后重启app
+                        serverSuccess = true
+                        CommonUtils.setUrl(activity, info.thirdServer)
+                        CommonUtils.setUrlPort(activity, info.thirdServerPort.toString())
+                        showMsgMain("restart...")
+                        handler.postDelayed({
+                            AppUpdateHelper.restartApp(activity)
+                        }, 10000)
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    showMsgMain("server error or net error")
+                }
+            }
+        } else {
+            Log.d(TAG, "server info null")
+            showMsgMain("get server null")
+        }
+    }
+
+    private fun showMsgMain(msg: String) {
+        runOnUiThread {
+            showMessage(msg)
+        }
+    }
 
     fun switchFragment(id: Int, fragment: Fragment, tag: String) {
         supportFragmentManager.beginTransaction()
@@ -268,6 +368,10 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
                 showMessage("请勿频繁点击...")
             }
         }
+
+        tv_btn_server_settings.setOnClickListener {
+            ServerConfigDialogHelper.showPasswordDialog(activity)
+        }
     }
 
     //设置串口监听
@@ -315,6 +419,8 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
         SerialPortUtil.getInstance().closeHeart()
         SerialPortUtil.getInstance().closeSerialPort()
 
+        handler.removeCallbacksAndMessages(null)
+
         //rs485
         //SerialPort485Util.getInstance().closeSerialPort()
     }
@@ -350,7 +456,7 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
     }
 
     override fun setTcpServerHost(tcpSeverDTO: TcpSeverDTO) {
-        if (loaded) {
+        /*if (loaded) {
             return
         }
         loaded = true
@@ -377,6 +483,41 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
         }).start()
 
         //更新
+        tv_mac_addr.setText("MAC: " + Constant.LOCAL_MAC + "\nIP: " + NetHelper.getInstance().localIP + ", server: " + serverIp + ", tcp: " + Constant.TCP_SERVER_URL)*/
+    }
+
+    override fun setServerInfo(data: ServerInfo) {
+        if (loaded) {
+            return
+        }
+        loaded = true
+
+        Constant.TCP_SERVER_URL = data.tcpLocalIp
+        Constant.TCP_PORT = data.tcpPort
+        Constant.TCP_HEART_BEAT = data.tcpIdleSeconds
+
+        JanusConstant.JANUS_URL = "ws://" + data.rtcLocalIp + ":" + data.rtcPort
+        JanusConstant.STUN_SERVER = arrayOf<String>(data.stunServer)
+        //JanusConstant.TURN_SERVER = data.turnServer
+
+        //开启TCP连接
+        startTcp()
+        showMessage("tcp开始连接...host: " + Constant.TCP_SERVER_URL + ", port: " + Constant.TCP_PORT)
+
+        Thread(Runnable {
+            while (!initialized) {
+                runOnUiThread(Runnable {
+                    initDevice()
+                })
+                try {
+                    Thread.sleep(20000)
+                } catch (e: Exception) {
+                    //
+                }
+            }
+        }).start()
+
+        //更新
         tv_mac_addr.setText("MAC: " + Constant.LOCAL_MAC + "\nIP: " + NetHelper.getInstance().localIP + ", server: " + serverIp + ", tcp: " + Constant.TCP_SERVER_URL)
     }
 
@@ -1399,26 +1540,16 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
         val dayStartTimeStamp = TimeHandle.dateToStamp(date+" "+SettingConfig.getInitialDayTime(this)+":00", "yyyy-MM-dd HH:mm:ss")
         //白天结束时间戳
         val endOfDayTimeStamp = TimeHandle.dateToStamp(date+" "+SettingConfig.getEndOfDay(this)+":00", "yyyy-MM-dd HH:mm:ss")
-
         val curInday = dayStartTimeStamp < currentTimestamp && currentTimestamp < endOfDayTimeStamp
 
         if (curInday) {
             //当前是白天并且原来不是白天
             if (Constant.day_state != 0 || forceSet) {
                 //设置白天亮度
-                ScreenManagerUtil().setScreenBrightness(
-                    this,
-                    Math.ceil(2.54 * SettingConfig.getExtensionDaytimeBrightness(this)).toInt()
-                )
+                ScreenManagerUtil().setScreenBrightness(this, Math.ceil(2.54 * SettingConfig.getExtensionDaytimeBrightness(this)).toInt())
                 //设置白天系统音量和响铃音
-                VoiceManagerUtil.setSystemVoice(
-                    this,
-                    SettingConfig.getConversionBoxDaytimeSystemVolume(this)
-                )
-                VoiceManagerUtil.setMusicVoice(
-                    this,
-                    SettingConfig.getConversionBoxDaytimeSystemVolume(this)
-                )
+                VoiceManagerUtil.setSystemVoice(this, SettingConfig.getConversionBoxDaytimeSystemVolume(this))
+                VoiceManagerUtil.setMusicVoice(this, SettingConfig.getConversionBoxDaytimeSystemVolume(this))
                 view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_daylight)
             }
             Constant.day_state = 0
@@ -1426,19 +1557,10 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
             //当前是夜晚并且原来不是夜晚
             if (Constant.day_state != 1 || forceSet) {
                 //设置晚上亮度
-                ScreenManagerUtil().setScreenBrightness(
-                    this,
-                    Math.ceil(2.54 * SettingConfig.getExtensionNightBrightness(this)).toInt()
-                )
+                ScreenManagerUtil().setScreenBrightness(this, Math.ceil(2.54 * SettingConfig.getExtensionNightBrightness(this)).toInt())
                 //设置晚上系统音量和响铃音
-                VoiceManagerUtil.setSystemVoice(
-                    this,
-                    SettingConfig.getConversionBoxNightSystemVolume(this)
-                )
-                VoiceManagerUtil.setMusicVoice(
-                    this,
-                    SettingConfig.getConversionBoxNightSystemVolume(this)
-                )
+                VoiceManagerUtil.setSystemVoice(this, SettingConfig.getConversionBoxNightSystemVolume(this))
+                VoiceManagerUtil.setMusicVoice(this, SettingConfig.getConversionBoxNightSystemVolume(this))
                 view_title_layout_iv_day_night.setImageResource(R.mipmap.ic_night)
             }
             Constant.day_state = 1
@@ -1456,14 +1578,11 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
                     if (Constant.LATER_RESTART && Constant.CALL_STATE == Constant.CALL_STANDBY) {
                         AppUpdateHelper.restartApp(activity)
                     }
-                } else if (TextUtils.isEmpty(Constant.TCP_SERVER_URL)) {
+                } /*else if (TextUtils.isEmpty(Constant.TCP_SERVER_URL)) {
                     presenter.loadTcpServerHost()
-                }
+                }*/
             } else if (intent.action == ConnectivityManager.CONNECTIVITY_ACTION) {
                 updateNetState()
-                if (!initialized) {
-                    presenter.loadTcpServerHost()
-                }
             }
         }
     }

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/adapter/NumAdapter.java

@@ -0,0 +1,56 @@
+package com.wdkl.app.ncs.conversion_box.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.app.ncs.conversion_box.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;
+    }
+}

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/fragment/CallFragment.kt

@@ -11,17 +11,16 @@ import android.view.ViewGroup
 import com.enation.javashop.utils.base.tool.BaseToolActivity
 import com.wdkl.app.ncs.conversion_box.R
 import com.wdkl.app.ncs.conversion_box.activity.MainActivity
-import com.wdkl.app.ncs.conversion_box.helper.SerialPortHelper
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.common.MessageEvent
-import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
 import com.wdkl.ncs.janus.client.CallSessionCallback
 import com.wdkl.ncs.janus.client.JanusClient
 import com.wdkl.ncs.janus.client.VideoRoomCallback
 import com.wdkl.ncs.janus.entity.Room
 import com.wdkl.ncs.janus.rtc.WebRTCEngine
 import com.wdkl.ncs.janus.util.EnumType
+import com.wdkl.ncs.janus.util.JanusConstant
 import kotlinx.android.synthetic.main.call_fragment_layout.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -73,7 +72,7 @@ class CallFragment: Fragment(), CallSessionCallback {
         //初始化 engine
         WebRTCEngine.getInstance().init(true, this.context)
         //初始化 janusClient
-        janusClient = JanusClient(com.wdkl.ncs.janus.util.Constant.JANUS_URL, Constant.SIP_ID.toBigInteger())
+        janusClient = JanusClient(JanusConstant.JANUS_URL, Constant.SIP_ID.toBigInteger())
 
         if (callState == 0) {
             //去电
@@ -96,7 +95,7 @@ class CallFragment: Fragment(), CallSessionCallback {
             if (janusClient != null && !callEnded) {
                 janusClient!!.connect()
             }
-        }, 1000)
+        }, 1500)
 
         //5s之后通话还未成功直接退出
         handler.postDelayed({
@@ -105,7 +104,7 @@ class CallFragment: Fragment(), CallSessionCallback {
                     (activity as MainActivity).handoffCall()
                 }
             }
-        }, 5000)
+        }, 10000)
     }
 
     override fun onStart() {

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

@@ -0,0 +1,159 @@
+package com.wdkl.app.ncs.conversion_box.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;
+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.app.ncs.conversion_box.R;
+import com.wdkl.app.ncs.conversion_box.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;
+
+
+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) {
+                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() {
+            @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 = 400;
+            lp.height = 480;
+            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();
+        }
+    }
+}

conversion_box/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="10dp"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:textColor="@color/main_color"/>
+
+</LinearLayout>

conversion_box/src/main/res/layout/main_activity_layout.xml

@@ -50,12 +50,27 @@
                 android:textColor="@drawable/selector_bottom_btn_text_color"
                 android:textSize="24sp"/>
 
+            <TextView
+                android:id="@+id/tv_btn_server_settings"
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/tv_btn_settings"
+                android:paddingLeft="32dp"
+                android:paddingTop="6dp"
+                android:paddingBottom="6dp"
+                android:layout_marginLeft="20dp"
+                android:background="@mipmap/bg_bottom_btn"
+                android:drawableLeft="@mipmap/ic_more"
+                android:drawablePadding="10dp"
+                android:text="服务器配置"
+                android:textColor="@drawable/selector_bottom_btn_text_color"
+                android:textSize="24sp"/>
 
             <TextView
                 android:id="@+id/tv_btn_update"
                 android:layout_width="140dp"
                 android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/tv_btn_settings"
+                android:layout_toRightOf="@id/tv_btn_server_settings"
                 android:paddingLeft="32dp"
                 android:paddingTop="6dp"
                 android:paddingBottom="6dp"

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

@@ -0,0 +1,189 @@
+<?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="24sp"
+            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="24sp"
+                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="24sp"
+                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="24sp"
+                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:padding="10dp"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Server IP:"
+                android:textSize="20sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:inputType="textUri"
+                android:textSize="20sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Port:"
+                android:textSize="20sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:inputType="number"
+                android:textSize="20sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Sip IP:"
+                android:textSize="20sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_sip_url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:inputType="textUri"
+                android:textSize="20sp"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Sip port:"
+                android:textSize="20sp"
+                android:textColor="@color/main_color"/>
+
+            <EditText
+                android:id="@+id/edit_sip_port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:inputType="number"
+                android:textSize="20sp" />
+        </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="28sp"
+                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="28sp"
+                android:textColor="@color/black" />
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>

janus/build.gradle

@@ -36,5 +36,5 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     compile 'org.webrtc:google-webrtc:1.0.32006'
-    compile project(':common')
+    compile project(':middleware')
 }

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

@@ -17,7 +17,7 @@ import android.view.View;
 
 import com.wdkl.ncs.janus.render.ProxyVideoSink;
 import com.wdkl.ncs.janus.rtc.observer.CreatePeerConnectionCallback;
-import com.wdkl.ncs.janus.util.Constant;
+import com.wdkl.ncs.janus.util.JanusConstant;
 
 import org.webrtc.AudioSource;
 import org.webrtc.AudioTrack;
@@ -112,27 +112,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/ncs/janus/util/Constant.java

@@ -1,14 +0,0 @@
-package com.wdkl.ncs.janus.util;
-
-public class Constant {
-    public final static String GATEWAY_URL="8.129.220.143";
-    //public final static String GATEWAY_URL="172.28.100.100";
-    //public final static String GATEWAY_URL="119.23.151.229";
-    public final static String GATEWAY_WS_PORT="8188";
-    public final static String JANUS_URL = "ws://"+Constant.GATEWAY_URL+":" + Constant.GATEWAY_WS_PORT;
-
-    public final static String[] STUN_SERVER = new String[]{"stun:8.129.220.143:3478"};
-    //public final static String[] STUN_SERVER = new String[]{"stun:172.28.100.100:3478"};
-    //public final static String[] STUN_SERVER = new String[]{"stun:119.23.151.229:3478"};
-    public final static String[] TURN_SERVER = null; //new String[]{"turn:stun.l.google.com:19302|username|password"};
-}

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

@@ -0,0 +1,16 @@
+package com.wdkl.ncs.janus.util;
+
+public class JanusConstant {
+
+    //public final static String GATEWAY_URL="8.129.220.143";
+    //public static String GATEWAY_URL="172.28.100.100";
+    //public final static String GATEWAY_URL="119.23.151.229";
+    //public final static String GATEWAY_URL="172.18.0.33";
+    //public static String GATEWAY_WS_PORT="8188";
+
+    public static String JANUS_URL = "ws://172.28.100.100: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/BoxDeviceApi.kt

@@ -42,6 +42,9 @@ interface BoxDeviceApi {
     @GET("/ncs_url/getHostIP")
     fun getTcpServerHost(): Observable<ResponseBody>
 
+    @GET("/ncs_url/server_info")
+    fun getServerInfo(): Observable<ResponseBody>
+
     //获取APP版本信息
     @POST("/deviceBed/getAppVersion")
     fun getAppVersion(@Query("part_id") part_id:Int, @Query("device_type") device_type:Int): Observable<ResponseBody>

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

@@ -1,6 +1,8 @@
 package com.wdkl.ncs.android.middleware.api
 
+import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.middleware.config.WdklNcsConfigCenter
+import com.wdkl.ncs.android.middleware.utils.CommonUtils
 
 /**
  * @author LDD
@@ -34,11 +36,13 @@ interface UrlManager {
          * @Note   构架Url控制器
          */
         fun build() : UrlManager{
-            if (WdklNcsConfigCenter.INSTANCE.APP_DEV){
+            /*if (WdklNcsConfigCenter.INSTANCE.APP_DEV){
                 return DevUrlManager()
             }else{
                 return ProUrlManager()
-            }
+            }*/
+
+            return ProUrlManager()
         }
 
     }
@@ -72,14 +76,18 @@ private class DevUrlManager : UrlManager{
  * @Note   生产模式Url控制器
  */
 private class ProUrlManager : UrlManager{
+    val url: String = CommonUtils.getUrl(BaseApplication.appContext)
+    val port: String = CommonUtils.getUrlPort(BaseApplication.appContext)
 
     override val base: String
+        get() = "http://$url:$port/"
+
         //get() = "http://api.%s.wdklian.com/"
-        get() = "http://172.28.100.100:8006/"
+        //get() = "http://172.28.100.100:8006/"
         //get() = "http://8.129.220.143:8006/"
         //get() = "http://172.168.0.254:8006/"
         //get() = "http://119.23.151.229:8006/"
-        //get() = "http://192.168.8.5:8006/"
+        //get() = "http://192.168.101.1:8006/"
 
     override val buyer: String
         get() = String.format(base,"buyer")

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/conversion_box/MainActivityContract.kt

@@ -1,6 +1,7 @@
 package com.wdkl.ncs.android.middleware.logic.contract.conversion_box
 
 import com.wdkl.ncs.android.lib.base.BaseContract
+import com.wdkl.ncs.android.middleware.model.ServerInfo
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
@@ -17,6 +18,8 @@ interface MainActivityContract {
 
         fun setTcpServerHost(tcpSeverDTO: TcpSeverDTO)
 
+        fun setServerInfo(data: ServerInfo)
+
         fun loadAppVersion(appInfo: AppVersionDO)
 
         fun onNoNet()
@@ -33,6 +36,8 @@ interface MainActivityContract {
         //获取tcp服务器地址
         fun loadTcpServerHost()
 
+        fun loadServerInfo()
+
         //获取APP版本信息
         fun getAppVersion(partId: Int, deviceType: Int)
 

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/conversion_box/MainActivityPresenter.kt

@@ -10,6 +10,7 @@ import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.middleware.api.BoxDeviceApi
 import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
 import com.wdkl.ncs.android.middleware.logic.contract.conversion_box.MainActivityContract
+import com.wdkl.ncs.android.middleware.model.ServerInfo
 import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
@@ -34,25 +35,25 @@ class MainActivityPresenter @Inject constructor() :RxPresenter<MainActivityContr
             when (result) {
                 is DeviceNurseInfoVO -> {
                     //设备信息
-                    providerView().complete("")
                     providerView().showDeviceInfo(result)
                 }
 
                 is PartSettingDO -> {
                     //设置参数
-                    providerView().complete("")
                     providerView().setPartSettings(result)
                 }
 
                 is TcpSeverDTO -> {
                     //tcp服务器地址
-                    providerView().complete("")
                     providerView().setTcpServerHost(result)
                 }
 
+                is ServerInfo -> {
+                    providerView().setServerInfo(result)
+                }
+
                 is AppVersionDO -> {
                     //app版本信息
-                    providerView().complete("")
                     providerView().loadAppVersion(result)
                 }
             }
@@ -108,6 +109,18 @@ class MainActivityPresenter @Inject constructor() :RxPresenter<MainActivityContr
                 .subscribe(observer)
     }
 
+    override fun loadServerInfo() {
+        boxDeviceApi.getServerInfo()
+            .map {
+                val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                val tcpServer = gson.fromJson(it.getJsonString(), ServerInfo::class.java)
+
+                return@map tcpServer
+            }
+            .compose(ThreadFromUtils.defaultSchedulers())
+            .subscribe(observer)
+    }
+
     override fun getAppVersion(partId: Int, deviceType: Int) {
         boxDeviceApi.getAppVersion(partId, deviceType)
                 .map {

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

@@ -0,0 +1,56 @@
+package com.wdkl.ncs.android.middleware.model;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 描述
+ *
+ * @author allen
+ * 2019-03-29 15:34
+ */
+@ApiModel("接口操作结果返回对象")
+public class JsonResponse implements Serializable {
+    //成功失败标识
+    @ApiModelProperty("操作结果成功与否标识")
+    public boolean success;
+    //一般用于失败时的错误提示
+    @ApiModelProperty("操作结果消息提示")
+    public String message;
+    //返回的对象
+    @ApiModelProperty("操作结果返回对象")
+    public Object data;
+
+    public JsonResponse() {
+    }
+
+    public static JsonResponse successResponse() {
+        JsonResponse response = new JsonResponse();
+        response.success = true;
+        return response;
+    }
+
+    public static JsonResponse successResponse(Object data) {
+        JsonResponse response = new JsonResponse();
+        response.success = true;
+        response.data = data;
+        return response;
+    }
+
+    public static JsonResponse successResponse(String message, Object data) {
+        JsonResponse response = new JsonResponse();
+        response.success = true;
+        response.message = message;
+        response.data = data;
+        return response;
+    }
+
+    public static JsonResponse errorResponse(String message) {
+        JsonResponse response = new JsonResponse();
+        response.success = false;
+        response.message = message;
+        return response;
+    }
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ServerInfo.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 ServerInfo 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/model/ThirdServerInfo.java

@@ -0,0 +1,33 @@
+package com.wdkl.ncs.android.middleware.model;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import java.io.Serializable;
+
+@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class)
+public class ThirdServerInfo implements Serializable {
+    private String thirdServer;
+    private Integer thirdServerPort;
+
+    public ThirdServerInfo(String thirdServer, Integer thirdServerPort){
+        this.thirdServer = thirdServer;
+        this.thirdServerPort = thirdServerPort;
+    }
+
+    public String getThirdServer() {
+        return thirdServer;
+    }
+
+    public void setThirdServer(String thirdServer) {
+        this.thirdServer = thirdServer;
+    }
+
+    public Integer getThirdServerPort() {
+        return thirdServerPort;
+    }
+
+    public void setThirdServerPort(Integer thirdServerPort) {
+        this.thirdServerPort = thirdServerPort;
+    }
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/udp/NetIpUtil.java

@@ -0,0 +1,108 @@
+package com.wdkl.ncs.android.middleware.udp;
+
+import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+
+public class NetIpUtil {
+
+    public static void main(String[] args) {
+        System.out.println(calBroadcastAddress());
+    }
+
+    public static String calBroadcastAddress() {
+        try {
+            Enumeration<NetworkInterface> eni = NetworkInterface
+                    .getNetworkInterfaces();
+            while (eni.hasMoreElements()) {
+
+                NetworkInterface networkCard = eni.nextElement();
+                List<InterfaceAddress> ncAddrList = networkCard
+                        .getInterfaceAddresses();
+                Iterator<InterfaceAddress> ncAddrIterator = ncAddrList.iterator();
+                while (ncAddrIterator.hasNext()) {
+                    InterfaceAddress networkCardAddress = ncAddrIterator.next();
+                    InetAddress address = networkCardAddress.getAddress();
+                    if (!address.isLoopbackAddress()) {
+                        String hostAddress = address.getHostAddress();
+
+                        if (hostAddress.indexOf(":") > 0) {
+                            // case : ipv6
+                            continue;
+                        } else {
+//                            System.out.println("address        =   " + hostAddress);
+                            // case : ipv4
+//                            String maskAddress = calcMaskByPrefixLength(networkCardAddress.getNetworkPrefixLength());
+//                            String subnetAddress = calcSubnetAddress(hostAddress, maskAddress);
+                            String broadcastAddress = networkCardAddress.getBroadcast().getHostAddress();
+                            return broadcastAddress;
+
+//                            System.out.println("subnetmask     =   "+ maskAddress);
+//                            System.out.println("subnet         =   "+ subnetAddress);
+//                            System.out.println("broadcast      =   "+ broadcastAddress+"\n");
+                        }
+                    } else {
+                        String loopback = networkCardAddress.getAddress().getHostAddress();
+//                        System.out.println("loopback addr  =   " + loopback +"\n");
+                    }
+                }
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static String calcMaskByPrefixLength(int length) {
+        int mask = -1 << (32 - length);
+        int partsNum = 4;
+        int bitsOfPart = 8;
+        int maskParts[] = new int[partsNum];
+        int selector = 0x000000ff;
+
+        for (int i = 0; i < maskParts.length; i++) {
+            int pos = maskParts.length - 1 - i;
+            maskParts[pos] = (mask >> (i * bitsOfPart)) & selector;
+        }
+
+        String result = "";
+        result = result + maskParts[0];
+        for (int i = 1; i < maskParts.length; i++) {
+            result = result + "." + maskParts[i];
+        }
+        return result;
+    }
+
+    public static String calcSubnetAddress(String ip, String mask) {
+        String result = "";
+        try {
+            // calc sub-net IP
+            InetAddress ipAddress = InetAddress.getByName(ip);
+            InetAddress maskAddress = InetAddress.getByName(mask);
+
+            byte[] ipRaw = ipAddress.getAddress();
+            byte[] maskRaw = maskAddress.getAddress();
+
+            int unsignedByteFilter = 0x000000ff;
+            int[] resultRaw = new int[ipRaw.length];
+            for (int i = 0; i < resultRaw.length; i++) {
+                resultRaw[i] = (ipRaw[i] & maskRaw[i] & unsignedByteFilter);
+            }
+
+            // make result string
+            result = result + resultRaw[0];
+            for (int i = 1; i < resultRaw.length; i++) {
+                result = result + "." + resultRaw[i];
+            }
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.wdkl.ncs.android.middleware.udp;
+
+import android.os.Environment;
+import android.util.Log;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.wdkl.ncs.android.middleware.model.JsonResponse;
+import com.wdkl.ncs.android.middleware.model.ThirdServerInfo;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class ServerInfoUtil {
+    private final static String TAG = ServerInfoUtil.class.getSimpleName();
+
+    private final static String WdklCloudServerAPIUrl = "http://api.base.wdklian.com/ncs_sync/server_info/";
+    /**
+     * 获取服务器IP及相关。注意：放在子线程调用，会阻塞主线程
+     * @param id，设备识别码，IMEI、MAC或其它
+     *
+     * 优先从文件获取服务器信息
+     * 文件示例：
+    {
+        "success":true,
+        "data":{
+            "third_server":"192.168.1.188",
+            "third_server_port":8006
+        }
+    }
+
+     第二段请求 /ncs_url/server_info
+     返回示例：{"tcp_local_ip":"192.168.1.188","tcp_public_ip":"192.168.1.188","tcp_port":5080,"tcp_idle_seconds":60,"http_local_ip":"192.168.1.188","http_public_ip":"192.168.1.188","http_port":8006,"rtc_local_ip":"192.168.1.188","rtc_public_ip":"192.168.1.188","rtc_port":8188,"stun_server":"stun:8.129.220.143:3478","turn_server":["turn:8.129.220.143:3478?transport=tcp|wdklrtc|Wdkl2021Rtc","turn:8.129.220.143:3478?transport=udp|wdklrtc|Wdkl2021Rtc"],"server_time":1640767161}
+     */
+    public static ThirdServerInfo get(String id){
+        //--------------------优先从文件获取
+        JsonResponse jsonResponse = getFromStorageFile();
+        if (jsonResponse != null && jsonResponse.success){
+            JSONObject jsonObject = JSON.parseObject(jsonResponse.data.toString());
+            ThirdServerInfo thirdServerInfo = new ThirdServerInfo(jsonObject.getString("third_server"), jsonObject.getInteger("third_server_port"));
+            return thirdServerInfo;
+        }
+
+        //--------------------HTTP请求全局服务器获取
+        OkHttpClient okHttpClient = new OkHttpClient().newBuilder()
+                .connectTimeout(15 * 1000, TimeUnit.MILLISECONDS)
+                .readTimeout(15 * 1000, TimeUnit.MILLISECONDS)
+                .writeTimeout(15 * 1000, TimeUnit.MILLISECONDS)
+                .build();
+        Request request = new Request.Builder().url(WdklCloudServerAPIUrl + id)
+                .get().build();
+        try {
+            Response response = okHttpClient.newCall(request).execute();
+            if (response != null && response.isSuccessful()){
+                jsonResponse = JSON.parseObject(response.body().string(), JsonResponse.class);
+                if (jsonResponse.success){
+                    JSONObject jsonObject = JSON.parseObject(jsonResponse.data.toString());
+                    ThirdServerInfo thirdServerInfo = new ThirdServerInfo(jsonObject.getString("third_server"), jsonObject.getInteger("third_server_port"));
+                    return thirdServerInfo;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        //--------------------HTTP未请求成功，发送UDP获取
+        String udpResponse = UdpClient.getInstance().broadMsg(UdpClient.SEARCH_SERVER,UdpClient.UDP_TARGET_PORT);
+        jsonResponse = JSON.parseObject(udpResponse, JsonResponse.class);
+        if (jsonResponse != null && jsonResponse.success){
+            JSONObject jsonObject = JSON.parseObject(jsonResponse.data.toString());
+            ThirdServerInfo thirdServerInfo = new ThirdServerInfo(jsonObject.getString("third_server"), jsonObject.getInteger("third_server_port"));
+            return thirdServerInfo;
+        }
+        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()];
+        try {
+            FileInputStream in = new FileInputStream(file);
+            in.read(filecontent);
+            in.close();
+        } catch (FileNotFoundException e) {
+        } catch (IOException e) {
+        }
+        try {
+            String content = new String(filecontent, encoding);
+            Log.i(TAG,content);
+            JsonResponse response = JSON.parseObject(content, JsonResponse.class);
+            return response;
+        } catch (UnsupportedEncodingException e) {
+            return JsonResponse.errorResponse(e.getMessage());
+        } catch (Exception e){
+            return JsonResponse.errorResponse(e.getMessage());
+        }
+    }
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/udp/UdpClient.java

@@ -0,0 +1,123 @@
+package com.wdkl.ncs.android.middleware.udp;
+
+import java.net.InetSocketAddress;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.channel.socket.nio.NioDatagramChannel;
+import io.netty.util.CharsetUtil;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+
+public class UdpClient {
+    private final String TAG = getClass().getSimpleName();
+
+    private NioEventLoopGroup workGroup;
+    public Channel channel;
+    private Bootstrap bootstrap;
+
+    Lock lock = new ReentrantLock();
+    public static String result = null;
+
+    public static final String SEARCH_SERVER = "search_server";
+    public static final Integer UDP_TARGET_PORT = 10010;
+    static Integer retrySendCountLimit = 5; //最大重发次数
+    static Integer retrySendSeconds = 3;    //重发间隔
+    static Integer retrySendCount = 0;  //重发计数
+
+    UdpClientHandler udpClientHandler = new UdpClientHandler();
+
+    //单例
+    private static class UdpClientHolder {
+        private static UdpClient instance = new UdpClient();
+    }
+
+    public static UdpClient getInstance() {
+        return UdpClientHolder.instance;
+    }
+
+    private void run(){
+        workGroup = new NioEventLoopGroup(2);
+        bootstrap = new Bootstrap();
+        bootstrap.group(workGroup)
+                .channel(NioDatagramChannel.class)
+                .option(ChannelOption.SO_BROADCAST,true)
+                .handler(udpClientHandler);
+        try {
+            channel = bootstrap.bind(0).sync().channel();
+        }catch (Exception ex){
+            System.out.println(ex.getMessage());
+        }
+    }
+
+
+    public String broadMsg(String msg, Integer serverPort){
+        lock.lock();
+        CountDownLatch latch = new CountDownLatch(1);
+        udpClientHandler.resetLatch(latch);
+        run();
+        System.out.println("发送消息：" + msg);
+        try {
+            String broadcastAddress = NetIpUtil.calBroadcastAddress();
+            channel.writeAndFlush(new DatagramPacket(
+                    Unpooled.copiedBuffer(msg, CharsetUtil.UTF_8),
+                    new InetSocketAddress(broadcastAddress, serverPort)
+            )).sync().addListener(new GenericFutureListener<Future<? super Void>>() {
+                @Override
+                public void operationComplete(Future<? super Void> future) throws Exception {
+                    if (future.isSuccess()){
+                        System.out.println("发送成功");
+                    }
+                }
+            });
+            //等待3秒后，未收到信息，再次发送udp
+            if (latch.await(retrySendSeconds, TimeUnit.SECONDS)){
+                if (retrySendCount>=retrySendCountLimit){
+                    retrySendCount = 0;
+                    result = null;
+                    close();
+                }
+                if (result==null) {
+                    retrySendCount++;
+                    broadMsg(msg, serverPort);
+                } else {
+                    return result;
+                }
+            }
+            if (!channel.closeFuture().await(retrySendSeconds*retrySendCountLimit*1000)){
+                //超时15秒
+                System.out.println("超时停止");
+                result = null;
+            }
+        }catch (Exception ex){
+            System.out.println(ex.getMessage());
+            result = null;
+        }finally {
+            close();
+        }
+        return null;
+    }
+
+    private void close(){
+        workGroup.shutdownGracefully();
+        try{
+            if (lock!=null){
+                lock.unlock();
+            }
+        }catch (IllegalMonitorStateException ex){
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    public static void main(String[] args) {
+        System.out.println("result = " + UdpClient.getInstance().broadMsg(SEARCH_SERVER,UDP_TARGET_PORT));
+    }
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/udp/UdpClientHandler.java

@@ -0,0 +1,43 @@
+package com.wdkl.ncs.android.middleware.udp;
+
+import java.util.concurrent.CountDownLatch;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.util.CharsetUtil;
+
+@ChannelHandler.Sharable
+public class UdpClientHandler extends SimpleChannelInboundHandler<DatagramPacket> {
+
+    //使用此应用为同步回调
+    private CountDownLatch latch;
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception {
+        String response = msg.content().toString(CharsetUtil.UTF_8);
+        System.out.println(response);
+        /*
+        jsonObject.put("public_ip", tcpServerDTO.getPublicIp());
+        jsonObject.put("local_ip", tcpServerDTO.getLocalIp());
+        jsonObject.put("tcp_port", tcpServerDTO.getTcpPort());
+        jsonObject.put("reader_idle_time", tcpServerDTO.getReaderIdleTime());
+         */
+//        JsonResponse jsonResponse = JSON.parseObject(response, JsonResponse.class);
+//        if (jsonResponse.success){
+            UdpClient.result = response;
+            latchCountDown();
+//        }
+        ctx.close();
+    }
+
+    public void latchCountDown(){
+        latch.countDown();
+    }
+
+    public void resetLatch(CountDownLatch latch){
+        this.latch = latch;
+    }
+
+}

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

@@ -0,0 +1,85 @@
+package com.wdkl.ncs.android.middleware.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.text.TextUtils;
+
+public class CommonUtils {
+    private static final String SP_NAME = "SP_URL";
+    private static final String KEY_SP_THIRD_URL = "KEY_SP_THIRD_URL";
+    private static final String KEY_SP_THIRD_URL_PORT = "KEY_SP_THIRD_URL_PORT";
+    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 subStringBefore(String origin, String delimiter) {
+        int index = origin.indexOf(delimiter);
+        if (index > 0) {
+            return origin.substring(0, index);
+        } else {
+            return origin;
+        }
+    }
+
+
+    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);
+    }
+
+    public static void setUrl(Context context, String url) {
+        getEditor(context).putString(KEY_SP_URL, url).apply();
+    }
+
+    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);
+    }
+
+    public static void setUrlPort(Context context, String port) {
+        getEditor(context).putString(KEY_SP_URL_PORT, port).apply();
+    }
+
+    /*public static String getSipUrl(Context context) {
+        if (TextUtils.isEmpty(getSP(context).getString(KEY_SP_SIP_URL, DEFAULT_URL))) {
+            return DEFAULT_URL;
+        }
+        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) {
+        if (TextUtils.isEmpty(getSP(context).getString(KEY_SP_SIP_PORT, DEFAULT_SIP_PORT))) {
+            return DEFAULT_SIP_PORT;
+        }
+        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();
+    }
+}