1.2.2 ver: Bug 修复.

Author: liuhuo.xd

hellodaemon/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/xingda920813/HelloDaemon'
     gitUrl = 'https://github.com/xingda920813/HelloDaemon.git'
 
-    libraryVersion = '1.2.1'
+    libraryVersion = '1.2.2'
 
     developerId = 'xingda920813'
     developerName = 'Da Xing'
@@ -31,8 +31,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 10
-        versionName "1.2.1"
+        versionCode 11
+        versionName "1.2.2"
     }
     buildTypes {
         release {

hellodaemon/src/main/java/com/xdandroid/hellodaemon/AbsWorkService.java

@@ -36,7 +36,7 @@ public static void cancelJobAlarmSub() {
     public abstract void onServiceKilled(Intent rootIntent);
 
     /**
-     * 1.防止重复启动，可以任意调用startService(Intent i);
+     * 1.防止重复启动，可以任意调用 DaemonEnv.startServiceMayBind(Class serviceClass);
      * 2.利用漏洞启动前台服务而不显示通知;
      * 3.在子线程中运行定时任务，处理了运行前检查和销毁时保存的问题;
      * 4.启动守护服务;

hellodaemon/src/main/java/com/xdandroid/hellodaemon/DaemonEnv.java

@@ -14,13 +14,13 @@ private DaemonEnv() {}
     public static final int DEFAULT_WAKE_UP_INTERVAL = 6 * 60 * 1000;
     private static final int MINIMAL_WAKE_UP_INTERVAL = 3 * 60 * 1000;
 
-    static final Map<Class<? extends Service>, Boolean> BIND_STATE_MAP = new HashMap<>();
-
     static Context sApp;
     static Class<? extends AbsWorkService> sServiceClass;
     private static int sWakeUpInterval = DEFAULT_WAKE_UP_INTERVAL;
     static boolean sInitialized;
 
+    static final Map<Class<? extends Service>, ServiceConnection> BIND_STATE_MAP = new HashMap<>();
+
     /**
      * @param app Application Context.
      * @param wakeUpInterval 定时唤醒的时间间隔(ms).
@@ -36,24 +36,24 @@ public static void startServiceMayBind(@NonNull final Class<? extends Service> s
         if (!sInitialized) return;
         final Intent i = new Intent(sApp, serviceClass);
         startServiceSafely(i);
-        Boolean bound = BIND_STATE_MAP.get(serviceClass);
-        if (bound == null || !bound) sApp.bindService(i, new ServiceConnection() {
+        ServiceConnection bound = BIND_STATE_MAP.get(serviceClass);
+        if (bound == null) sApp.bindService(i, new ServiceConnection() {
             @Override
             public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-                BIND_STATE_MAP.put(serviceClass, true);
+                BIND_STATE_MAP.put(serviceClass, this);
             }
 
             @Override
             public void onServiceDisconnected(ComponentName componentName) {
-                BIND_STATE_MAP.put(serviceClass, false);
+                BIND_STATE_MAP.remove(serviceClass);
                 startServiceSafely(i);
                 if (!sInitialized) return;
                 sApp.bindService(i, this, Context.BIND_AUTO_CREATE);
             }
         }, Context.BIND_AUTO_CREATE);
     }
 
-    public static void startServiceSafely(Intent i) {
+    static void startServiceSafely(Intent i) {
         if (!sInitialized) return;
         try { sApp.startService(i); } catch (Exception ignored) {}
     }

hellodaemon/src/main/java/com/xdandroid/hellodaemon/IntentWrapper.java

@@ -430,7 +430,7 @@ protected boolean doesActivityExists() {
     /**
      * 安全地启动一个Activity
      */
-    public void startActivitySafely(Activity activityContext) {
+    protected void startActivitySafely(Activity activityContext) {
         try { activityContext.startActivity(intent); } catch (Exception e) { e.printStackTrace(); }
     }
 }

sample/src/main/java/com/xdandroid/sample/App.java

@@ -1,7 +1,6 @@
 package com.xdandroid.sample;
 
 import android.app.*;
-import android.content.*;
 
 import com.xdandroid.hellodaemon.*;
 
@@ -12,6 +11,7 @@ public void onCreate() {
         super.onCreate();
         //需要在 Application 的 onCreate() 中调用一次 DaemonEnv.initialize()
         DaemonEnv.initialize(this, TraceServiceImpl.class, DaemonEnv.DEFAULT_WAKE_UP_INTERVAL);
-        DaemonEnv.startServiceSafely(new Intent(this, TraceServiceImpl.class));
+        TraceServiceImpl.sShouldStopService = false;
+        DaemonEnv.startServiceMayBind(TraceServiceImpl.class);
     }
 }

sample/src/main/java/com/xdandroid/sample/MainActivity.java

@@ -1,7 +1,6 @@
 package com.xdandroid.sample;
 
 import android.app.*;
-import android.content.*;
 import android.os.*;
 import android.view.*;
 
@@ -16,12 +15,21 @@ protected void onCreate(Bundle b) {
 
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.btn_start: DaemonEnv.startServiceSafely(new Intent(this, TraceServiceImpl.class)); break;
-            case R.id.btn_white: IntentWrapper.whiteListMatters(this, "轨迹跟踪服务的持续运行"); break;
-            case R.id.btn_stop: TraceServiceImpl.stopService(); break;
+            case R.id.btn_start:
+                TraceServiceImpl.sShouldStopService = false;
+                DaemonEnv.startServiceMayBind(TraceServiceImpl.class);
+                break;
+            case R.id.btn_white:
+                IntentWrapper.whiteListMatters(this, "轨迹跟踪服务的持续运行");
+                break;
+            case R.id.btn_stop:
+                TraceServiceImpl.stopService();
+                break;
         }
     }
 
     //防止华为机型未加入白名单时按返回键回到桌面再锁屏后几秒钟进程被杀
-    @Override public void onBackPressed() { IntentWrapper.onBackPressed(this); }
+    public void onBackPressed() {
+        IntentWrapper.onBackPressed(this);
+    }
 }

sample/src/main/java/com/xdandroid/sample/TraceServiceImpl.java

@@ -40,10 +40,11 @@ public void startWork(Intent intent, int flags, int startId) {
         sDisposable = Flowable
                 .interval(3, TimeUnit.SECONDS)
                 //取消任务时取消定时唤醒
-                .doOnTerminate(() -> {
+                .doOnCancel(() -> {
                     System.out.println("保存数据到磁盘。");
                     cancelJobAlarmSub();
-                }).subscribe(count -> {
+                })
+                .subscribe(count -> {
                     System.out.println("每 3 秒采集一次数据... count = " + count);
                     if (count > 0 && count % 18 == 0) System.out.println("保存数据到磁盘。 saveCount = " + (count / 18 - 1));
                 });