mirror of
https://gitcode.com/gh_mirrors/re/react-native-pushy.git
synced 2025-09-16 12:11:39 +08:00
fix android
This commit is contained in:
@@ -105,7 +105,7 @@ public class UpdateModuleImpl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadBundleLegacy() {
|
private void loadBundleLegacy(ReactApplicationContext mContext) {
|
||||||
final Activity currentActivity = mContext.getCurrentActivity();
|
final Activity currentActivity = mContext.getCurrentActivity();
|
||||||
if (currentActivity == null) {
|
if (currentActivity == null) {
|
||||||
return;
|
return;
|
||||||
@@ -122,7 +122,7 @@ public class UpdateModuleImpl {
|
|||||||
public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options,Promise promise) {
|
public static void reloadUpdate(UpdateContext updateContext, ReactApplicationContext mContext, ReadableMap options,Promise promise) {
|
||||||
final String hash = options.getString("hash");
|
final String hash = options.getString("hash");
|
||||||
|
|
||||||
if(hash==null || hash.isEmpty()){
|
if (hash == null || hash.isEmpty()) {
|
||||||
promise.reject("hash不能为空");
|
promise.reject("hash不能为空");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -156,7 +156,7 @@ public class UpdateModuleImpl {
|
|||||||
} catch (Throwable err) {
|
} catch (Throwable err) {
|
||||||
promise.reject(err);
|
promise.reject(err);
|
||||||
Log.e("pushy", "switchVersion failed ", err);
|
Log.e("pushy", "switchVersion failed ", err);
|
||||||
loadBundleLegacy();
|
loadBundleLegacy(mContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -182,7 +182,7 @@ public class UpdateModuleImpl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}catch (Exception e){
|
} catch (Exception e){
|
||||||
promise.reject("执行报错:"+e.getMessage());
|
promise.reject("执行报错:"+e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -196,7 +196,7 @@ public class UpdateModuleImpl {
|
|||||||
promise.resolve(true);
|
promise.resolve(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}catch (Exception e){
|
} catch (Exception e){
|
||||||
promise.reject("执行报错:"+e.getMessage());
|
promise.reject("执行报错:"+e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -210,7 +210,7 @@ public class UpdateModuleImpl {
|
|||||||
promise.resolve(true);
|
promise.resolve(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}catch (Exception e){
|
} catch (Exception e){
|
||||||
promise.reject("执行报错:"+e.getMessage());
|
promise.reject("执行报错:"+e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -246,9 +246,9 @@ public class UpdateModuleImpl {
|
|||||||
|
|
||||||
public static void getLocalHashInfo(UpdateContext updateContext, final String hash, Promise promise) {
|
public static void getLocalHashInfo(UpdateContext updateContext, final String hash, Promise promise) {
|
||||||
String value = updateContext.getKv("hash_" + hash);
|
String value = updateContext.getKv("hash_" + hash);
|
||||||
if(check(value)){
|
if (check(value)) {
|
||||||
promise.resolve(value);
|
promise.resolve(value);
|
||||||
}else {
|
} else {
|
||||||
promise.reject("校验报错:json字符串格式错误");
|
promise.reject("校验报错:json字符串格式错误");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -9,7 +9,7 @@ import android.util.Log;
|
|||||||
|
|
||||||
import com.facebook.react.ReactApplication;
|
import com.facebook.react.ReactApplication;
|
||||||
import com.facebook.react.ReactInstanceManager;
|
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.Promise;
|
||||||
import com.facebook.react.bridge.ReactApplicationContext;
|
import com.facebook.react.bridge.ReactApplicationContext;
|
||||||
import com.facebook.react.bridge.ReactContext;
|
import com.facebook.react.bridge.ReactContext;
|
||||||
@@ -32,7 +32,7 @@ import static androidx.core.content.FileProvider.getUriForFile;
|
|||||||
public class UpdateModule extends ReactContextBaseJavaModule {
|
public class UpdateModule extends ReactContextBaseJavaModule {
|
||||||
UpdateContext updateContext;
|
UpdateContext updateContext;
|
||||||
public static ReactApplicationContext mContext;
|
public static ReactApplicationContext mContext;
|
||||||
private LifecycleEventListener mLifecycleEventListener = null;
|
// private LifecycleEventListener mLifecycleEventListener = null;
|
||||||
|
|
||||||
public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
|
public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
|
||||||
super(reactContext);
|
super(reactContext);
|
||||||
@@ -171,7 +171,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void loadBundleLegacy() {
|
private void loadBundleLegacy() {
|
||||||
final Activity currentActivity = mContext.getCurrentActivity();
|
final Activity currentActivity = getCurrentActivity();
|
||||||
if (currentActivity == null) {
|
if (currentActivity == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "react-native-update",
|
"name": "react-native-update",
|
||||||
"version": "10.19.4",
|
"version": "10.19.5",
|
||||||
"description": "react-native hot update",
|
"description": "react-native hot update",
|
||||||
"main": "src/index",
|
"main": "src/index",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
Reference in New Issue
Block a user