From 8c47ada192c22f9bdb1f634abe0ac5046c9a057c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 20 十月 2020 17:22:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/U3DRepository

---
 Project/js_sdk/src/main/java/com/secondworld/univeralsdk/BatteryUtil.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

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

--
Gitblit v1.8.0