a133西班牙语项目增加手动设置IP功能(固件问题，暂未开启)

android_door/src/main/h10_a133_chile/AndroidManifest.xml

@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
 
     <application
         android:allowBackup="true"

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -207,6 +207,8 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             }
         }
 
+        //zhylManager.sys_setNationallanguage("CN", "zh")
+
         //申请悬浮窗权限
         /*if (!Settings.canDrawOverlays(this)) {
             val intent = Intent(

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/fragment/QrCodeFragment.kt

@@ -131,6 +131,13 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
         tv_btn_language.setOnClickListener {
             LanguageSetDialogHelper.showDialog(activity)
         }
+
+        /*tv_btn_netcfg.setOnClickListener {
+            (activity as CallingdoorActivity).resetSleepTime()
+            PasswordDialogHelper.showPasswordDialog(activity) {
+                NetworkDialogHelper.showDialog(activity)
+            }
+        }*/
     }
 
     private fun showQRCodeImg(id: Int) {

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/Network2DialogHelper.java

@@ -0,0 +1,108 @@
+package com.wdkl.app.ncs.callingdoor.helper;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.zhyl.ZhylManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import com.wdkl.app.ncs.callingdoor.R;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+
+import java.util.HashMap;
+
+import static com.wdkl.ncs.android.lib.utils.ExtendMethodsKt.showMessage;
+
+
+public class Network2DialogHelper {
+
+    private static AlertDialog alertDialog;
+    private static String network="";
+
+    public static void showDialog(Activity activity) {
+
+        View contentView = LayoutInflater.from(activity).inflate(R.layout.main_network_two_dialog, null);
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setView(contentView);
+        LinearLayout layout = contentView.findViewById(R.id.ll_net_config_view);
+        EditText network2_ip = contentView.findViewById(R.id.network2_ip);
+        EditText network2_wg = contentView.findViewById(R.id.network2_wg);
+        EditText network2_ym = contentView.findViewById(R.id.network2_ym);
+        EditText network2_dns1 = contentView.findViewById(R.id.network1_dns);
+        EditText network2_dns2 = contentView.findViewById(R.id.network2_dns);
+        Button network2_cancel_button = contentView.findViewById(R.id.network2_cancel_button);
+        Button network2_determine_button = contentView.findViewById(R.id.network2_determine_button);
+
+        layout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    Utils.hideInputKeyboard(alertDialog.getWindow().getDecorView().getWindowToken());
+                } catch (Exception e) {
+                    //
+                }
+            }
+        });
+
+
+        try {
+            HashMap<String, String> list = ZhylManager.getInstance(BaseApplication.appContext).net_getNetWorkInf("eth0");
+            if (list != null) {
+                String ip = list.get("Ip");
+                String gateway = list.get("Gateway");
+                String netmask = list.get("Netmask");
+                String dns1 = list.get("Dns1");
+                String dns2 = list.get("Dns2");
+
+                network2_ip.setText(ip);
+                network2_wg.setText(gateway);
+                network2_ym.setText(netmask);
+                network2_dns1.setText(dns1);
+                network2_dns2.setText(dns2);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        network2_cancel_button.setOnClickListener(v -> {
+            if (alertDialog != null && alertDialog.isShowing()) {
+                alertDialog.dismiss();
+
+            }
+        });
+        network2_determine_button.setOnClickListener(v -> {
+            if (alertDialog != null && alertDialog.isShowing()) {
+                String IP = network2_ip.getText().toString();
+                String ym = network2_ym.getText().toString();
+                String wg = network2_wg.getText().toString();
+                String dns1 = network2_dns1.getText().toString();
+                String dns2 = network2_dns2.getText().toString();
+
+                if (IP.isEmpty() || ym.isEmpty() || wg.isEmpty() || dns1.isEmpty()) {
+                    showMessage("Invalid param");
+                } else {
+                    alertDialog.dismiss();
+
+                    try {
+                        //设置静态网络
+                        if (ZhylManager.getInstance(BaseApplication.appContext).net_setNetWorkModel("eth0", 1, IP, wg, ym, dns1, dns2) == 0) {
+                            showMessage("Success");
+                        } else {
+                            showMessage("Failed");
+                        }
+                    } catch (Exception e) {
+                        showMessage("Failed");
+                    }
+                }
+            }
+        });
+        alertDialog = builder.create();
+        alertDialog.setCanceledOnTouchOutside(true);
+        alertDialog.setCancelable(true);
+        alertDialog.show();
+
+    }
+}

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/NetworkDialogHelper.java

