CNLive Android Team / ModulePedometer · Commits

Commit 5d7443d8fc72e636e28071ef1dda12a408e33f79

Authored by 杨帅
1 parent 8a242ada

1 修改保活服务杀死逻辑

Inline Side-by-side
Showing 3 changed files with 8 additions and 4 deletions
config.gradle
  View file @5d7443d
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.6.0",
  24 + version: "0.6.1",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
  View file @5d7443d
... ... @@ -47,6 +47,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
47 47 private final String TAG = "CollKeepLiveService";
48 48 private Handler handler;
49 49 private Runnable runnable;
  50 + private boolean isRegisterReceiver = false;
50 51  
51 52 public CollKeepLiveService() {
52 53 }
... ... @@ -105,6 +106,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
105 106 // intentFilter.addAction(Intent.ACTION_POWER_DISCONNECTED);
106 107 intentFilter.addAction("com.cnlive.moudle.collectionTrace.receivers.CollServiceReceiver");
107 108 registerReceiver(myReceiver, intentFilter);
  109 + isRegisterReceiver = true;
108 110 }
109 111  
110 112 /**
... ... @@ -215,7 +217,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
215 217 public void onDestroy() {
216 218 super.onDestroy();
217 219 try {
218   - if (myReceiver != null) {
  220 + if (myReceiver != null && isRegisterReceiver) {
219 221 unregisterReceiver(myReceiver);
220 222 }
221 223 } catch (Exception e) {
... ... @@ -231,7 +233,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
231 233 //发送重启广播
232 234 sendRestartBroadCast();
233 235 }
234   -
  236 + isRegisterReceiver = false;
235 237  
236 238 }
237 239  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
  View file @5d7443d
... ... @@ -49,6 +49,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
49 49 private final String TAG = "KeepLiveService";
50 50 private Handler handler;
51 51 private Runnable runnable;
  52 + private boolean isRegisterReceiver = false;
52 53  
53 54 public KeepLiveService() {
54 55 }
... ... @@ -115,6 +116,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
115 116 intentFilter.addAction("com.cnlive.strike.receiver.ServiceReceiver");
116 117 intentFilter.addAction("close.KeepService");
117 118 registerReceiver(myReceiver, intentFilter);
  119 + isRegisterReceiver=true;
118 120 }
119 121  
120 122 /**
... ... @@ -238,7 +240,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
238 240 public void onDestroy() {
239 241 super.onDestroy();
240 242 try {
241   - if (myReceiver != null) {
  243 + if (myReceiver != null&&isRegisterReceiver) {
242 244 unregisterReceiver(myReceiver);
243 245 }
244 246 } catch (Exception e) {
... ...