From: snickersun Date: Tue, 24 Mar 2020 02:21:06 +0000 (+0800) Subject: 去除对LauncherCtrl的引用。以便适配新的ICL02Launcher2 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=105307abdcc37fb7d4c3e66905f108252f5772c9;p=icsupport.git 去除对LauncherCtrl的引用。以便适配新的ICL02Launcher2 --- diff --git a/app/libs/LauncherCtrl.jar b/app/libs/LauncherCtrl.jar deleted file mode 100644 index cf80c360..00000000 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 52dd083c..ef49526d 100644 --- 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; import android.util.Log; -import com.eiot.watch_lib.LauncherCtrl; +//import com.eiot.watch_lib.LauncherCtrl; import com.enqualcomm.support.CoreService; import com.enqualcomm.support.LocationClient; import com.enqualcomm.support.adapter.protocolAPIHelper; @@ -32,8 +32,8 @@ import rx.Subscription; import rx.functions.Action1; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; -import static com.eiot.watch_lib.LauncherCtrl.STATUS_BAR_STATE_SERVER_CONNECTED_OFF; -import static com.eiot.watch_lib.LauncherCtrl.STATUS_BAR_STATE_SERVER_CONNECTED_ON; +//import static com.eiot.watch_lib.LauncherCtrl.STATUS_BAR_STATE_SERVER_CONNECTED_OFF; +//import static com.eiot.watch_lib.LauncherCtrl.STATUS_BAR_STATE_SERVER_CONNECTED_ON; public class KeepAlive extends AbstractConnectionService { private static final long HEARTBEAT_TIMEOUT = 660000L; @@ -225,7 +225,7 @@ public class KeepAlive extends AbstractConnectionService { stringBuilder.append("onConnectionClose="); stringBuilder.append(",set KeepAlive isConnected = false"); ICLogger.i(stringBuilder.toString()); - LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_OFF); +// LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_OFF); //网络断开后,重连成功后发送一个定位 // CoreService.needLocateInAfterHeartBeat=true; return false; @@ -306,7 +306,7 @@ public class KeepAlive extends AbstractConnectionService { is_heartBeat_send_success=true; //广播服务器连接成功的消息 paramRuntime.getContextProxy().sendBroadcast(true); - LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_ON); +// LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_ON); // Deliver.triggerSendThread(); //链接上就尝试清除 buffer中的数据 CoreService.getInstance().stopConnectionRetryTimer(); if (CoreService.needLocateInAfterHeartBeat==true){