From dba8e0bb525a9d6946e7939094d4e4f354d24cf4 Mon Sep 17 00:00:00 2001
From: Linloir <3145078758@qq.com>
Date: Thu, 20 Oct 2022 18:17:39 +0800
Subject: [PATCH] RollBack - Roll back avatar precache (no actual effect)

---
 inno_setup.iss                            |  2 +-
 lib/common/avatar/avatar.dart             |  4 ++--
 lib/common/avatar/cubit/avatar_cubit.dart | 14 ++------------
 lib/common/avatar/cubit/avatar_state.dart |  7 ++-----
 lib/main.dart                             |  4 ++--
 5 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/inno_setup.iss b/inno_setup.iss
index 56abf72..1b01d58 100644
--- a/inno_setup.iss
+++ b/inno_setup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "LChatClient"
-#define MyAppVersion "1.0"
+#define MyAppVersion "1.1"
 #define MyAppPublisher "Linloir"
 #define MyAppExeName "LChatClient.exe"
 #define MyAppComp "com.linloir"
diff --git a/lib/common/avatar/avatar.dart b/lib/common/avatar/avatar.dart
index 681df3a..b27b3bd 100644
--- a/lib/common/avatar/avatar.dart
+++ b/lib/common/avatar/avatar.dart
@@ -1,7 +1,7 @@
 /*
  * @Author       : Linloir
  * @Date         : 2022-10-13 21:49:53
- * @LastEditTime : 2022-10-20 16:53:26
+ * @LastEditTime : 2022-10-20 18:02:23
  * @Description  : 
  */
 
@@ -82,7 +82,7 @@ class UserAvatar extends StatelessWidget {
                     alignment: Alignment.center,
                     child: FittedBox(
                       fit: BoxFit.cover,
-                      child: state.preCachedAvatar ?? Image.memory(base64.decode(state.userInfo.avatarEncoded!)),
+                      child: Image.memory(base64.decode(state.userInfo.avatarEncoded!)),
                     ),
                   ),
                   Material(
diff --git a/lib/common/avatar/cubit/avatar_cubit.dart b/lib/common/avatar/cubit/avatar_cubit.dart
index 3f38863..d4b0b0a 100644
--- a/lib/common/avatar/cubit/avatar_cubit.dart
+++ b/lib/common/avatar/cubit/avatar_cubit.dart
@@ -1,14 +1,11 @@
 /*
  * @Author       : Linloir
  * @Date         : 2022-10-13 21:50:14
- * @LastEditTime : 2022-10-20 17:02:19
+ * @LastEditTime : 2022-10-20 18:03:54
  * @Description  : 
  */
 
-import 'dart:convert';
-
 import 'package:bloc/bloc.dart';
-import 'package:flutter/material.dart';
 import 'package:tcp_client/common/avatar/cubit/avatar_state.dart';
 import 'package:tcp_client/repositories/common_models/userinfo.dart';
 import 'package:tcp_client/repositories/user_repository/user_repository.dart';
@@ -20,11 +17,6 @@ class AvatarCubit extends Cubit<AvatarState> {
   }): super(AvatarState(userInfo: userRepository.getUserInfo(userid: userid))) 
   {
     userRepository.userInfoStreamBroadcast.listen(onFetchedUserInfo);
-    emit(AvatarState(
-      userInfo: state.userInfo, 
-      preCachedAvatar: state.userInfo.avatarEncoded == null ? null : 
-                        Image.memory(base64.decode(state.userInfo.avatarEncoded!))
-    ));
   }
 
   final UserRepository userRepository;
@@ -32,9 +24,7 @@ class AvatarCubit extends Cubit<AvatarState> {
   void onFetchedUserInfo(UserInfo userInfo) {
     if(userInfo.userID == state.userInfo.userID) {
       emit(AvatarState(
-        userInfo: userInfo, 
-        preCachedAvatar: userInfo.avatarEncoded == null ? null : 
-                          Image.memory(base64.decode(userInfo.avatarEncoded!))
+        userInfo: userInfo
       ));
     }
   }
diff --git a/lib/common/avatar/cubit/avatar_state.dart b/lib/common/avatar/cubit/avatar_state.dart
index e6998db..1d1dff6 100644
--- a/lib/common/avatar/cubit/avatar_state.dart
+++ b/lib/common/avatar/cubit/avatar_state.dart
@@ -1,23 +1,20 @@
 /*
  * @Author       : Linloir
  * @Date         : 2022-10-13 21:50:07
- * @LastEditTime : 2022-10-20 16:51:11
+ * @LastEditTime : 2022-10-20 18:02:15
  * @Description  : 
  */
 
 import 'package:equatable/equatable.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:tcp_client/repositories/common_models/userinfo.dart';
 
 class AvatarState extends Equatable {
   const AvatarState({
     required this.userInfo,
-    this.preCachedAvatar
   });
 
   final UserInfo userInfo;
-  final Image? preCachedAvatar;
 
   @override
-  List<Object?> get props => [userInfo.userID, userInfo.avatarEncoded, preCachedAvatar];
+  List<Object?> get props => [userInfo.userID, userInfo.avatarEncoded];
 }
diff --git a/lib/main.dart b/lib/main.dart
index 92a2809..4429c3c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,7 @@
 /*
  * @Author       : Linloir
  * @Date         : 2022-10-10 08:04:53
- * @LastEditTime : 2022-10-20 10:34:41
+ * @LastEditTime : 2022-10-20 17:58:56
  * @Description  : 
  */
 import 'package:easy_debounce/easy_debounce.dart';
@@ -119,7 +119,7 @@ class SplashPage extends StatelessWidget {
     return BlocProvider<InitializationCubit>(
       create: (context) {
         return InitializationCubit(
-          serverAddress: '127.0.0.1', 
+          serverAddress: 'chat.linloir.cn', 
           serverPort: 20706
         );
       },