Update version to 10.37.1 in package.json and improve hash handling in UpdateModuleImpl.java

Author: sunnylqm

Example/testHotUpdate/bun.lock

@@ -21,7 +21,7 @@
     "react-native-paper": "^5.14.5",
     "react-native-safe-area-context": "^5.6.2",
     "react-native-svg": "^15.15.0",
-    "react-native-update": "^10.36.2",
+    "react-native-update": "^10.37.0",
     "react-native-vector-icons": "^10.3.0"
   },
   "devDependencies": {

Example/testHotUpdate/package.json

@@ -134,13 +134,21 @@ public void onDownloadFailed(Throwable error) {
         }
     }
 
-    public static void reloadUpdate(final UpdateContext updateContext,final ReactApplicationContext mContext, final ReadableMap options, final Promise promise) {
+    public static void reloadUpdate(final UpdateContext updateContext, final ReactApplicationContext mContext, final ReadableMap options, final Promise promise) {
         final String hash = options.getString("hash");
+        restartApp(updateContext, mContext, hash, promise);
+    }
+
+
+    public static void restartApp(final UpdateContext updateContext, final ReactApplicationContext mContext, final String hash, final Promise promise) {
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-
-                updateContext.switchVersion(hash);
+                // 如果提供了 hash，则切换版本
+                if (hash != null && updateContext != null) {
+                    updateContext.switchVersion(hash);
+                }
+                
                 final Context application = mContext.getApplicationContext();
                 JSBundleLoader loader = JSBundleLoader.createFileLoader(UpdateContext.getBundleUrl(application));
                 try {
@@ -166,6 +174,7 @@ public void run() {
                 } catch (Throwable err) {
                     final Activity currentActivity = mContext.getCurrentActivity();
                     if (currentActivity == null) {
+                        promise.reject(err);
                         return;
                     }
                     try {
@@ -203,49 +212,25 @@ public void run() {
 
                         // Invoke the reload method with a reason
                         reloadMethod.invoke(reactHost, "react-native-update");
+                        promise.resolve(true);
                     } catch (Throwable e) {
                         currentActivity.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
                                 currentActivity.recreate();
                             }
                         });
+                        promise.resolve(true);
                     }
                 }
-                promise.resolve(true);
             }
         });
     }
 
+
     public static void restartApp(final ReactApplicationContext mContext, final 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();
-                          }
-                      });
-                  }
-              }
-          });
-      }
+        restartApp(null, mContext, null, promise);
+    }
 
     public static void setNeedUpdate(final UpdateContext updateContext, final ReadableMap options, final Promise promise) {
         final String hash = options.getString("hash");
@@ -320,3 +305,4 @@ public static void getLocalHashInfo(UpdateContext updateContext, final String ha
     }
 
 }
+

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

@@ -104,27 +104,27 @@ public void downloadPatchFromPackage(ReadableMap options, final Promise promise)
 
     @Override
     public void downloadPatchFromPpk(ReadableMap options, final Promise promise) {
-        UpdateModuleImpl.downloadPatchFromPpk(updateContext,options,promise);
+        UpdateModuleImpl.downloadPatchFromPpk(updateContext, options, promise);
     }
 
     @Override
     public void reloadUpdate(ReadableMap options,Promise promise) {
-        UpdateModuleImpl.reloadUpdate(updateContext, mContext, options,promise);
+        UpdateModuleImpl.reloadUpdate(updateContext, mContext, options, promise);
     }
 
     @Override
     public void restartApp(Promise promise) {
-        UpdateModuleImpl.restartApp(mContext, promise);
+        UpdateModuleImpl.restartApp(updateContext, mContext, null, promise);
     }
 
     @Override
     public void setNeedUpdate(ReadableMap options,Promise promise) {
-        UpdateModuleImpl.setNeedUpdate(updateContext, options,promise);
+        UpdateModuleImpl.setNeedUpdate(updateContext, options, promise);
     }
 
     @Override
     public void markSuccess(Promise promise) {
-        UpdateModuleImpl.markSuccess(updateContext,promise);
+        UpdateModuleImpl.markSuccess(updateContext, promise);
     }
 
     @Override

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

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