Merge remote-tracking branch 'origin/master'

# Conflicts: # lib/app/mobile/controller/settings/mobile_sync_password_settings_controller.dart # lib/service/crypt/crypt_service.dart # pubspec.lock
lyming99 · May 6, 2024 · dca89ee · dca89ee
2 parents 81ef06d + bd87453
commit dca89ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -24,7 +24,9 @@ class AppController extends MvcController {
  void onInitState(fluent.BuildContext context) {
  super.onInitState(context);
  try {
- FlutterDisplayMode.setHighRefreshRate();
+ if(Platform.isAndroid) {
+ FlutterDisplayMode.setHighRefreshRate();
+ }
  } catch (e) {
  print(e);
  }

diff --git a/lib/service/sync/impl/record_sync_service_impl.dart b/lib/service/sync/impl/record_sync_service_impl.dart
@@ -250,6 +250,8 @@ class RecordSyncServiceImpl extends RecordSyncService {
  updateTime: e.updateTime,
  deleted: e.deleted,
  hasUpload: e.hasUpload,
+ securityVersion:
+ serviceManager.cryptService.getCurrentPassword()?.version,
  ))
  .toList();
  }

diff --git a/lib/service/user/user_service.dart b/lib/service/user/user_service.dart
@@ -64,6 +64,9 @@ class UserService with ChangeNotifier {
  if (noteServer == null) {
  return null;
  }
+ if(kDebugMode){
+ return "http://127.0.0.1:9898";
+ }
  return "http://${noteServer.host}:${noteServer.port}";
  }