Merge branch 'reactnativecn:master' into master

Author: bozaigao

Example/harmony_use_pushy/yarn.lock

@@ -204,17 +204,18 @@ const styles = StyleSheet.create({
 });
 
 // use Pushy for China users
-// const updateClient = new Pushy({
-//   appKey,
-//   debug: true,
-// });
-
-// use Cresc for global users
-const updateClient = new Cresc({
+const updateClient = new Pushy({
   appKey,
   debug: true,
+  // updateStrategy: 'silentAndLater',
 });
 
+// use Cresc for global users
+// const updateClient = new Cresc({
+//   appKey,
+//   debug: true,
+// });
+
 export default function Root() {
   return (
     <UpdateProvider client={updateClient}>

Example/testHotUpdate/src/index.tsx

@@ -176,6 +176,35 @@ public void run() {
         });
     }
 
+    public static void restartApp(final ReactApplicationContext mContext, Promise promise) {
+          UiThreadUtil.runOnUiThread(new Runnable() {
+              @Override
+              public void run() {
+                  try {
+                      final Context application = mContext.getApplicationContext();
+                      ReactInstanceManager instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
+
+                      instanceManager.recreateReactContextInBackground();
+                      promise.resolve(true);
+
+                  } catch (Throwable err) {
+                      promise.reject("restartApp failed: "+err.getMessage());
+                      Log.e("pushy", "restartApp failed", err);
+
+                      final Activity currentActivity = mContext.getCurrentActivity();
+                      if (currentActivity == null) {
+                          return;
+                      }
+                      currentActivity.runOnUiThread(new Runnable() {
+                          @Override
+                          public void run() {
+                              currentActivity.recreate();
+                          }
+                      });
+                  }
+              }
+          });
+      }
 
     public static void setNeedUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
         final String hash = options.getString("hash");

android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java

@@ -97,6 +97,11 @@ public void reloadUpdate(ReadableMap options,Promise promise) {
         UpdateModuleImpl.reloadUpdate(updateContext, mContext, options,promise);
     }
 
+    @Override
+    public void restartApp(Promise promise) {
+        UpdateModuleImpl.restartApp(mContext, promise);
+    }
+
     @Override
     public void setNeedUpdate(ReadableMap options,Promise promise) {
         UpdateModuleImpl.setNeedUpdate(updateContext, options,promise);

android/src/newarch/cn/reactnative/modules/update/UpdateModule.java

@@ -224,6 +224,29 @@ public void run() {
         });
     }
 
+    @ReactMethod
+    public void restartApp(final Promise promise) {
+
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    final Context application = getReactApplicationContext().getApplicationContext();
+                    ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
+                    if (instanceManager == null) {
+                        instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
+                    }
+                    instanceManager.recreateReactContextInBackground();
+                    promise.resolve(true);
+
+                } catch (Throwable err) {
+                    promise.reject(err);
+                    Log.e("pushy", "restartApp failed ", err);
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void setNeedUpdate(ReadableMap options) {
         final String hash = options.getString("hash");

android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java

@@ -338,6 +338,26 @@ - (instancetype)init
     }
 }
 
+RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    @try {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.bridge reload];
+        });
+        #if __has_include("RCTReloadCommand.h")
+            // reload 0.62+
+            RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+            RCTTriggerReloadCommandListeners(@"pushy restartApp");
+        #endif
+
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", exception.reason, nil);
+    }
+}
+
 RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
                                     rejecter:(RCTPromiseRejectBlock)reject)
 {

ios/RCTPushy/RCTPushy.mm

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.27.0",
+  "version": "10.28.2",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

package.json

@@ -15,6 +15,7 @@ export interface Spec extends TurboModule {
   getLocalHashInfo(hash: string): Promise<string>;
   setUuid(uuid: string): Promise<void>;
   reloadUpdate(options: { hash: string }): Promise<void>;
+  restartApp(): Promise<void>;
   setNeedUpdate(options: { hash: string }): Promise<void>;
   markSuccess(): Promise<void>;
   downloadPatchFromPpk(options: {