修复设置模式死机问题

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 0656ad7..37de7b7 100644 (file)
--- 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 {
 \r
     public IBinder onBind(Intent paramIntent) { return this.mMessenger.getBinder(); }\r
 \r
+    public Runtime getRuntime(){\r
+        return runtime;\r
+    }\r
 \r
     @Override\r
     public void onCreate() {\r

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 c01f6e9..e0ccc46 100644 (file)
--- 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;
 \r
 import static com.ic.protocol.utils.RxSocket.SocketStatus.CONNECTED;\r
 import static com.ic.protocol.utils.RxSocket.SocketStatus.DIS_CONNECT;\r
-\r
+import com.ic.protocol.bean.Runtime;\r
 \r
 public class NettyConnection implements Connection {\r
   private static long realtime_old;\r
@@ -45,6 +45,7 @@ public class NettyConnection implements Connection {
                 @Override\r
                 public boolean handleCmd(protocolAPIHelper.CMD_TYPE type, String cmd) {\r
 \r
+                        Runtime runtime=protocolMainServer.getInstance().getRuntime();\r
                         boolean ret=true;\r
                         Logger.i("handleCmd "+type.name() + " strLen="+cmd.length());\r
                         FileOutputUtil.fileOutput(protocolMainServer.getInstance().getApplicationContext(),"APILog", " recv " + cmd);\r
@@ -75,7 +76,7 @@ public class NettyConnection implements Connection {
                                 DeliverCMDMessageToSystem("APTM",cmd);//通知下面线程状态变化\r
                                 break;\r
                             case BP85://设置闹钟\r
-                                API.handleBP85(cmd,NettyConnection.this,null);\r
+                                API.handleBP85(cmd,NettyConnection.this,runtime);\r
                                 Logger.i("收到服务器设置闹钟命令BP85");\r
                                 DeliverCMDMessageToSystem("AP85",cmd);//通知下面线程状态变化\r
                                 break;\r
@@ -83,12 +84,12 @@ public class NettyConnection implements Connection {
                                 //设置工作模式\r
                                 DeliverCMDMessageToSystem("ResartHeartAlarm",cmd);//通知下面线程状态变化\r
                                 DeliverCMDMessageToSystem("AP33",cmd);//通知下面线程状态变化\r
-                                API.handleBP33(NettyConnection.this,null,cmd);\r
+                                API.handleBP33(NettyConnection.this,runtime,cmd);\r
 \r
                                 break;\r
                             case BP16:\r
                                 //立即定位指令（长链接有效）\r
-                                API.handleBP16(NettyConnection.this,null,cmd);\r
+                                API.handleBP16(NettyConnection.this,runtime,cmd);\r
                                 DeliverCMDMessageToSystem("StartLocate",cmd);//通知下面线程状态变化\r
                                 break;\r
                         }\r