@@ -0,0 +1,82 @@
+package com.wdkl.app.ncs.callingdoor.helper;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.zhyl.ZhylManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.wdkl.app.ncs.callingdoor.R;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+
+import static com.wdkl.ncs.android.lib.utils.ExtendMethodsKt.showMessage;
+
+public class NetworkDialogHelper {
+
+    private static AlertDialog alertDialog;
+    private static String network="";
+
+    public static void showDialog(Activity activity) {
+
+        View contentView = LayoutInflater.from(activity).inflate(R.layout.main_network_dialog, null);
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setView(contentView);
+        TextView network_one_tx = contentView.findViewById(R.id.network_one_tx);
+        TextView network_two_tx = contentView.findViewById(R.id.network_two_tx);
+        Button network_button = contentView.findViewById(R.id.network_button);
+
+        int type = ZhylManager.getInstance(BaseApplication.appContext).net_getNetWorkModel("eth0");
+        Log.d("network", "get net type: " + type);
+        if (type == 1) {
+            //静态
+            network="STATIC";
+            network_two_tx.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
+            network_one_tx.setBackgroundResource(R.drawable.selector_nuser_msg_tx_d);
+        } else if (type == 2) {
+            //动态
+            network="DHCP";
+            network_one_tx.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
+            network_two_tx.setBackgroundResource(R.drawable.selector_nuser_msg_tx_d);
+        }
+
+        network_one_tx.setOnClickListener(v -> {
+            network="DHCP";
+            network_one_tx.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
+            network_two_tx.setBackgroundResource(R.drawable.selector_nuser_msg_tx_d);
+        });
+        network_two_tx.setOnClickListener(v -> {
+            network="STATIC";
+            network_two_tx.setBackgroundResource(R.drawable.shape_main_hos_txt_bg);
+            network_one_tx.setBackgroundResource(R.drawable.selector_nuser_msg_tx_d);
+        });
+        network_button.setOnClickListener(v -> {
+            if (alertDialog != null && alertDialog.isShowing()) {
+                alertDialog.dismiss();
+
+                if (network.equals("STATIC")){
+                    Network2DialogHelper.showDialog(activity);
+                }else {
+                    try {
+                        //设置成动态获取网络
+                        if (ZhylManager.getInstance(BaseApplication.appContext).net_setNetWorkModel("eth0", 0, "", "", "", "", "") == 0) {
+                            showMessage("Success");
+                        } else {
+                            showMessage("Failed");
+                        }
+                    } catch (Exception e) {
+                        showMessage("Failed");
+                    }
+                }
+
+            }
+        });
+        alertDialog = builder.create();
+        alertDialog.setCanceledOnTouchOutside(true);
+        alertDialog.setCancelable(true);
+        alertDialog.show();
+
+    }
+}

android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/Utils.java

@@ -1,10 +1,14 @@
 package com.wdkl.app.ncs.callingdoor.helper;
 
+import android.content.Context;
 import android.hardware.Camera;
+import android.os.IBinder;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -56,4 +60,15 @@ public class Utils {
         mToast.setView(toastView);
         mToast.show();
     }
