|
@@ -20,7 +20,6 @@ import androidx.annotation.NonNull;
|
|
import androidx.preference.PreferenceManager;
|
|
import androidx.preference.PreferenceManager;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
-import com.alibaba.fastjson.JSONArray;
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.wdkl.ncs.s433.transbox.common.Constants;
|
|
import com.wdkl.ncs.s433.transbox.common.Constants;
|
|
import com.wdkl.ncs.s433.transbox.receiver.NetworkConnectChangedReceiver;
|
|
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.TcpClient;
|
|
import com.wdkl.ncs.s433.transbox.tcp.TcpModel;
|
|
import com.wdkl.ncs.s433.transbox.tcp.TcpModel;
|
|
import com.wdkl.ncs.s433.transbox.tcp.TcpType;
|
|
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.AutoRebootUtil;
|
|
import com.wdkl.ncs.s433.transbox.utils.NetUtil;
|
|
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.SpeechUtil;
|
|
import com.wdkl.ncs.s433.transbox.utils.StringUtils;
|
|
import com.wdkl.ncs.s433.transbox.utils.StringUtils;
|
|
|
|
|
|
@@ -45,18 +42,10 @@ import java.io.DataOutputStream;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.io.OutputStream;
|
|
import java.io.OutputStream;
|
|
import java.nio.ByteBuffer;
|
|
import java.nio.ByteBuffer;
|
|
-import java.text.SimpleDateFormat;
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Arrays;
|
|
|
|
import java.util.Calendar;
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
-import java.util.Iterator;
|
|
|
|
-import java.util.List;
|
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
-import java.util.Timer;
|
|
|
|
-import java.util.concurrent.ExecutorService;
|
|
|
|
-import java.util.concurrent.Executors;
|
|
|
|
import java.util.zip.CRC32;
|
|
import java.util.zip.CRC32;
|
|
|
|
|
|
public class MainActivity extends SerialPortActivity {
|
|
public class MainActivity extends SerialPortActivity {
|
|
@@ -104,15 +93,15 @@ public class MainActivity extends SerialPortActivity {
|
|
private void init() {
|
|
private void init() {
|
|
TextView settingInfo = (TextView) findViewById(R.id.setttingInfo);
|
|
TextView settingInfo = (TextView) findViewById(R.id.setttingInfo);
|
|
StringBuilder sb = new StringBuilder();
|
|
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();
|
|
Constants.MAC_ADDR = NetUtil.getInstance().getMacAddress();
|
|
String localIP = NetUtil.getInstance().getLocalIP();
|
|
String localIP = NetUtil.getInstance().getLocalIP();
|
|
sb.append("串口号:" + path + "\n");
|
|
sb.append("串口号:" + path + "\n");
|