From f2aec36705c0d9fa722759f518d43bdf394fa14a Mon Sep 17 00:00:00 2001 From: sunnylqm Date: Wed, 20 Mar 2024 21:47:44 +0800 Subject: [PATCH] remove blockupdate --- Example/testHotUpdate/e2e/NativeModule.test.ts | 9 +-------- Example/testHotUpdate/src/TestConsole.js | 7 ------- .../modules/update/UpdateContext.java | 7 ------- .../modules/update/UpdateModuleImpl.java | 17 ----------------- .../modules/update/UpdateModule.java | 5 ----- .../modules/update/UpdateModule.java | 12 ------------ ios/RCTPushy/RCTPushy.mm | 18 ------------------ 7 files changed, 1 insertion(+), 74 deletions(-) diff --git a/Example/testHotUpdate/e2e/NativeModule.test.ts b/Example/testHotUpdate/e2e/NativeModule.test.ts index 428fee6..f0b1acd 100644 --- a/Example/testHotUpdate/e2e/NativeModule.test.ts +++ b/Example/testHotUpdate/e2e/NativeModule.test.ts @@ -28,14 +28,7 @@ describe('测试Native模块的方法', () => { await element(by.id('done')).longPress(); await expect(element(by.id('done'))).toBeNotVisible(); }); - - it('setBlockUpdate', async () => { - await element(by.id('setBlockUpdate')).longPress(); - await element(by.id('submit')).longPress(); - await expect(element(by.text('done'))).toBeVisible(); - await element(by.id('done')).longPress(); - await expect(element(by.id('done'))).toBeNotVisible(); - }); + if (device.getPlatform() === 'android') { it('reloadUpdate', async () => { await element(by.id('reloadUpdate')).longPress(); diff --git a/Example/testHotUpdate/src/TestConsole.js b/Example/testHotUpdate/src/TestConsole.js index 8207d3e..1243f9d 100644 --- a/Example/testHotUpdate/src/TestConsole.js +++ b/Example/testHotUpdate/src/TestConsole.js @@ -66,13 +66,6 @@ export default function TestConsole({visible}) { setText(`setUuid\n${UUID}`); }, }, - { - name: 'setBlockUpdate', - invoke: () => { - setText('setBlockUpdate'); - setOptions({reason: 'application has been block', until: 1673082950}); - }, - }, { name: 'reloadUpdate', invoke: () => { diff --git a/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java b/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java index 65a031f..6014cc4 100644 --- a/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java +++ b/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java @@ -166,13 +166,6 @@ public class UpdateContext { return sp.getString(key, null); } - public void setBlockUpdate(int until, String reason) { - SharedPreferences.Editor editor = sp.edit(); - editor.putInt("blockUntil", until); - editor.putString("blockReason", reason); - editor.apply(); - } - public String getCurrentVersion() { return sp.getString("currentVersion", null); } 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 9eafb48..a681a48 100644 --- a/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java +++ b/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java @@ -192,23 +192,6 @@ public class UpdateModuleImpl { } } - public static void setBlockUpdate(UpdateContext updateContext, ReadableMap options,Promise promise) { - try { - final int until = options.getInt("until"); - final String reason = options.getString("reason"); - UiThreadUtil.runOnUiThread(new Runnable() { - @Override - public void run() { - updateContext.setBlockUpdate(until, reason); - } - }); - promise.resolve(true); - }catch (Exception e){ - promise.reject("执行报错:"+e.getMessage()); - } - - } - public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) { try { UiThreadUtil.runOnUiThread(new Runnable() { diff --git a/android/src/newarch/cn/reactnative/modules/update/UpdateModule.java b/android/src/newarch/cn/reactnative/modules/update/UpdateModule.java index 25abe61..1f986a9 100644 --- a/android/src/newarch/cn/reactnative/modules/update/UpdateModule.java +++ b/android/src/newarch/cn/reactnative/modules/update/UpdateModule.java @@ -108,11 +108,6 @@ public class UpdateModule extends NativePushySpec { UpdateModuleImpl.markSuccess(updateContext,promise); } - @Override - public void setBlockUpdate(ReadableMap options,Promise promise) { - UpdateModuleImpl.setBlockUpdate(updateContext,options,promise); - } - @Override public void setUuid(final String uuid, Promise promise) { UpdateModuleImpl.setUuid(updateContext,uuid,promise); diff --git a/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java b/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java index 094423d..b45149e 100644 --- a/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java +++ b/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java @@ -239,18 +239,6 @@ public class UpdateModule extends ReactContextBaseJavaModule { }); } - @ReactMethod - public void setBlockUpdate(ReadableMap options) { - final int until = options.getInt("until"); - final String reason = options.getString("reason"); - UiThreadUtil.runOnUiThread(new Runnable() { - @Override - public void run() { - updateContext.setBlockUpdate(until, reason); - } - }); - } - @ReactMethod public void setUuid(final String uuid) { UiThreadUtil.runOnUiThread(new Runnable() { diff --git a/ios/RCTPushy/RCTPushy.mm b/ios/RCTPushy/RCTPushy.mm index 850ef32..1f64a4c 100644 --- a/ios/RCTPushy/RCTPushy.mm +++ b/ios/RCTPushy/RCTPushy.mm @@ -192,24 +192,6 @@ RCT_EXPORT_MODULE(RCTPushy); return self; } -RCT_EXPORT_METHOD(setBlockUpdate:(NSDictionary *)options - resolver:(RCTPromiseResolveBlock)resolve - rejecter:(RCTPromiseRejectBlock)reject) -{ - // NSMutableDictionary *blockUpdateInfo = [NSMutableDictionary new]; - // blockUpdateInfo[@"reason"] = options[@"reason"]; - // blockUpdateInfo[@"until"] = options[@"until"]; - @try { - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - [defaults setObject:options forKey:keyBlockUpdate]; - [defaults synchronize]; - resolve(@true); - } - @catch (NSException *exception) { - reject(@"执行报错", nil, nil); - } -} - RCT_EXPORT_METHOD(setUuid:(NSString *)uuid resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {