Browse Source

Merge branch 'new_dev' of github.com:deepcloud2048/deep_voice into new_dev

newdev_shunjiawei
lxm 12 months ago
parent
commit
d90797f5de
  1. 8
      lib/data/services/account_service.dart
  2. 9
      lib/data/services/db/database_helper.dart
  3. 1
      lib/modules/profile/controllers/profile_controller.dart

8
lib/data/services/account_service.dart

@ -1,9 +1,11 @@
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart'; import 'package:get_storage/get_storage.dart';
import 'package:logger/logger.dart'; import 'package:logger/logger.dart';
import '../../core/utils/synchrodata.dart';
import '../../modules/login/controllers/googleLogin.dart'; import '../../modules/login/controllers/googleLogin.dart';
import '../../modules/login/controllers/facebookLogin.dart'; import '../../modules/login/controllers/facebookLogin.dart';
import '../services/network/api.dart'; import '../services/network/api.dart';
import 'db/database_helper.dart';
/// 账号管理服务 /// 账号管理服务
/// ///
@ -76,6 +78,12 @@ class AccountService extends GetxService {
/// 返回操作结果,包含成功状态和错误信息 /// 返回操作结果,包含成功状态和错误信息
Future<AccountOperationResult> signOut() async { Future<AccountOperationResult> signOut() async {
try { try {
// 上传会议记录操作记录
await Synchrodata.uploadOperationRecords();
// 关闭数据库连接
await DatabaseHelper().close();
// 清理本地数据 // 清理本地数据
final dataCleaned = await clearUserData(); final dataCleaned = await clearUserData();
if (!dataCleaned) { if (!dataCleaned) {

9
lib/data/services/db/database_helper.dart

@ -22,6 +22,8 @@ class DatabaseHelper {
Map? userInfo = storage.read("user_info"); Map? userInfo = storage.read("user_info");
if (userInfo != null) { if (userInfo != null) {
_userId = userInfo['user']['uid']; _userId = userInfo['user']['uid'];
} else {
_userId = '';
} }
String path = join( String path = join(
await getDatabasesPath(), await getDatabasesPath(),
@ -115,4 +117,11 @@ class DatabaseHelper {
}); });
await batch.commit(); await batch.commit();
} }
Future<void> close() async {
if (_database != null) {
await _database!.close();
_database = null;
}
}
} }

1
lib/modules/profile/controllers/profile_controller.dart

@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:logger/logger.dart'; import 'package:logger/logger.dart';
import '../../../data/models/user_Info.dart'; import '../../../data/models/user_Info.dart';
import '../../settings/controllers/settings_controller.dart';
import 'dart:io'; import 'dart:io';
//import 'dart:convert'; //import 'dart:convert';
import 'package:flutter_image_compress/flutter_image_compress.dart'; import 'package:flutter_image_compress/flutter_image_compress.dart';

Loading…
Cancel
Save