去除对LauncherCtrl的引用。以便适配新的ICL02Launcher2

diff --git a/app/libs/LauncherCtrl.jar b/app/libs/LauncherCtrl.jar
deleted file mode 100644 (file)
index cf80c36..0000000
Binary files a/app/libs/LauncherCtrl.jar and /dev/null differ

diff --git a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
index 52dd083..ef49526 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
+++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
@@ -7,7 +7,7 @@ import android.content.IntentFilter;
 import android.os.SystemClock;\r
 import android.util.Log;\r
 \r
-import com.eiot.watch_lib.LauncherCtrl;\r
+//import com.eiot.watch_lib.LauncherCtrl;\r
 import com.enqualcomm.support.CoreService;\r
 import com.enqualcomm.support.LocationClient;\r
 import com.enqualcomm.support.adapter.protocolAPIHelper;\r
@@ -32,8 +32,8 @@ import rx.Subscription;
 import rx.functions.Action1;\r
 \r
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;\r
-import static com.eiot.watch_lib.LauncherCtrl.STATUS_BAR_STATE_SERVER_CONNECTED_OFF;\r
-import static com.eiot.watch_lib.LauncherCtrl.STATUS_BAR_STATE_SERVER_CONNECTED_ON;\r
+//import static com.eiot.watch_lib.LauncherCtrl.STATUS_BAR_STATE_SERVER_CONNECTED_OFF;\r
+//import static com.eiot.watch_lib.LauncherCtrl.STATUS_BAR_STATE_SERVER_CONNECTED_ON;\r
 \r
 public class KeepAlive extends AbstractConnectionService {\r
   private static final long HEARTBEAT_TIMEOUT = 660000L;\r
@@ -225,7 +225,7 @@ public class KeepAlive extends AbstractConnectionService {
     stringBuilder.append("onConnectionClose=");\r
     stringBuilder.append(",set KeepAlive isConnected = false");\r
     ICLogger.i(stringBuilder.toString());\r
-    LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_OFF);\r
+//    LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_OFF);\r
 //网络断开后，重连成功后发送一个定位\r
 //    CoreService.needLocateInAfterHeartBeat=true;\r
     return false;\r
@@ -306,7 +306,7 @@ public class KeepAlive extends AbstractConnectionService {
       is_heartBeat_send_success=true;\r
 //广播服务器连接成功的消息\r
       paramRuntime.getContextProxy().sendBroadcast(true);\r
-      LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_ON);\r
+//      LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_ON);\r
 //      Deliver.triggerSendThread(); //链接上就尝试清除 buffer中的数据\r
       CoreService.getInstance().stopConnectionRetryTimer();\r
       if (CoreService.needLocateInAfterHeartBeat==true){\r