Merge branch 'pr/SlotSun/620' into dev

xiaoyaocz · xiaoyaocz · commit 0e339a8d57d7 · 2025-04-07T16:39:47.000+08:00
diff --git a/simple_live_app/lib/modules/sync/remote_sync/room/remote_sync_room_controller.dart b/simple_live_app/lib/modules/sync/remote_sync/room/remote_sync_room_controller.dart
@@ -169,10 +169,11 @@ class RemoteSyncRoomController extends BaseController {
     try {
       var jsonBody = json.decode(data);
       if (overlay) {
-        AppSettingsController.instance.shieldList.clear();
+        AppSettingsController.instance.clearShieldList();
       }
       for (var item in jsonBody) {
-        AppSettingsController.instance.shieldList.add(item);
+        // add to Hive
+        AppSettingsController.instance.addShieldList(item);
       }
       SmartDialog.showToast('已同步屏蔽词');
     } catch (e) {
diff --git a/simple_live_tv_app/lib/modules/sync/sync_controller.dart b/simple_live_tv_app/lib/modules/sync/sync_controller.dart
@@ -148,10 +148,10 @@ class SyncController extends BaseController {
     try {
       var jsonBody = json.decode(data);
       if (overlay) {
-        AppSettingsController.instance.shieldList.clear();
+        AppSettingsController.instance.clearShieldList();
       }
       for (var item in jsonBody) {
-        AppSettingsController.instance.shieldList.add(item);
+        AppSettingsController.instance.addShieldList(item);
       }
       SmartDialog.showToast('已同步屏蔽词');
     } catch (e) {

Original file line number	Diff line number	Diff line change
`@@ -169,10 +169,11 @@ class RemoteSyncRoomController extends BaseController {`
`169`	`169`	`try {`
`170`	`170`	`var jsonBody = json.decode(data);`
`171`	`171`	`if (overlay) {`
`172`		`- AppSettingsController.instance.shieldList.clear();`
	`172`	`+ AppSettingsController.instance.clearShieldList();`
`173`	`173`	`}`
`174`	`174`	`for (var item in jsonBody) {`
`175`		`- AppSettingsController.instance.shieldList.add(item);`
	`175`	`+ // add to Hive`
	`176`	`+ AppSettingsController.instance.addShieldList(item);`
`176`	`177`	`}`
`177`	`178`	`SmartDialog.showToast('已同步屏蔽词');`
`178`	`179`	`} catch (e) {`
Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,10 @@ class SyncController extends BaseController {`
`148`	`148`	`try {`
`149`	`149`	`var jsonBody = json.decode(data);`
`150`	`150`	`if (overlay) {`
`151`		`- AppSettingsController.instance.shieldList.clear();`
	`151`	`+ AppSettingsController.instance.clearShieldList();`
`152`	`152`	`}`
`153`	`153`	`for (var item in jsonBody) {`
`154`		`- AppSettingsController.instance.shieldList.add(item);`
	`154`	`+ AppSettingsController.instance.addShieldList(item);`
`155`	`155`	`}`
`156`	`156`	`SmartDialog.showToast('已同步屏蔽词');`
`157`	`157`	`} catch (e) {`