修改无线点阵屏接收器默认串口为ttyS7，修改Android板默认IP为192.168.1.100，修改控制点阵屏IP为192.168.1.199，开机增加欢迎提示语

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

@@ -123,7 +123,7 @@ public class MainActivity extends SerialPortActivity  {
         TextView settingInfo = (TextView) findViewById(R.id.setttingInfo);
         StringBuilder sb = new StringBuilder();
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        String path = sp.getString("serialDeivce", "dev/ttyS2"); //sp.getString("DEVICE", "");
+        String path = sp.getString("serialDeivce", "dev/ttyS7"); //sp.getString("DEVICE", "");
         Log.i("Application", "getSerialPort: " + path);
         int baudrate = Integer.decode(sp.getString("baudRate", "115200")); //Integer.decode(sp.getString("BAUDRATE", "-1"));
         int parity = Integer.decode(sp.getString("parity", "0"));
@@ -168,7 +168,7 @@ public class MainActivity extends SerialPortActivity  {
         if (!defaultIP.equals(localIP)) {
             Log.e(TAG, "set default ip: " + defaultIP);
             try {
-                smdtManager.smdtSetEthIPAddress(defaultIP, "255.255.0.0", "172.28.100.1", "8.8.8.8");
+                smdtManager.smdtSetEthIPAddress(defaultIP, "255.255.0.0", "192.168.1.1", "8.8.8.8");
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -179,20 +179,22 @@ public class MainActivity extends SerialPortActivity  {
         setLedParams(SettingConfig.getLedIp(this), SettingConfig.getLedResolution(this), SettingConfig.getLedFontSize(this));
 
 
-        /*final String welcomeInfo = "欢迎使用";
+        final String welcomeInfo = "欢迎使用";
         LedManagerUtils.getInstance().updateProgram(welcomeInfo, 1);
         new Thread(new Runnable() {
             @Override
             public void run() {
                 try {
-                    Thread.sleep(15000);
+                    Thread.sleep(5000);
+                    SpeechUtil.getInstance().speakSingleText(welcomeInfo);
 
+                    Thread.sleep(5000);
                     LedManagerUtils.getInstance().updateProgram(welcomeInfo, 2);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
-        }).start();*/
+        }).start();
     }
 
     private void setLedParams(String ledIp, String resolution, int fontSize) {
@@ -260,7 +262,7 @@ public class MainActivity extends SerialPortActivity  {
         //$8C:FC:A0:F1:01:A7{"action":"SOS_CALL","type":"S433","data":{"title":"12房紧急呼叫"}}#
         Log.e("Application", "receiveData: " + data);
 
-        if (BuildConfig.DEBUG) {
+        /*if (BuildConfig.DEBUG) {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
@@ -270,7 +272,7 @@ public class MainActivity extends SerialPortActivity  {
                     }
                 }
             });
-        }
+        }*/
 
         try {
             //去掉'$'起始符和‘#’结束符
@@ -326,11 +328,11 @@ public class MainActivity extends SerialPortActivity  {
                 //如果是发送给本机,则返回ack,并处理点阵屏数据
                 if (macAddress.equalsIgnoreCase(mac)) {
                     if (tcpModel != null) {
+                        Log.e(TAG, "send 433 data ==>" + callbackString);
+                        sendMsg(callbackString, mOutputStream, 120);
+
                         parseTcpData(tcpModel);
                     }
-
-                    Log.e(TAG, "send 433 data ==>" + callbackString);
-                    sendMsg(callbackString, mOutputStream, 120);
                 }
 
             }

app/src/main/java/com/wdkl/ncs/s433/receiver/MyApplication.java

@@ -42,7 +42,7 @@ public class MyApplication extends android.app.Application {
         if (mSerialPort == null) {
             /* Read serial port parameters */
             SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-            String path = sp.getString("serialDeivce","dev/ttyS2"); //sp.getString("DEVICE", "");
+            String path = sp.getString("serialDeivce","dev/ttyS7"); //sp.getString("DEVICE", "");
             Log.i("Application", "getSerialPort: " + path);
             int baudrate = Integer.decode(sp.getString("baudRate", "115200")); //Integer.decode(sp.getString("BAUDRATE", "-1"));
             int parity = Integer.decode(sp.getString("parity", "0"));

app/src/main/java/com/wdkl/ncs/s433/receiver/settingconfig/SettingConfig.java

@@ -131,7 +131,7 @@ public class SettingConfig {
     }
 
     public static String getHostIp(Context context) {
-        return getSP(context).getString(KEY_SP_HOST_IP, "172.28.100.10");
+        return getSP(context).getString(KEY_SP_HOST_IP, "192.168.1.100");
     }
 
     public static void setHostIp(Context context, String value) {
@@ -139,7 +139,7 @@ public class SettingConfig {
     }
 
     public static String getLedIp(Context context) {
-        return getSP(context).getString(KEY_SP_LED_IP, "172.28.100.210");
+        return getSP(context).getString(KEY_SP_LED_IP, "192.168.1.199");
     }
 
     public static void setLedIp(Context context, String value) {

app/src/main/java/com/wdkl/ncs/s433/receiver/utils/SpeechUtil.java

@@ -208,6 +208,28 @@ public class SpeechUtil {
         });
     }
 
+    public void speakSingleText(final String text) {
+        Log.d(TAG, "tts speak single: " + text);
+
+        textToSpeech.speak(text, TextToSpeech.QUEUE_FLUSH, params, "uniqueId");
+        textToSpeech.setOnUtteranceProgressListener(new UtteranceProgressListener() {
+            @Override
+            public void onStart(String utteranceId) {
+                //LogUtil.d(TAG, "speak onStart..." + utteranceId);
+            }
+
+            @Override
+            public void onDone(String utteranceId) {
+                //
+            }
+
+            @Override
+            public void onError(String utteranceId) {
+                //
+            }
+        });
+    }
+
     public void stopSpeak() {
         speechTextList.clear();
         if (textToSpeech != null && textToSpeech.isSpeaking()) {

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

@@ -4,7 +4,7 @@
 
 
         <ListPreference
-            app:defaultValue="/dev/ttyS2"
+            app:defaultValue="/dev/ttyS7"
             app:key="serialDeivce"
             app:title="@string/serial_deivce"
             app:useSimpleSummaryProvider="true" />