|
@@ -64,6 +64,7 @@ public class MainActivity extends SerialPortActivity {
|
|
String callbackString = "";
|
|
String callbackString = "";
|
|
|
|
|
|
private SmdtManager smdtManager;
|
|
private SmdtManager smdtManager;
|
|
|
|
+ private boolean debugShow = false;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
@@ -253,9 +254,44 @@ public class MainActivity extends SerialPortActivity {
|
|
String tcpData = tempData.substring(sepIndex);
|
|
String tcpData = tempData.substring(sepIndex);
|
|
Log.e("Application", "tempData: " + tempData + ", mac: " + mac + ", tcpData: " + tcpData);
|
|
Log.e("Application", "tempData: " + tempData + ", mac: " + mac + ", tcpData: " + tcpData);
|
|
|
|
|
|
|
|
+ TcpModel tcpModel = TcpModel.getModelByJson(tcpData);
|
|
|
|
+ if (tcpModel != null) {
|
|
|
|
+ //调试信息,给所有能收到433信号的点阵屏发送,1分钟后清除
|
|
|
|
+ if (TcpAction.S433Action.EXIST == tcpModel.getAction()) {
|
|
|
|
+ if (debugShow) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ debugShow = true;
|
|
|
|
+ sendString(callbackString);
|
|
|
|
+
|
|
|
|
+ //显示调试信息
|
|
|
|
+ final String debugInfo = "host IP: " + localIP
|
|
|
|
+ + "\nhost mac: " + macAddress
|
|
|
|
+ + "\nled IP: " + SettingConfig.getLedIp(getApplicationContext())
|
|
|
|
+ + "\napp version: " + BuildConfig.VERSION_NAME;
|
|
|
|
+ LedManagerUtils.getInstance().updateProgram(debugInfo, 1);
|
|
|
|
+ //1分钟后清除调试信息
|
|
|
|
+ new Thread(new Runnable() {
|
|
|
|
+ @Override
|
|
|
|
+ public void run() {
|
|
|
|
+ try {
|
|
|
|
+ Thread.sleep(60000);
|
|
|
|
+
|
|
|
|
+ debugShow = false;
|
|
|
|
+ LedManagerUtils.getInstance().updateProgram(debugInfo, 2);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }).start();
|
|
|
|
+
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
//如果是发送给本机,则返回ack,并处理点阵屏数据
|
|
//如果是发送给本机,则返回ack,并处理点阵屏数据
|
|
- if (macAddress.equals(mac)) {
|
|
|
|
- TcpModel tcpModel = TcpModel.getModelByJson(tcpData);
|
|
|
|
|
|
+ if (macAddress.equalsIgnoreCase(mac)) {
|
|
if (tcpModel != null) {
|
|
if (tcpModel != null) {
|
|
parseTcpData(tcpModel);
|
|
parseTcpData(tcpModel);
|
|
}
|
|
}
|
|
@@ -263,7 +299,7 @@ public class MainActivity extends SerialPortActivity {
|
|
sendString(callbackString);
|
|
sendString(callbackString);
|
|
}
|
|
}
|
|
|
|
|
|
- if (BuildConfig.DEBUG) {
|
|
|
|
|
|
+ //if (BuildConfig.DEBUG) {
|
|
//调试版本输出信息
|
|
//调试版本输出信息
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
final String showMsg = sdf.format(new Date()) + " 收到数据:" + data + "\n";
|
|
final String showMsg = sdf.format(new Date()) + " 收到数据:" + data + "\n";
|
|
@@ -276,7 +312,7 @@ public class MainActivity extends SerialPortActivity {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
- }
|
|
|
|
|
|
+ //}
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -378,26 +414,6 @@ public class MainActivity extends SerialPortActivity {
|
|
long time = Long.parseLong(jsonObject.getString("time")) * 1000;
|
|
long time = Long.parseLong(jsonObject.getString("time")) * 1000;
|
|
|
|
|
|
setSysTime(time, timezone);
|
|
setSysTime(time, timezone);
|
|
- } else if (TcpAction.S433Action.EXIST == tcpModel.getAction()) {
|
|
|
|
- //显示调试信息
|
|
|
|
- final String debugInfo = "host IP: " + localIP
|
|
|
|
- + "\nhost mac: " + macAddress
|
|
|
|
- + "\nled IP: " + SettingConfig.getLedIp(getApplicationContext())
|
|
|
|
- + "\napp version: " + BuildConfig.VERSION_NAME;
|
|
|
|
- LedManagerUtils.getInstance().updateProgram(debugInfo, 1);
|
|
|
|
- //1分钟后清除调试信息
|
|
|
|
- new Thread(new Runnable() {
|
|
|
|
- @Override
|
|
|
|
- public void run() {
|
|
|
|
- try {
|
|
|
|
- Thread.sleep(60000);
|
|
|
|
-
|
|
|
|
- LedManagerUtils.getInstance().updateProgram(debugInfo, 2);
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }).start();
|
|
|
|
}
|
|
}
|
|
} catch (Exception ex) {
|
|
} catch (Exception ex) {
|
|
ex.printStackTrace();
|
|
ex.printStackTrace();
|