## [1.1.25] version 44 - 2020-08-10

### Fixed
- TCP重连BUG
- 事件语音不播报

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 43
+    ext.app_version_code = 44
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.24"
+    ext.app_version = "1.1.25"
 
     /**
      * 项目依赖库

home/src/main/code/com/wdkl/ncs/android/component/home/activity/NewEventListActivity.kt

@@ -21,6 +21,7 @@ import com.wdkl.ncs.android.component.home.util.MediaPlayHelper
 import com.wdkl.ncs.android.component.home.util.SpeechUtil
 import com.wdkl.ncs.android.component.home.util.Util
 import com.wdkl.ncs.android.lib.base.BaseActivity
+import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.home.NewEventListContract
@@ -61,7 +62,12 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter,ActivityEventLis
         HomeLaunch.component.inject(this)
     }
 
-    override fun init() {
+    override fun onStart() {
+        super.onStart()
+        //TTS初始化
+//        SpeechUtil.getInstance().init(BaseApplication.appContext)
+//        SpeechUtil.getInstance().startSpeechThread()
+
         WdKeepAliveService.mNewEventListActive = true
         //震动
         mVibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
@@ -75,9 +81,11 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter,ActivityEventLis
             //语音播放
             if (tcpModel.type == TcpType.EVENT && tcpModel.action == TcpAction.EventAction.KEY_CLICK) {
                 val eventStr = Util.appendSpace(interactionVO.fromFrameFullName.replace("-", ",")) + ", " + interactionVO.data
+                SpeechUtil.getInstance().stopSpeak()
                 SpeechUtil.getInstance().newSpeech("您有新的事件待处理, " + eventStr, false)
 
             } else if (tcpModel.type == TcpType.IM && tcpModel.action == TcpAction.IMAction.MSG) {
+                SpeechUtil.getInstance().stopSpeak()
                 SpeechUtil.getInstance().newSpeech("您有新的语音留言待处理", false)
             } else if (tcpModel.type == TcpType.SOS && tcpModel.action == TcpAction.SOSAction.CALL) {
                 SpeechUtil.getInstance().stopSpeak()
@@ -99,6 +107,10 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter,ActivityEventLis
         renderData(listData)
     }
 
+    override fun init() {
+
+    }
+
     override fun bindEvent() {
 
     }
@@ -178,9 +190,11 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter,ActivityEventLis
                     showMessage("已响应"+responseInteractionVO.fromFrameFullName + " " + responseInteractionVO.data)
 
                     var doFinish = false
-                    for (it in listData){
+                    var iterator = this.listData.iterator()
+                    while (iterator.hasNext()){
+                        val it = iterator.next()
                         if (it.id == responseInteractionVO.id) {
-                            listData.remove(it)
+                            this.listData.remove(it)
 
                             if (responseInteractionVO.actionType.equals(TcpType.IM.name)){
                                 AppTool.Time.delay(1000){
@@ -189,27 +203,27 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter,ActivityEventLis
                                     }
                                     adapter.data.remove(it)
                                     adapter.notifyDataSetChanged()
-                                    if (listData.isEmpty()||listData.size==0){
+                                    if (this.listData.isEmpty()||this.listData.size==0){
                                         AppTool.Time.delay(1200) {
                                             finish()
                                         }
                                     } else {
-                                        renderData(listData)
+                                        this.renderData(this.listData)
                                     }
                                 }
                             } else {
-                                adapter.data.remove(it)
-                                adapter.notifyDataSetChanged()
+                                this.adapter.data.remove(it)
+                                this.adapter.notifyDataSetChanged()
                                 doFinish = true
                             }
                         }
                     }
-                    if ((listData.isEmpty()||listData.size==0) && doFinish){
+                    if ((this.listData.isEmpty()||this.listData.size==0) && doFinish){
                         AppTool.Time.delay(1200) {
                             finish()
                         }
                     } else {
-                        renderData(listData)
+                        this.renderData(this.listData)
                     }
                 }
             }
@@ -246,25 +260,27 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter,ActivityEventLis
                         showMessage("已响应")
                     }
 
-                    for (it in listData){
+                    var iterator = this.listData.iterator()
+                    while (iterator.hasNext()){
+                        val it = iterator.next()
                         if (it.id == responseInteractionVO.id) {
-                            listData.remove(it)
-                            adapter.data.remove(it)
-                            adapter.notifyDataSetChanged()
+                            this.listData.remove(it)
+                            this.adapter.data.remove(it)
+                            this.adapter.notifyDataSetChanged()
                         }
                     }
 
-                    if (listData.isEmpty()||listData.size==0){
+                    if (this.listData.isEmpty()||this.listData.size==0){
                         AppTool.Time.delay(1200) {
                             finish()
                         }
                     } else {
-                        renderData(listData)
+                        renderData(this.listData)
                     }
 
                 } else if (tcpModel.action === TcpAction.SOSAction.CALL) {
-                    listData.add(responseInteractionVO)
-                    renderData(listData)
+                    this.listData.add(responseInteractionVO)
+                    renderData(this.listData)
 
                     SpeechUtil.getInstance().stopSpeak()
                     handleVibrator()

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/TcpClient.java

@@ -47,6 +47,7 @@ public class TcpClient {
     //初始化Netty Tcp Client 并连接
     public synchronized void init(String serverIP, Integer serverPort, Integer heartBeatSeconds, ITcpCallBack iTcpCallBack) {
         if (bootstrap!=null){
+            doConnect(iTcpCallBack);
             return;
         }
 
@@ -138,11 +139,11 @@ public class TcpClient {
 
     //发送消息，线程安全
     public synchronized void sendMsg(String content) {
-        Log.i(TAG, "准备发送的数据 " + content);
+        Log.d(TAG, "准备发送的数据 " + content);
         if (tcpClientHandler != null) {
             tcpClientHandler.sendMsg(content);
         } else {
-            Log.i(TAG, "未能发送数据 " + content);
+            Log.d(TAG, "未能发送数据 " + content);
         }
     }
 

readme.md

@@ -26,12 +26,20 @@
 
 ---
 
+## [1.1.25] version 44 - 2020-08-10
+### Fixed
+- TCP重连BUG
+- 事件语音不播报
+
+---
+
 ## [1.1.24] version 43 - 2020-08-10
 ### Changed
 - 优化启动时的TCP和RTC连接逻辑
 - 优化断线时的处理，每2秒重试连接，最多30次。10分钟后再次重新尝试1分钟内连接30次
 ### Fixed
 - 首次SOS不出声的问题
+- 修复若干个其它问题
 
 ---