+
+    //隐藏软键盘
+    public static void hideInputKeyboard(IBinder token) {
+        try {
+            Log.d("keyboard", "hide input keyboard ===== ");
+            InputMethodManager mInputKeyBoard = (InputMethodManager) BaseApplication.appContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+            mInputKeyBoard.hideSoftInputFromWindow(token, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

android_door/src/main/h10_a133_chile/res/drawable/selector_network_tx_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/txt_network" android:state_checked="false" />
+    <item android:color="@color/txt_number" android:state_checked="true" />
+</selector>

android_door/src/main/h10_a133_chile/res/drawable/selector_nuser_ed_d.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/shape_n_login_ed_bg" android:state_checked="false" />
+    <item android:drawable="@drawable/shape_n_login_ed_bg2" android:state_checked="true" />
+</selector>

android_door/src/main/h10_a133_chile/res/drawable/selector_nuser_msg_tx_d.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" >
+    <shape>
+        <solid
+            android:color="#F7F8FC"
+            />
+        <stroke android:width="1dp" android:color="#ff3f80f1" />
+        <corners android:radius="10dp" />
+    </shape>
+        <color android:color="#3F80F1" />
+</item>
+    <item android:state_pressed="false" >
+        <shape>
+            <solid
+                android:color="#F4F6F9"
+                />
+            <stroke android:width="1dp" android:color="#97A2BE" />
+            <corners android:radius="10dp" />
+        </shape>
+        <color android:color="#97A2BE" />
+    </item>
+</selector>

android_door/src/main/h10_a133_chile/res/drawable/shape_main_hos_txt_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ff3a78ef" />
+    <corners
+        android:radius="18dp" />
+</shape>

android_door/src/main/h10_a133_chile/res/drawable/shape_n_login_ed_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="#F7F7F7"
+        />
+    <stroke android:width="2dp" android:color="#F2F2F2" />
+    <corners android:radius="18dp" />
+</shape>

android_door/src/main/h10_a133_chile/res/drawable/shape_n_login_ed_bg2.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="#F7F8FC"
+        />
+    <stroke android:width="2dp" android:color="#ff3f80f1" />
+    <corners android:radius="18dp" />
+</shape>

android_door/src/main/h10_a133_chile/res/drawable/shape_password_bt_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#97A2BE"
+        />
+    <corners
+        android:topLeftRadius="18dp"/>
+</shape>

android_door/src/main/h10_a133_chile/res/layout/main_network_dialog.xml

@@ -0,0 +1,65 @@
+<?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"
+    android:background="@android:color/transparent"
+    android:gravity="center">
+
+    <LinearLayout
+        android:layout_width="481dp"
+        android:layout_height="441dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="88dp"
+            android:layout_height="88dp"
+            android:layout_marginTop="42dp"
+            android:src="@drawable/hedimg" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="23dp"
+            android:gravity="center"
+            android:text="@string/net_config_tip"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_18"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/network_one_tx"
+            android:layout_width="270dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/selector_nuser_msg_tx_d"
+            android:gravity="center"
+            android:text="DHCP"
+            android:textColor="@drawable/selector_network_tx_color"
+            android:textSize="@dimen/font_size_16" />
+
+        <TextView
+            android:id="@+id/network_two_tx"
+            android:layout_width="270dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/selector_nuser_msg_tx_d"
+            android:gravity="center"
+            android:text="STATIC"
+            android:textColor="@drawable/selector_network_tx_color"
+            android:textSize="@dimen/font_size_16" />
+
+        <Button
+            android:id="@+id/network_button"
+            android:layout_width="370dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="40dp"
+            android:background="@drawable/shape_main_hos_txt_bg"
+            android:gravity="center"
+            android:text="@string/str_confirm"
+            android:textColor="@drawable/selector_bottom_btn_text_color"
+            android:textSize="16sp" />
+    </LinearLayout>
+</LinearLayout>

android_door/src/main/h10_a133_chile/res/layout/main_network_two_dialog.xml

@@ -0,0 +1,192 @@
+<?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"
+    android:gravity="center"
+    android:background="@android:color/transparent">
+
+    <LinearLayout
+        android:id="@+id/ll_net_config_view"
+        android:layout_width="480dp"
+        android:layout_height="448dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="23dp"
+            android:gravity="center"
+            android:text="@string/net_config_title"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_18"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="24dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="IP"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+            <EditText
+                android:id="@+id/network2_ip"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="20dp"
+                android:background="@drawable/selector_nuser_ed_d"
+                android:paddingLeft="30dp"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Gateway"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+            <EditText
+                android:id="@+id/network2_wg"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="36dp"
+                android:background="@drawable/selector_nuser_ed_d"
+                android:paddingLeft="30dp"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Netmask"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+            <EditText
+                android:id="@+id/network2_ym"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="36dp"
+                android:background="@drawable/selector_nuser_ed_d"
+                android:paddingLeft="30dp"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="DNS1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+            <EditText
+                android:id="@+id/network1_dns"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="36dp"
+                android:background="@drawable/selector_nuser_ed_d"
+                android:paddingLeft="30dp"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="DNS2"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+            <EditText
+                android:id="@+id/network2_dns"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="36dp"
+                android:background="@drawable/selector_nuser_ed_d"
+                android:paddingLeft="30dp"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="40dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/network2_cancel_button"
+                android:layout_width="176dp"
+                android:layout_height="48dp"
+                android:background="@drawable/shape_password_bt_bg"
+                android:gravity="center"
+                android:text="@string/str_cancel"
+                android:textColor="@drawable/selector_bottom_btn_text_color"
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/network2_determine_button"
+                android:layout_width="176dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="30dp"
+                android:background="@drawable/shape_main_hos_txt_bg"
+                android:gravity="center"
+                android:text="@string/str_confirm"
+                android:textColor="@drawable/selector_bottom_btn_text_color"
+                android:textSize="16sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

android_door/src/main/h10_a133_chile/res/layout/qr_code_lay.xml

@@ -189,9 +189,23 @@
                 android:orientation="vertical">
 
                 <TextView
+                    android:id="@+id/tv_btn_netcfg"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="10dp"
+                    android:background="@color/main_color"
+                    android:gravity="center_horizontal"
+                    android:singleLine="true"
+                    android:text="@string/net_config_title"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="24sp"
+                    android:visibility="gone"/>
+
+                <TextView
                     android:id="@+id/tv_btn_language"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
                     android:padding="10dp"
                     android:background="@color/main_color"
                     android:gravity="center_horizontal"

android_door/src/main/h10_a133_chile/res/values/colors.xml

@@ -85,6 +85,9 @@
     <color name="delete_text_color">#0090ff</color>
     <color name="version_background">#b0000000</color>
 
+    <color name="txt_setting">#444444</color>
+    <color name="txt_network">#97A2BE</color>
+    <color name="txt_number">#3A78EF</color>
 
     <!--cost list 列表中的颜色-->
     <color name="cost_list_title">#C4C4C4</color>

app/src/main/AndroidManifest.xml

@@ -20,6 +20,9 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

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

@@ -25,7 +25,7 @@ public class CommonUtils {
     //private static final String DEFAULT_URL = "192.168.9.200";
     //private static final String DEFAULT_URL = "192.168.8.5";
     //private static final String DEFAULT_URL = "192.168.101.1";
-    //private static final String DEFAULT_URL = "47.106.137.131";  //新云服
+    //private static final String DEFAULT_URL = "47.106.137.131";  //新云服sip
     private static final String DEFAULT_URL_PORT = "8006";
     private static final String DEFAULT_SIP_PORT = "8188";
 

resource/src/main/res/values-es/strings.xml

@@ -210,6 +210,8 @@
     <string name="click_twice_start_settings">Click twice open settings</string>
     <string name="low_power">Low power</string>
 
+    <string name="net_config_title">Net config</string>
+    <string name="net_config_tip">Please select network mode</string>
     <string name="language_set_title">Language setting</string>
     <string name="language_set_mode">Sync language from server:</string>
     <string name="enter_settings_tips">click 3 times to open settings</string>

resource/src/main/res/values-ru/strings.xml

@@ -197,6 +197,8 @@
     <string name="device_user_not_register">Пользователь не зарегистрирован</string>
     <string name="click_twice_start_settings">Дважды нажмите, чтобы открыть настройки</string>
     <string name="low_power">Низкое энергопотребление</string>
+    <string name="net_config_title">Net config</string>
+    <string name="net_config_tip">Please select network mode</string>
     <string name="language_set_title">Язык</string>
     <string name="language_set_mode">Синхронизировать язык с сервером:</string>
     <string name="enter_settings_tips">нажмите 3 раза, чтобы открыть настройки</string>

resource/src/main/res/values-zh/strings.xml

@@ -210,6 +210,8 @@
     <string name="click_twice_start_settings">再点一次进入设置</string>
     <string name="low_power">电量低</string>
 
+    <string name="net_config_title">网络设置</string>
+    <string name="net_config_tip">请选择要设置的网络类型</string>
     <string name="language_set_title">语言设置</string>
     <string name="language_set_mode">是否同步服务器语言:</string>
     <string name="enter_settings_tips">再点3次进入设置</string>

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

@@ -209,6 +209,8 @@
     <string name="click_twice_start_settings">Click twice open settings</string>
     <string name="low_power">Low power</string>
 
+    <string name="net_config_title">Net config</string>
+    <string name="net_config_tip">Please select network mode</string>
     <string name="language_set_title">Language setting</string>
     <string name="language_set_mode">Sync language from server:</string>
     <string name="enter_settings_tips">click 3 times to open settings</string>