From 3a4bd4f19fcfcac6d24ec4d4f973e12ebe72af7a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 17 六月 2019 11:48:40 +0800
Subject: [PATCH] update 电量监听销毁逻辑保护
---
Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java | 15 ++++
Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java | 15 ++++
Project/js_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java | 15 ++++
ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar | 0
Project/settings.gradle | 3
Project/sd_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java | 15 ++++
Project/xn_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java | 15 ++++
Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java | 15 ++++
Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java | 15 ++++
Project/app/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java | 15 ++++
10 files changed, 106 insertions(+), 17 deletions(-)
diff --git a/ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar b/ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar
index 3b800a9..9e5ffc6 100644
--- a/ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar
+++ b/ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar
Binary files differ
diff --git a/Project/app/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java b/Project/app/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
index abd77fb..d4e9b30 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
@@ -39,8 +39,19 @@
public void stop(Context context)
{
- context.unregisterReceiver(m_BatteryBroadCastReceiver);
- m_BatteryBroadCastReceiver = null;
+ if (m_BatteryBroadCastReceiver != null)
+ {
+ try{
+ context.unregisterReceiver(m_BatteryBroadCastReceiver);
+ m_BatteryBroadCastReceiver = null;
+ }catch (IllegalArgumentException e)
+ {
+ if (!e.getMessage().contains("Receiver not registered"))
+ {
+ throw e;
+ }
+ }
+ }
}
private class BatteryBroadCastReceiver extends BroadcastReceiver
diff --git a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
index abd77fb..d4e9b30 100644
--- a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
+++ b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
@@ -39,8 +39,19 @@
public void stop(Context context)
{
- context.unregisterReceiver(m_BatteryBroadCastReceiver);
- m_BatteryBroadCastReceiver = null;
+ if (m_BatteryBroadCastReceiver != null)
+ {
+ try{
+ context.unregisterReceiver(m_BatteryBroadCastReceiver);
+ m_BatteryBroadCastReceiver = null;
+ }catch (IllegalArgumentException e)
+ {
+ if (!e.getMessage().contains("Receiver not registered"))
+ {
+ throw e;
+ }
+ }
+ }
}
private class BatteryBroadCastReceiver extends BroadcastReceiver
diff --git a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
index abd77fb..d4e9b30 100644
--- a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
+++ b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
@@ -39,8 +39,19 @@
public void stop(Context context)
{
- context.unregisterReceiver(m_BatteryBroadCastReceiver);
- m_BatteryBroadCastReceiver = null;
+ if (m_BatteryBroadCastReceiver != null)
+ {
+ try{
+ context.unregisterReceiver(m_BatteryBroadCastReceiver);
+ m_BatteryBroadCastReceiver = null;
+ }catch (IllegalArgumentException e)
+ {
+ if (!e.getMessage().contains("Receiver not registered"))
+ {
+ throw e;
+ }
+ }
+ }
}
private class BatteryBroadCastReceiver extends BroadcastReceiver
diff --git a/Project/sd_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java b/Project/sd_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
index abd77fb..d4e9b30 100644
--- a/Project/sd_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
+++ b/Project/sd_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
@@ -39,8 +39,19 @@
public void stop(Context context)
{
- context.unregisterReceiver(m_BatteryBroadCastReceiver);
- m_BatteryBroadCastReceiver = null;
+ if (m_BatteryBroadCastReceiver != null)
+ {
+ try{
+ context.unregisterReceiver(m_BatteryBroadCastReceiver);
+ m_BatteryBroadCastReceiver = null;
+ }catch (IllegalArgumentException e)
+ {
+ if (!e.getMessage().contains("Receiver not registered"))
+ {
+ throw e;
+ }
+ }
+ }
}
private class BatteryBroadCastReceiver extends BroadcastReceiver
diff --git a/Project/settings.gradle b/Project/settings.gradle
index 205471a..1912195 100644
--- a/Project/settings.gradle
+++ b/Project/settings.gradle
@@ -1 +1,2 @@
-include ':app', ':mr_sdk', ':sp_sdk', ':js_sdk', ':yj_sdk'
+include ':app', ':mr_sdk', ':sp_sdk', ':js_sdk', ':yj_sdk', ':quicksdk_sdk', ':yl_sdk', ':xn_sdk', ':sd_sdk'
+include ':sp_common_sdk'
diff --git a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java b/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
index abd77fb..d4e9b30 100644
--- a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
+++ b/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
@@ -39,8 +39,19 @@
public void stop(Context context)
{
- context.unregisterReceiver(m_BatteryBroadCastReceiver);
- m_BatteryBroadCastReceiver = null;
+ if (m_BatteryBroadCastReceiver != null)
+ {
+ try{
+ context.unregisterReceiver(m_BatteryBroadCastReceiver);
+ m_BatteryBroadCastReceiver = null;
+ }catch (IllegalArgumentException e)
+ {
+ if (!e.getMessage().contains("Receiver not registered"))
+ {
+ throw e;
+ }
+ }
+ }
}
private class BatteryBroadCastReceiver extends BroadcastReceiver
diff --git a/Project/xn_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java b/Project/xn_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
index abd77fb..d4e9b30 100644
--- a/Project/xn_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
+++ b/Project/xn_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
@@ -39,8 +39,19 @@
public void stop(Context context)
{
- context.unregisterReceiver(m_BatteryBroadCastReceiver);
- m_BatteryBroadCastReceiver = null;
+ if (m_BatteryBroadCastReceiver != null)
+ {
+ try{
+ context.unregisterReceiver(m_BatteryBroadCastReceiver);
+ m_BatteryBroadCastReceiver = null;
+ }catch (IllegalArgumentException e)
+ {
+ if (!e.getMessage().contains("Receiver not registered"))
+ {
+ throw e;
+ }
+ }
+ }
}
private class BatteryBroadCastReceiver extends BroadcastReceiver
diff --git a/Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java b/Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
index abd77fb..d4e9b30 100644
--- a/Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
+++ b/Project/yj_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
@@ -39,8 +39,19 @@
public void stop(Context context)
{
- context.unregisterReceiver(m_BatteryBroadCastReceiver);
- m_BatteryBroadCastReceiver = null;
+ if (m_BatteryBroadCastReceiver != null)
+ {
+ try{
+ context.unregisterReceiver(m_BatteryBroadCastReceiver);
+ m_BatteryBroadCastReceiver = null;
+ }catch (IllegalArgumentException e)
+ {
+ if (!e.getMessage().contains("Receiver not registered"))
+ {
+ throw e;
+ }
+ }
+ }
}
private class BatteryBroadCastReceiver extends BroadcastReceiver
diff --git a/Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java b/Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
index abd77fb..d4e9b30 100644
--- a/Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
+++ b/Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java
@@ -39,8 +39,19 @@
public void stop(Context context)
{
- context.unregisterReceiver(m_BatteryBroadCastReceiver);
- m_BatteryBroadCastReceiver = null;
+ if (m_BatteryBroadCastReceiver != null)
+ {
+ try{
+ context.unregisterReceiver(m_BatteryBroadCastReceiver);
+ m_BatteryBroadCastReceiver = null;
+ }catch (IllegalArgumentException e)
+ {
+ if (!e.getMessage().contains("Receiver not registered"))
+ {
+ throw e;
+ }
+ }
+ }
}
private class BatteryBroadCastReceiver extends BroadcastReceiver
--
Gitblit v1.8.0