From 1578130e17f8cc393f6a43cefccebcdb9a1432bc Mon Sep 17 00:00:00 2001 From: "sunny.luo" Date: Thu, 26 Dec 2024 15:07:55 +0800 Subject: [PATCH] fix android --- .../modules/update/UpdateModuleImpl.java | 16 ++++++++-------- .../reactnative/modules/update/UpdateModule.java | 6 +++--- package.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java b/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java index 8e1f665e..b4a03c03 100644 --- a/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java +++ b/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java @@ -105,7 +105,7 @@ public void onDownloadFailed(Throwable error) { } } - private void loadBundleLegacy() { + private void loadBundleLegacy(ReactApplicationContext mContext) { final Activity currentActivity = mContext.getCurrentActivity(); if (currentActivity == null) { return; @@ -122,7 +122,7 @@ public void run() { public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options,Promise promise) { final String hash = options.getString("hash"); - if(hash==null || hash.isEmpty()){ + if (hash == null || hash.isEmpty()) { promise.reject("hash不能为空"); return; } @@ -156,7 +156,7 @@ public void run() { } catch (Throwable err) { promise.reject(err); Log.e("pushy", "switchVersion failed ", err); - loadBundleLegacy(); + loadBundleLegacy(mContext); } } }); @@ -182,7 +182,7 @@ public void run() { } } }); - }catch (Exception e){ + } catch (Exception e){ promise.reject("执行报错:"+e.getMessage()); } } @@ -196,7 +196,7 @@ public void run() { promise.resolve(true); } }); - }catch (Exception e){ + } catch (Exception e){ promise.reject("执行报错:"+e.getMessage()); } } @@ -210,7 +210,7 @@ public void run() { promise.resolve(true); } }); - }catch (Exception e){ + } catch (Exception e){ promise.reject("执行报错:"+e.getMessage()); } @@ -246,9 +246,9 @@ public void run() { public static void getLocalHashInfo(UpdateContext updateContext, final String hash, Promise promise) { String value = updateContext.getKv("hash_" + hash); - if(check(value)){ + if (check(value)) { promise.resolve(value); - }else { + } else { promise.reject("校验报错:json字符串格式错误"); } diff --git a/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java b/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java index c5f7c742..0dd39072 100644 --- a/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java +++ b/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java @@ -9,7 +9,7 @@ import com.facebook.react.ReactApplication; import com.facebook.react.ReactInstanceManager; -import com.facebook.react.bridge.LifecycleEventListener; +// import com.facebook.react.bridge.LifecycleEventListener; import com.facebook.react.bridge.Promise; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContext; @@ -32,7 +32,7 @@ public class UpdateModule extends ReactContextBaseJavaModule { UpdateContext updateContext; public static ReactApplicationContext mContext; - private LifecycleEventListener mLifecycleEventListener = null; + // private LifecycleEventListener mLifecycleEventListener = null; public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) { super(reactContext); @@ -171,7 +171,7 @@ public void onDownloadFailed(Throwable error) { } private void loadBundleLegacy() { - final Activity currentActivity = mContext.getCurrentActivity(); + final Activity currentActivity = getCurrentActivity(); if (currentActivity == null) { return; } diff --git a/package.json b/package.json index 3c63c385..f8395a5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-update", - "version": "10.19.4", + "version": "10.19.5", "description": "react-native hot update", "main": "src/index", "scripts": {