From 6d840a27bd87e2e5e2659655dc0e6233b6bebbe2 Mon Sep 17 00:00:00 2001
From: "liuhuo.xd" <liuhuo.xd@alibaba-inc.com>
Date: Fri, 10 Nov 2017 22:14:13 +0800
Subject: [PATCH] =?UTF-8?q?RxJava=202=20=E4=BF=AE=E6=AD=A3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xdandroid/hellodaemon/WatchDogService.java  | 4 ++--
 .../src/main/java/com/xdandroid/sample/TraceServiceImpl.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hellodaemon/src/main/java/com/xdandroid/hellodaemon/WatchDogService.java b/hellodaemon/src/main/java/com/xdandroid/hellodaemon/WatchDogService.java
index 746c109..646bb37 100644
--- a/hellodaemon/src/main/java/com/xdandroid/hellodaemon/WatchDogService.java
+++ b/hellodaemon/src/main/java/com/xdandroid/hellodaemon/WatchDogService.java
@@ -14,7 +14,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Flowable;
+import io.reactivex.*;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 
@@ -59,7 +59,7 @@ protected final int onStart(Intent intent, int flags, int startId) {
         }
 
         //使用定时 Observable，避免 Android 定制系统 JobScheduler / AlarmManager 唤醒间隔不稳定的情况
-        sDisposable = Flowable
+        sDisposable = Observable
                 .interval(DaemonEnv.getWakeUpInterval(), TimeUnit.MILLISECONDS)
                 .subscribe(new Consumer<Long>() {
                     @Override
diff --git a/sample/src/main/java/com/xdandroid/sample/TraceServiceImpl.java b/sample/src/main/java/com/xdandroid/sample/TraceServiceImpl.java
index cb0310b..73c7738 100644
--- a/sample/src/main/java/com/xdandroid/sample/TraceServiceImpl.java
+++ b/sample/src/main/java/com/xdandroid/sample/TraceServiceImpl.java
@@ -37,10 +37,10 @@ public Boolean shouldStopService(Intent intent, int flags, int startId) {
     @Override
     public void startWork(Intent intent, int flags, int startId) {
         System.out.println("检查磁盘中是否有上次销毁时保存的数据");
-        sDisposable = Flowable
+        sDisposable = Observable
                 .interval(3, TimeUnit.SECONDS)
                 //取消任务时取消定时唤醒
-                .doOnCancel(() -> {
+                .doOnDispose(() -> {
                     System.out.println("保存数据到磁盘。");
                     cancelJobAlarmSub();
                 })