From: snickersun <scy@incartech.cn>
Date: Fri, 17 Jan 2020 13:04:17 +0000 (+0800)
Subject: 修复设置模式死机问题
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=15cea47d11a610246d6f7b8413c4777fe3f497bc;p=icsupport.git

修复设置模式死机问题
---

diff --git a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
index 0656ad77..37de7b7e 100644
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -395,6 +395,9 @@ public class protocolMainServer extends Service {
 
     public IBinder onBind(Intent paramIntent) { return this.mMessenger.getBinder(); }
 
+    public Runtime getRuntime(){
+        return runtime;
+    }
 
     @Override
     public void onCreate() {
diff --git a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
index c01f6e99..e0ccc46b 100644
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
@@ -24,7 +24,7 @@ import rx.schedulers.Schedulers;
 
 import static com.ic.protocol.utils.RxSocket.SocketStatus.CONNECTED;
 import static com.ic.protocol.utils.RxSocket.SocketStatus.DIS_CONNECT;
-
+import com.ic.protocol.bean.Runtime;
 
 public class NettyConnection implements Connection {
   private static long realtime_old;
@@ -45,6 +45,7 @@ public class NettyConnection implements Connection {
                 @Override
                 public boolean handleCmd(protocolAPIHelper.CMD_TYPE type, String cmd) {
 
+                        Runtime runtime=protocolMainServer.getInstance().getRuntime();
                         boolean ret=true;
                         Logger.i("handleCmd "+type.name() + " strLen="+cmd.length());
                         FileOutputUtil.fileOutput(protocolMainServer.getInstance().getApplicationContext(),"APILog", " recv " + cmd);
@@ -75,7 +76,7 @@ public class NettyConnection implements Connection {
                                 DeliverCMDMessageToSystem("APTM",cmd);//通知下面线程状态变化
                                 break;
                             case BP85://设置闹钟
-                                API.handleBP85(cmd,NettyConnection.this,null);
+                                API.handleBP85(cmd,NettyConnection.this,runtime);
                                 Logger.i("收到服务器设置闹钟命令BP85");
                                 DeliverCMDMessageToSystem("AP85",cmd);//通知下面线程状态变化
                                 break;
@@ -83,12 +84,12 @@ public class NettyConnection implements Connection {
                                 //设置工作模式
                                 DeliverCMDMessageToSystem("ResartHeartAlarm",cmd);//通知下面线程状态变化
                                 DeliverCMDMessageToSystem("AP33",cmd);//通知下面线程状态变化
-                                API.handleBP33(NettyConnection.this,null,cmd);
+                                API.handleBP33(NettyConnection.this,runtime,cmd);
 
                                 break;
                             case BP16:
                                 //立即定位指令（长链接有效）
-                                API.handleBP16(NettyConnection.this,null,cmd);
+                                API.handleBP16(NettyConnection.this,runtime,cmd);
                                 DeliverCMDMessageToSystem("StartLocate",cmd);//通知下面线程状态变化
                                 break;
                         }