修改服务器IP修改无效问题

app/src/main/java/com/wdkl/ncs/s433/transbox/Application.java

@@ -1,12 +1,14 @@
 package com.wdkl.ncs.s433.transbox;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.serialport.SerialPort;
 import android.serialport.SerialPortFinder;
 import android.util.Log;
 
+import androidx.preference.PreferenceManager;
+
 import com.wdkl.ncs.s433.transbox.utils.AnrFcExceptionUtil;
-import com.wdkl.ncs.s433.transbox.utils.SettingConfig;
 
 import java.io.IOException;
 import java.security.InvalidParameterException;
@@ -37,12 +39,13 @@ public class Application extends android.app.Application {
             throws SecurityException, IOException, InvalidParameterException {
         if (mSerialPort == null) {
             /* Read serial port parameters */
-            String path = SettingConfig.getSerialDevicePath(context);
-            Log.i("Application", "getSerialPort: " + path);
-            int baudrate = SettingConfig.getBaudRate(context);
-            int parity = SettingConfig.getParity(context);
-            int dataBits = SettingConfig.getDataBits(context);
-            int stopBits = SettingConfig.getStopBits(context);
+            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+            Log.i("Application", "getSerialPort: "+sp.getString("serialDeivce","/dev/ttyS2"));
+            String path = sp.getString("serialDeivce","/dev/ttyS2"); //sp.getString("DEVICE", "");
+            int baudrate = Integer.decode(sp.getString("baudRate", "115200")); //Integer.decode(sp.getString("BAUDRATE", "-1"));
+            int parity = Integer.decode(sp.getString("parity", "0"));
+            int dataBits = Integer.decode(sp.getString("dataBits", "8"));
+            int stopBits = Integer.decode(sp.getString("stopBits", "1"));
             /* Check parameters */
             if ((path.length() == 0) || (baudrate == -1)) {
                 throw new InvalidParameterException();

app/src/main/java/com/wdkl/ncs/s433/transbox/MainActivity.java

@@ -20,7 +20,6 @@ import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.wdkl.ncs.s433.transbox.common.Constants;
 import com.wdkl.ncs.s433.transbox.receiver.NetworkConnectChangedReceiver;
@@ -29,10 +28,8 @@ import com.wdkl.ncs.s433.transbox.tcp.TcpAction;
 import com.wdkl.ncs.s433.transbox.tcp.TcpClient;
 import com.wdkl.ncs.s433.transbox.tcp.TcpModel;
 import com.wdkl.ncs.s433.transbox.tcp.TcpType;
-import com.wdkl.ncs.s433.transbox.utils.AlarmMessageUtil;
 import com.wdkl.ncs.s433.transbox.utils.AutoRebootUtil;
 import com.wdkl.ncs.s433.transbox.utils.NetUtil;
-import com.wdkl.ncs.s433.transbox.utils.SettingConfig;
 import com.wdkl.ncs.s433.transbox.utils.SpeechUtil;
 import com.wdkl.ncs.s433.transbox.utils.StringUtils;
 
@@ -45,18 +42,10 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
-import java.util.Timer;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.zip.CRC32;
 
 public class MainActivity extends SerialPortActivity  {
@@ -104,15 +93,15 @@ public class MainActivity extends SerialPortActivity  {
     private void init() {
         TextView settingInfo = (TextView) findViewById(R.id.setttingInfo);
         StringBuilder sb = new StringBuilder();
-        Context context = getApplicationContext();
-        String path = SettingConfig.getSerialDevicePath(context);
-        Log.i("Application", "getSerialPort: " + path);
-        int baudrate = SettingConfig.getBaudRate(context);
-        int parity = SettingConfig.getParity(context);
-        int dataBits = SettingConfig.getDataBits(context);
-        int stopBits = SettingConfig.getStopBits(context);
-        String tcpServer = SettingConfig.getTcpServer(context);
-        Integer tcpServerPort = SettingConfig.getTcpServerPort(context);
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        Log.i("Application", "getSerialPort: " + sp.getString("serialDeivce", "/dev/ttyS2"));
+        String path = sp.getString("serialDeivce", "/dev/ttyS2"); //sp.getString("DEVICE", "");
+        int baudrate = Integer.decode(sp.getString("baudRate", "115200")); //Integer.decode(sp.getString("BAUDRATE", "-1"));
+        int parity = Integer.decode(sp.getString("parity", "0"));
+        int dataBits = Integer.decode(sp.getString("dataBits", "8"));
+        int stopBits = Integer.decode(sp.getString("stopBits", "1"));
+        String tcpServer = sp.getString("tcpServer", "120.77.212.146");
+        Integer tcpServerPort = Integer.decode(sp.getString("tcpServerPort", "5080"));
         Constants.MAC_ADDR = NetUtil.getInstance().getMacAddress();
         String localIP = NetUtil.getInstance().getLocalIP();
         sb.append("串口号：" + path + "\n");

app/src/main/java/com/wdkl/ncs/s433/transbox/SettingsActivity.java

@@ -1,6 +1,5 @@
 package com.wdkl.ncs.s433.transbox;
 
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.serialport.SerialPortFinder;
 import android.view.MenuItem;
@@ -8,12 +7,7 @@ import android.view.MenuItem;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.EditTextPreference;
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-
-import com.wdkl.ncs.s433.transbox.common.Constants;
-import com.wdkl.ncs.s433.transbox.utils.SettingConfig;
 
 public class SettingsActivity extends AppCompatActivity {
     private static Application mApplication;
@@ -57,13 +51,6 @@ public class SettingsActivity extends AppCompatActivity {
             String[] entryValues = mSerialPortFinder.getAllDevicesPath();
             devices.setEntries(entries);
             devices.setEntryValues(entryValues);
-
-
-            EditTextPreference serverIpPre = findPreference("tcpServer");
-            serverIpPre.setDefaultValue(SettingConfig.getTcpServer(getContext()));
-
-            EditTextPreference serverPortPre = findPreference("tcpServerPort");
-            serverIpPre.setDefaultValue(SettingConfig.getTcpServerPort(getContext()));
         }
     }
 }

app/src/main/java/com/wdkl/ncs/s433/transbox/utils/SettingConfig.java

@@ -1,88 +0,0 @@
-package com.wdkl.ncs.s433.transbox.utils;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.wdkl.ncs.s433.transbox.common.Constants;
-
-
-public class SettingConfig {
-
-    private static final String SP_NAME = "SP_FUNCTION";
-
-    //baudRate,parity,dataBits,stopBits,tcpServer,tcpServerPort
-    private static final String KEY_SP_BAUD_RATE = "KEY_SP_BAUD_RATE";
-    private static final String KEY_SP_PARITY = "KEY_SP_PARITY";
-    private static final String KEY_SP_DATA_BITS = "KEY_SP_DATA_BITS";
-    private static final String KEY_SP_STOP_BITS = "KEY_SP_STOP_BITS";
-    private static final String KEY_SP_TCP_SERVER = "KEY_SP_TCP_SERVER";
-    private static final String KEY_SP_TCP_SERVER_PORT = "KEY_SP_TCP_SERVER_PORT";
-
-    private static final String KEY_SP_SERIAL_DEVICE_PATH = "KEY_SP_SERIAL_DEVICE_PATH";
-
-    public static String getSerialDevicePath(Context context) {
-        return getSP(context).getString(KEY_SP_SERIAL_DEVICE_PATH, "dev/ttyS2");
-    }
-
-    public static void setSerialDevicePath(Context context, String devicePath) {
-        getEditor(context).putString(KEY_SP_SERIAL_DEVICE_PATH, devicePath).apply();
-    }
-
-    public static int getBaudRate(Context context) {
-        return getSP(context).getInt(KEY_SP_BAUD_RATE, 115200);
-    }
-
-    public static void setBaudRate(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_BAUD_RATE, value).apply();
-    }
-
-    public static int getParity(Context context) {
-        return getSP(context).getInt(KEY_SP_PARITY, 0);
-    }
-
-    public static void setParity(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_PARITY, value).apply();
-    }
-
-    public static int getDataBits(Context context) {
-        return getSP(context).getInt(KEY_SP_DATA_BITS, 8);
-    }
-
-    public static void setDataBits(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_DATA_BITS, value).apply();
-    }
-
-    public static int getStopBits(Context context) {
-        return getSP(context).getInt(KEY_SP_STOP_BITS, 1);
-    }
-
-    public static void setStopBits(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_STOP_BITS, value).apply();
-    }
-
-    public static String getTcpServer(Context context) {
-        return getSP(context).getString(KEY_SP_TCP_SERVER, Constants.default_server_ip);
-    }
-
-    public static void setTcpServer(Context context, String value) {
-        getEditor(context).putString(KEY_SP_TCP_SERVER, value).apply();
-    }
-
-    public static int getTcpServerPort(Context context) {
-        return getSP(context).getInt(KEY_SP_TCP_SERVER_PORT, Constants.default_server_port);
-    }
-
-    public static void setTcpServerPort(Context context, int value) {
-        getEditor(context).putInt(KEY_SP_TCP_SERVER_PORT, value).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();
-    }
-
-}

app/src/main/res/xml/root_preferences.xml

@@ -61,14 +61,12 @@
     <PreferenceCategory app:title="@string/sync_header">
 
                 <EditTextPreference
-                    app:defaultValue="172.28.100.100"
                     app:key="tcpServer"
                     app:title="@string/tcp_server"
                     app:useSimpleSummaryProvider="true" />
 
 
         <EditTextPreference
-            app:defaultValue="5086"
             app:key="tcpServerPort"
             app:title="@string/tcp_server_port"
             app:useSimpleSummaryProvider="true" />