Просмотр исходного кода

[modify]修复小听思路问题

zk 1 год назад
Родитель
Сommit
886cce237f

+ 9 - 1
lib/base/base_request.dart

@@ -2,8 +2,10 @@ import 'dart:io';
 
 import 'package:electronic_assistant/data/repositories/account_repository.dart';
 import 'package:electronic_assistant/utils/app_info_util.dart';
+import 'package:electronic_assistant/utils/mmkv_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:uuid/uuid.dart';
 
 part 'base_request.g.dart';
 
@@ -114,6 +116,12 @@ class BaseRequest {
   }
 
   void initDeviceInfo() {
-    androidId = "1123123qweqw12";
+    //TODO  暂时使用UUID作为设备唯一标识
+    androidId = KVUtil.getString('androidId', '');
+    if (androidId == null || androidId?.isEmpty == true) {
+      String uuid = const Uuid().v4();
+      KVUtil.putString('androidId', uuid);
+      androidId = uuid;
+    }
   }
 }

+ 3 - 3
lib/module/chat/controller.dart

@@ -43,6 +43,9 @@ class ChatController extends BaseController {
     if (arguments.isEmpty) {
       return;
     }
+    if (arguments.length > 1 && arguments[1] is Agenda) {
+      agenda.value = arguments[1];
+    }
     if (arguments[0] is TalkBean) {
       talkInfo.value = arguments[0];
       sendInitialMessage();
@@ -52,9 +55,6 @@ class ChatController extends BaseController {
           .then((response) => talkInfo.value = response.talkInfo)
           .then((_) => sendInitialMessage());
     }
-    if (arguments.length > 1 && arguments[1] is Agenda) {
-      agenda.value = arguments[1];
-    }
   }
 
   void sendInitialMessage() {

+ 2 - 1
lib/module/talk/todo/controller.dart

@@ -5,6 +5,7 @@ import 'package:electronic_assistant/data/bean/agenda.dart';
 import 'package:electronic_assistant/data/repositories/agenda_repository.dart';
 import 'package:electronic_assistant/module/chat/view.dart';
 import 'package:electronic_assistant/utils/error_handler.dart';
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 import '../../../data/bean/agenda_list_all_bean.dart';
@@ -65,7 +66,7 @@ class TodoController extends BaseController {
       return;
     }
     bool isSetTodo = !agenda.todo.value;
-    agendaRepository.agendaTodo(agenda.id!, isSetTodo).then((value) {
+    agendaRepository.agendaTodo(agenda.id, isSetTodo).then((value) {
       agenda.todo.value = isSetTodo;
       requestMineTodoData();
     }).catchError((error) {

+ 5 - 5
lib/utils/mmkv_util.dart

@@ -3,14 +3,14 @@ import 'package:mmkv/mmkv.dart';
 class KVUtil {
   KVUtil._();
 
-  static MMKV? mmkv;
+  static MMKV? _mmkv;
 
   static init() async {
-    if (mmkv != null) {
+    if (_mmkv != null) {
       return;
     }
     await MMKV.initialize();
-    mmkv = MMKV.defaultMMKV();
+    _mmkv = MMKV.defaultMMKV();
   }
 
   static void putString(String key, String? value) {
@@ -46,7 +46,7 @@ class KVUtil {
   }
 
   static MMKV _getMMKV() {
-    mmkv ??= MMKV.defaultMMKV();
-    return mmkv!;
+    _mmkv ??= MMKV.defaultMMKV();
+    return _mmkv!;
   }
 }