.

lib/.gitignore

@@ -1 +1 @@
-/tools/
+/temp/

lib/app/views/navigation/bloc_wrapper.dart → lib/app/bloc_wrapper.dart

@@ -1,14 +1,11 @@
 import 'package:app_config/app_config.dart';
+import 'package:app_update/app_update.dart';
+import 'package:authentication/authentication.dart';
 import 'package:db_storage/db_storage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/update_part/bloc_exp.dart';
 import 'package:flutter_unit/painter_system/bloc/gallery_unit/bloc.dart';
-import 'package:flutter_unit/user_system/bloc/authentic/bloc.dart';
-import 'package:flutter_unit/user_system/bloc/authentic/event.dart';
-
 import 'package:widget_module/blocs/blocs.dart';
-
 import 'package:widget_repository/widget_repository.dart';
 
 
@@ -32,6 +29,7 @@ class _BlocWrapperState extends State<BlocWrapper> {
   final WidgetRepository repository = const WidgetDbRepository();
 
   final CategoryBloc categoryBloc= CategoryBloc(repository: CategoryDbRepository());
+  final AuthRepository authRepository = HttpAuthRepository();
 
   @override
   Widget build(BuildContext context) {
@@ -40,7 +38,7 @@ class _BlocWrapperState extends State<BlocWrapper> {
           // 全局 bloc : 维护应用存储状态、更新、认证
           BlocProvider<AppBloc>(create: (_) => AppBloc(AppStateRepository())..initApp()),
           BlocProvider<UpdateBloc>(create: (_) => UpdateBloc()),
-          BlocProvider<AuthenticBloc>(create: (_) => AuthenticBloc()..add(const AppStarted())),
+          BlocProvider<AuthBloc>(create: (_) => AuthBloc(repository: authRepository)..add(const AppStarted())),
 
           BlocProvider<WidgetsBloc>(create: (_) => WidgetsBloc(repository: repository)),
           BlocProvider<CategoryBloc>(create: (_) => categoryBloc),

lib/app/views/navigation/flutter_unit.dart → lib/app/flutter_unit.dart

@@ -1,12 +1,11 @@
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
 
 import 'package:flutter_unit/app/router/unit_router.dart';
 import 'package:flutter_unit/app/views/splash/standard_unit_splash.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 
 
 /// create by 张风捷特烈 on 2020/4/28

lib/navigation/home_page/home_drawer.dart → lib/app/navigation/home_drawer.dart

@@ -1,11 +1,11 @@
 import 'package:app_config/app_config.dart';
+import 'package:components/components.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/router/unit_router.dart';
 
-import 'package:flutter_unit/components/flutter/no_div_expansion_tile.dart';
-import 'package:flutter_unit/components/project/unit_drawer_header.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
+
+import 'unit_drawer_header.dart';
 
 /// create by 张风捷特烈 on 2020-03-26
 /// contact me by email [email protected]

lib/components/project/overlay_tool_wrapper.dart → lib/app/navigation/overlay_tool_wrapper.dart

@@ -1,12 +1,10 @@
 import 'package:app_config/app_config.dart';
+import 'package:components/toly_ui/toly_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/router/unit_router.dart';
 import 'package:flutter_unit/point_system/blocs/point_system_bloc.dart';
 
 
-import '../permanent/burst_menu.dart';
-import '../permanent/color_wrapper.dart';
 
 /// create by 张风捷特烈 on 2020/10/21
 /// contact me by email [email protected]

lib/navigation/navigation/unit_desk_navigation.dart → lib/app/navigation/unit_desk_navigation.dart

@@ -1,21 +1,21 @@
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
+import 'package:flutter_unit/app/plateform_adapter/window/windows_adapter.dart';
 import 'package:flutter_unit/app/views/unit_todo/layout_unit_page.dart';
 import 'package:flutter_unit/app/views/unit_todo/point_unit_page.dart';
 import 'package:components/toly_ui/toly_ui.dart';
 
 import 'package:flutter_unit/painter_system/gallery_unit.dart';
-import 'package:flutter_unit/widget_system/views/widget_system_view.dart';
+import 'package:flutter_unit/widget_ui/desk/widget_panel/widget_panel.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/collect_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/home_right_drawer.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 
 import 'package:url_launcher/url_launcher.dart';
-import 'package:window_manager/window_manager.dart';
 
-import '../../app/plateform_adapter/window/windows_adapter.dart';
-import '../../widget_system/views/desk_ui/widget_panel/widget_panel.dart';
-import '../home_page/home_drawer.dart';
-import '../home_page/home_page.dart';
+import 'home_drawer.dart';
+
 
 
 class UnitDeskNavigation extends StatefulWidget {

lib/navigation/navigation/unit_navigation.dart → lib/app/navigation/unit_navigation.dart

@@ -1,21 +1,21 @@
 import 'dart:io';
 
 import 'package:app_config/app_config.dart';
+import 'package:app_update/app_update.dart';
+import 'package:authentication/authentication.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/router/unit_router.dart';
-import 'package:flutter_unit/app/update_part/bloc_exp.dart';
-import 'package:flutter_unit/components/project/nav/pure_bottom_bar.dart';
 import 'package:flutter_unit/painter_system/gallery_unit.dart';
-import 'package:flutter_unit/app/update_part/views/update_red_point.dart';
-import 'package:flutter_unit/user_system/pages/user/user_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/collect_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/home_right_drawer.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
+
+import 'package:old_fancy_mobile_ui/home_page/fancy_home_page.dart';
 import 'package:old_fancy_mobile_ui/old_fancy_mobile_ui.dart';
 import 'package:widget_module/blocs/blocs.dart';
-import 'package:flutter_unit/widget_system/views/standard_widget_home/standard_home_page.dart';
-import 'package:flutter_unit/widget_system/views/widget_system_view.dart';
+import 'package:flutter_unit/widget_ui/mobile/widget_panel/standard_home_page.dart';
 
-import '../../app/blocs/color_change_bloc.dart';
-import '../home_page/home_page.dart';
+import 'pure_bottom_bar.dart';
 import 'unit_desk_navigation.dart';
 
 /// create by 张风捷特烈 on 2020-04-11
@@ -83,7 +83,7 @@ class _UnitPhoneNavigationState extends State<UnitPhoneNavigation> {
         physics: _neverScroll,
         controller: _controller,
         children: [
-          if (style == AppStyle.fancy) const HomePage(),
+          if (style == AppStyle.fancy) const FancyHomePage(),
           if (style == AppStyle.standard) const StandardHomePage(),
           GalleryUnit(),
           CollectPage(),

lib/app/router/unit_router.dart

@@ -3,7 +3,9 @@
 import 'dart:io';
 
 import 'package:app_config/app_config.dart';
+import 'package:authentication/authentication.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_unit/app/navigation/unit_navigation.dart';
 import 'package:flutter_unit/app/views/about/about_app_page.dart';
 import 'package:flutter_unit/app/views/about/about_me_page.dart';
 import 'package:flutter_unit/app/views/about/version_info.dart';
@@ -18,13 +20,13 @@ import 'package:flutter_unit/app/views/unit_todo/layout_unit_page.dart';
 import 'package:flutter_unit/app/views/unit_todo/point_unit_page.dart';
 import 'package:flutter_unit/point_system/views/issues_point/issues_detail.dart';
 import 'package:flutter_unit/point_system/views/issues_point/issues_point_page.dart';
-import 'package:flutter_unit/user_system/pages/login/login_page.dart';
-import 'package:flutter_unit/user_system/pages/register/register_page.dart';
-import 'package:flutter_unit/widget_system/views/widget_system_view.dart';
+import 'package:flutter_unit/widget_ui/desk/widget_detail/widget_detail_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/category_detail.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/collect_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/search_page/search_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/widget_detail/widget_detail_page.dart';
 import 'package:widget_repository/widget_repository.dart';
 
-import '../../navigation/navigation/unit_navigation.dart';
-import 'router_utils.dart';
 
 class UnitRouters {
   static const String widget_detail = '/widget_detail';
@@ -68,10 +70,18 @@ class UnitRouters {
 
       // 组件详情页
       case widget_detail:
+        Widget child;
+        if(Platform.isWindows||Platform.isMacOS||Platform.isLinux){
+          child = DeskWidgetDetailPageScope(          model: settings.arguments as WidgetModel,
+          );
+        }else{
+          child =  WidgetDetailPageScope(
+            model: settings.arguments as WidgetModel,
+          );
+        }
+
         return Right2LeftRouter(
-            child: WidgetDetailPageScope(
-          model: settings.arguments as WidgetModel,
-        ));
+            child: child);
 
       case search:
         return Right2LeftRouter(child: const SearchPageProvider());