login

Author: toly1994328

lib/app/bloc_wrapper.dart

@@ -36,9 +36,11 @@ class _BlocWrapperState extends State<BlocWrapper> {
     return MultiBlocProvider(
         providers: [
           // 全局 bloc : 维护应用存储状态、更新、认证
+          BlocProvider<AuthBloc>(create: (_) => AuthBloc(repository: authRepository)..add(const AppStarted())),
           BlocProvider<AppBloc>(create: (_) => AppBloc(AppStateRepository())..initApp()),
           BlocProvider<UpdateBloc>(create: (_) => UpdateBloc()),
-          BlocProvider<AuthBloc>(create: (_) => AuthBloc(repository: authRepository)..add(const AppStarted())),
+          BlocProvider<UserBloc>(create: (_) => UserBloc()),
+
 
           BlocProvider<WidgetsBloc>(create: (_) => WidgetsBloc(repository: repository)),
           BlocProvider<CategoryBloc>(create: (_) => categoryBloc),

lib/point_system/api/category_api.dart

@@ -11,14 +11,17 @@ class CategoryApi {
       {required String data, required String likeData}) async {
     String errorMsg = "";
 
-    var result = await HttpUtil.instance.client.post(
-        PathUnit.categoryDataSync,
-        data: {"data": data, "likeData": likeData}).catchError((err) {
-      errorMsg = err.toString();
-    });
-
-    if (result.data != null) {
-      return TaskResult.success(data:result.data);
+    try {
+      var result = await HttpUtil.instance.client.post(
+              PathUnit.categoryDataSync,
+              data: {"data": data, "likeData": likeData});
+      print(result.data);
+      if (result.data != null) {
+            return TaskResult.success(data:result.data['status']);
+          }
+    } catch (e) {
+      print(e);
+      errorMsg = e.toString();
     }
 
     return TaskResult.error(msg: '请求错误: $errorMsg');

lib/widget_ui/mobile/category_page/collect_page.dart

@@ -94,7 +94,8 @@ class _CollectPageState extends State<CollectPage>
               borderSize: 1.5,
             ),
           )),
-      // backgroundColor: color,
+      backgroundColor: Theme.of(context).primaryColor,
+      actionsIconTheme: IconThemeData(color: Colors.white),
       actions: <Widget>[
         SizedBox(
             width: 32,
@@ -105,7 +106,7 @@ class _CollectPageState extends State<CollectPage>
             width: 32,
             child: AuthenticWidget.just(const SyncCategoryButton())),
         if(!widget.canPop)
-        _buildAddAction(context)
+        SizedBox(child: _buildAddAction(context))
       ],
       title: const Text(
         '收藏集录',
@@ -144,12 +145,17 @@ class _CollectPageState extends State<CollectPage>
     );
   }
 
-  Widget _buildAddAction(BuildContext context) => IconButton(
-      icon: const Icon(
-        Icons.add,
-        size: 30,
+  Widget _buildAddAction(BuildContext context) => GestureDetector(
+    behavior: HitTestBehavior.opaque,
+    onTap:  () => Scaffold.of(context).openEndDrawer(),
+    child: SizedBox(
+      width: 32,
+        child: const Icon(
+          Icons.add,
+          size: 24,
+        ),
       ),
-      onPressed: () => Scaffold.of(context).openEndDrawer());
+  );
 
   List<Widget> _buildTabs() => _tabs
       .map(

lib/widget_ui/mobile/category_page/sync/async_button.dart

@@ -66,7 +66,7 @@ class _SyncCategoryButtonState extends State<SyncCategoryButton> {
     return FeedbackWidget(
         child: const Icon(
           TolyIcon.download,
-          size: 28,
+          size: 24,
         ),
         onPressed: _doSync);
   }
@@ -104,7 +104,7 @@ class _SyncCategoryButtonState extends State<SyncCategoryButton> {
 
   Widget _buildSuccess() => const Icon(
         TolyIcon.upload_success,
-        size: 25,
+        size: 22,
         color: Colors.green,
       );
 

lib/widget_ui/mobile/category_page/sync/upload_button.dart

@@ -56,16 +56,16 @@ class _UploadCategoryButtonState extends State<UploadCategoryButton> {
   Widget _buildError() {
     return const Icon(
       TolyIcon.error,
-      size: 28,
-      color: Colors.green,
+      size: 22,
+      color: Colors.redAccent,
     );
   }
 
   Widget _buildDefault() {
     return FeedbackWidget(
         child: const Icon(
           TolyIcon.upload,
-          size: 28,
+          size: 24,
         ),
         onPressed: _doUploadCategoryData);
   }
@@ -95,7 +95,7 @@ class _UploadCategoryButtonState extends State<UploadCategoryButton> {
   Widget _buildSuccess() {
     return const Icon(
       TolyIcon.upload_success,
-      size: 25,
+      size: 22,
       color: Colors.green,
     );
   }

packages/app/lib/app/cons/path_unit.dart

@@ -4,7 +4,7 @@
 
 class PathUnit{
 
-  static const baseUrl='http://119.45.173.197:8080/api/v1';
+  static const baseUrl='http://82.157.176.209:8080/api/v1';
   // static const baseUrl='http://192.168.0.100:8080/api/v1';
 
   static const sendEmail = '/sendEmail/';

packages/authentication/lib/authentication.dart

@@ -8,6 +8,8 @@ export 'blocs/authentic/event.dart';
 export 'blocs/register/event.dart';
 export 'blocs/register/state.dart';
 export 'blocs/register/bloc.dart';
+export 'blocs/user/bloc.dart';
+export 'blocs/user/state.dart';
 export 'views/mobile/user/page_item.dart';
 export 'views/mobile/user/unit_drawer_header.dart';
 export 'views/mobile/user/user_page.dart';

packages/authentication/lib/blocs/authentic/bloc.dart

@@ -17,9 +17,11 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   final AuthRepository repository;
 
-  AuthBloc({required this.repository}) : super(AuthInitial()){
+  AuthBloc({required this.repository}) : super(const AuthInitial()){
     on<AppStarted>(_onAppStarted);
     on<AuthByPassword>(_onAuthByPassword);
+    on<AuthByRegister>(_onAuthByRegister);
+    on<Logout>(_onLoggedOut);
   }
 
   void _onAppStarted(AuthEvent event,  Emitter<AuthState> emit) async{
@@ -41,7 +43,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     }
 
-    if (event is LoggedOut) {
+    if (event is Logout) {
 
     }
   }
@@ -85,4 +87,26 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       emit (const AuthFailure('用户名和密码不匹配'));
     }
   }
+
+  FutureOr<void> _onAuthByRegister(AuthByRegister event, Emitter<AuthState> emit) async{
+    emit(AuthLoading());
+    TaskResult<bool> result = await repository.register(email: event.email, code: event.code);
+
+    // if(result.data == null){
+    //   emit(const RegisterError('注册失败'));
+    // }else{
+    //   if (result.data!=null&&result.data!) {
+    //     // 注册成功
+    //     emit( RegisterSuccess(event.email));
+    //   }else{
+    //     emit( RegisterError(result.msg));
+    //   }
+    // }
+  }
+
+  FutureOr<void> _onLoggedOut(Logout event, Emitter<AuthState> emit) async{
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    await prefs.remove(SpKey.tokenKey);
+    emit(const AuthInitial());
+  }
 }

packages/authentication/lib/blocs/authentic/event.dart

@@ -24,13 +24,20 @@ class AuthByPassword extends AuthEvent {
   List<Object> get props => [username,password];
 }
 
+// 用户注册也是认证的一部分
+class AuthByRegister extends AuthEvent{
+  final String email;
+  final String code;
 
-class LoggedOut extends AuthEvent {
+  const AuthByRegister(this.email, this.code);
+}
+
+class Logout extends AuthEvent {
 
   final bool clearUser;
   final bool tokenDisable;
 
-  const LoggedOut({this.clearUser=true,this.tokenDisable=false});
+  const Logout({this.clearUser=true,this.tokenDisable=false});
 }
 
 class TokenDisabled extends AuthEvent {

packages/authentication/lib/blocs/authentic/state.dart

@@ -2,16 +2,21 @@
 import 'package:authentication/models/user.dart';
 import 'package:equatable/equatable.dart';
 
+enum AuthType{
+  login,
+  register,
+  visitor
+}
+
 ///********************************校验状态********************************
-//
 abstract class AuthState extends Equatable {
   const AuthState();
   @override
   List<Object> get props => [];
 }
 
 class AuthInitial extends AuthState {
-
+const AuthInitial();
 }
 
 
@@ -43,4 +48,6 @@ class AuthSuccess extends AuthState {
   }
 }
 
-class AuthLoading extends AuthState {}
+class AuthLoading extends AuthState {
+
+}