chore: update logic of webdav

Author: SlotSun

simple_live_app/lib/modules/sync/remote_sync/webdav/remote_sync_webdav_controller.dart

@@ -22,6 +22,7 @@ import 'package:simple_live_app/models/db/history.dart';
 import 'package:simple_live_app/requests/webdav_client.dart';
 import 'package:simple_live_app/services/bilibili_account_service.dart';
 import 'package:simple_live_app/services/db_service.dart';
+import 'package:simple_live_app/services/douyin_account_service.dart';
 import 'package:simple_live_app/services/local_storage_service.dart';
 import 'package:simple_live_app/services/migration_service.dart';
 
@@ -32,7 +33,8 @@ class RemoteSyncWebDAVController extends BaseController {
   var isSyncFollows = true.obs;
   var isSyncHistories = true.obs;
   var isSyncBlockWord = true.obs;
-  var isSyncBilibiliAccount = true.obs;
+  var isSyncAccount = true.obs;
+  var isSyncSetting = true.obs;
 
   late DAVClient davClient;
   var user = "--".obs;
@@ -42,7 +44,7 @@ class RemoteSyncWebDAVController extends BaseController {
   final _userFollowJsonName = 'SimpleLive_follows.json';
   final _userHistoriesJsonName = 'SimpleLive_histories.json';
   final _userBlockedWordJsonName = 'SimpleLive_blocked_word.json';
-  final _userBilibiliAccountJsonName = 'SimpleLive_bilibili_account.json';
+  final _userAccountJsonName = 'SimpleLive_bilibili_account.json';
   final _userTagsJsonName = 'SimpleLive_Tags.json';
   final _userSettingsJsonName = 'SimpleLive_Settings.json';
 
@@ -144,7 +146,7 @@ class RemoteSyncWebDAVController extends BaseController {
         var result = await davClient.backup(Uint8List.fromList(value));
         if (result) {
           SmartDialog.showToast("上传成功");
-          DateTime uploadTime =DateTime.now();
+          DateTime uploadTime = DateTime.now();
           lastUploadTime.value = Utils.parseTime(uploadTime);
           LocalStorageService.instance.setValue(LocalStorageService.kWebDAVLastUploadTime, uploadTime.millisecondsSinceEpoch);
         } else {
@@ -201,18 +203,23 @@ class RemoteSyncWebDAVController extends BaseController {
           .writeAsString(jsonEncode(dataShieldListMap));
 
       // bilibili_account
-      var userBiliAccountCookieMap = {
-        'data': {'cookie': BiliBiliAccountService.instance.cookie}
+      var userAccountCookieMap = {
+        'data': {
+          'cookie': BiliBiliAccountService.instance.cookie,
+          'douyin_cookie': DouyinAccountService.instance.cookie
+        }
       };
-      final bilibiliAccountJsonFile =
-          File(join(profile.path, _userBilibiliAccountJsonName));
-      await bilibiliAccountJsonFile
-          .writeAsString(jsonEncode(userBiliAccountCookieMap));
+      final accountJsonFile = File(join(profile.path, _userAccountJsonName));
+      await accountJsonFile.writeAsString(jsonEncode(userAccountCookieMap));
       await userTagsJsonFile.writeAsString(jsonEncode(dataTagsMap));
-      // 同步所有设置
-      var settingList = LocalStorageService.instance.settingsBox.toMap();
+      // 根据需要同步部分设置，其中 HiveDbVer为必须项
       var dataSettingListMap = {
-        'data': settingList
+        'data': {
+          LocalStorageService.kHiveDbVer: LocalStorageService.instance
+              .getValue(LocalStorageService.kHiveDbVer, 10708),
+          LocalStorageService.kWebDAVLastUploadTime:
+              DateTime.now().millisecondsSinceEpoch,
+        }
       };
       final settingJsonFile = File(join(profile.path,  _userSettingsJsonName));
       await settingJsonFile.writeAsString(jsonEncode(dataSettingListMap));
@@ -244,7 +251,7 @@ class RemoteSyncWebDAVController extends BaseController {
     MigrationService.migrateDataByVersion();
     SmartDialog.dismiss();
     SmartDialog.showToast('同步完成');
-    DateTime recoverTime =DateTime.now();
+    DateTime recoverTime = DateTime.now();
     lastRecoverTime.value = Utils.parseTime(recoverTime);
     LocalStorageService.instance.setValue(LocalStorageService.kWebDAVLastRecoverTime, recoverTime.millisecondsSinceEpoch);
   }
@@ -288,20 +295,23 @@ class RemoteSyncWebDAVController extends BaseController {
         } catch (e) {
           Log.e('同步用户屏蔽词失败:$e', StackTrace.current);
         }
-      } else if (file.name == _userBilibiliAccountJsonName &&
-          isSyncBilibiliAccount.value) {
+      } else if (file.name == _userAccountJsonName && isSyncAccount.value) {
         try {
-          var cookie = jsonData['cookie'];
-          BiliBiliAccountService.instance.setCookie(cookie);
+          var biliCookie = jsonData['cookie'];
+          BiliBiliAccountService.instance.setCookie(biliCookie);
           BiliBiliAccountService.instance.loadUserInfo();
-          Log.i('已同步哔哩哔哩账号');
+          var douyinCookie = jsonData['douyin_cookie'];
+          DouyinAccountService.instance.setCookie(douyinCookie);
+          DouyinAccountService.instance.loadUserInfo();
+          Log.i('已同步用户平台账号');
         } catch (e) {
-          Log.e('同步哔哩哔哩账号失败：$e',StackTrace.current);
+          Log.e('同步用户平台账号失败：$e', StackTrace.current);
         }
-      } else if (file.name == _userSettingsJsonName) {
+      } else if (file.name == _userSettingsJsonName && isSyncSetting.value) {
         try{
-          await LocalStorageService.instance.settingsBox.clear();
-          LocalStorageService.instance.settingsBox.putAll(jsonData);
+          jsonData.forEach((key, value) {
+            LocalStorageService.instance.setValue(key, value);
+          },);
           Log.i('已同步用户设置');
         } catch (e) {
           Log.e("同步用户设置失败：$e", StackTrace.current);
@@ -349,7 +359,11 @@ class RemoteSyncWebDAVController extends BaseController {
     isSyncBlockWord.value = !isSyncBlockWord.value;
   }
 
-  void changeIsSyncBilibiliAccount() {
-    isSyncBilibiliAccount.value = !isSyncBilibiliAccount.value;
+  void changeIsSyncAccount() {
+    isSyncAccount.value = !isSyncAccount.value;
+  }
+
+  void changeIsSyncSetting() {
+    isSyncSetting.value = !isSyncSetting.value;
   }
 }

simple_live_app/lib/modules/sync/remote_sync/webdav/remote_sync_webdav_page.dart

@@ -124,13 +124,23 @@ class RemoteSyncWebDAVPage extends GetView<RemoteSyncWebDAVController> {
           Obx(
             () => CheckboxListTile(
               secondary: const Icon(Remix.account_circle_line),
-              title: const Text("同步哔哩哔哩账号"),
-              value: controller.isSyncBilibiliAccount.value,
+              title: const Text("同步用户平台账号"),
+              value: controller.isSyncAccount.value,
               controlAffinity: ListTileControlAffinity.trailing,
-              onChanged: (value) => controller.changeIsSyncBilibiliAccount(),
+              onChanged: (value) => controller.changeIsSyncAccount(),
             ),
           ),
           AppStyle.divider,
+          Obx(
+                () => CheckboxListTile(
+              secondary: const Icon(Remix.user_settings_line),
+              title: const Text("同步用户设置"),
+              value: controller.isSyncSetting.value,
+              controlAffinity: ListTileControlAffinity.trailing,
+              onChanged: (value) => controller.changeIsSyncSetting(),
+            ),
+          ),
+          //todo: 启动应用时自动同步数据
         ],
       ),
     );