Merge branch 'master' of http://192.168.2.201:8099/laiiihz/akuCommunity

# Conflicts: # lib/pages/home/home_page.dart
4 years ago · fbbc4dac35
parent 7e0c0d50e6 031acbf0a9
commit fbbc4dac35
17 changed files with 107 additions and 58 deletions
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,7 +1,6 @@
 import 'package:akuCommunity/pages/tab_navigator.dart';
 import 'package:akuCommunity/provider/user_provider.dart';
 import 'package:akuCommunity/utils/developer_util.dart';
-import 'package:akuCommunity/utils/logger_view.dart';
 import 'package:amap_map_fluttify/amap_map_fluttify.dart';
 import 'package:ani_route/ani_route.dart';
 import 'package:bot_toast/bot_toast.dart';
--- a/lib/pages/activities_page/activities_details_page/activities_details_page.dart
+++ b/lib/pages/activities_page/activities_details_page/activities_details_page.dart
@ -217,7 +217,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
  Widget _inkWellEnterMember(List<String> memberList) {
    return InkWell(
      onTap: () {
-        Get.to(MemberListPage());
+        MemberListPage().to();
      },
      child: Container(
        padding: EdgeInsets.only(bottom: 24.w),
@ -245,8 +245,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
                  child: Text(
                    '已有${320}人参加',
                    style: TextStyle(
-                        fontSize: BaseStyle.fontSize28,
-                        color: ktextPrimary),
+                        fontSize: BaseStyle.fontSize28, color: ktextPrimary),
                  ),
                ),
                Icon(
--- a/lib/pages/community/community_index.dart
+++ b/lib/pages/community/community_index.dart
@ -40,7 +40,7 @@ class _CommunityIndexState extends State<CommunityIndex>
  }

  void noteCreateRouter() {
-    Get.to(NoteCreatePage());
+    NoteCreatePage().to();
  }

  List<Widget> _listActions() {
--- a/lib/pages/community/topice_detail_page.dart
+++ b/lib/pages/community/topice_detail_page.dart
@ -80,7 +80,7 @@ class _TopiceDetailPageState extends State<TopiceDetailPage> {
              size: 40.sp,
            ),
            onPressed: () {
-              Get.to(NoteCreatePage());
+              NoteCreatePage().to();
            }));
  }

--- a/lib/pages/community/widget/topic_card.dart
+++ b/lib/pages/community/widget/topic_card.dart
@ -29,7 +29,7 @@ class _TopicCardState extends State<TopicCard> {
  }

  void topiceDetailRouter(String subtitle, String imagePath) {
-    Get.to(TopiceDetailPage());
+    TopiceDetailPage().to();
  }

  Row _rowTopic(String title, String subtitle, String imagePath) {
--- a/lib/pages/confirm_order_page/widget/confirm_bottom_bar.dart
+++ b/lib/pages/confirm_order_page/widget/confirm_bottom_bar.dart
@ -36,7 +36,7 @@ class ConfirmBottomBar extends StatelessWidget {
  Widget _submit(BuildContext context) {
    return InkWell(
      onTap: () {
-        Get.to(PayOrderPage());
+        PayOrderPage().to();
      },
      child: Container(
        decoration: BoxDecoration(
--- a/lib/pages/goods_details/goods_details_page.dart
+++ b/lib/pages/goods_details/goods_details_page.dart
@ -57,7 +57,7 @@ class _GoodsDetailsPageState extends State<GoodsDetailsPage> {
              // ProductSpecs(),
              ProductEvaluate(
                fun: () {
-                  Get.to(ViewCommentsPage());
+                  ViewCommentsPage().to();
                },
              ),
              ProductDetail(
--- a/lib/pages/goods_details/widget/goods_app_bar.dart
+++ b/lib/pages/goods_details/widget/goods_app_bar.dart
@ -85,7 +85,7 @@ class _GoodsAppBarState extends State<GoodsAppBar> {
            color: Color(0xff666666),
          ),
          onPressed: () {
-            Get.to(MarketCartPage());
+            MarketCartPage().to();
          },
        ),
      ],
--- a/lib/pages/goods_details/widget/goods_details_bottom_bar.dart
+++ b/lib/pages/goods_details/widget/goods_details_bottom_bar.dart
@ -8,6 +8,7 @@ import 'package:provider/provider.dart';
 import 'package:akuCommunity/provider/cart.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:akuCommunity/widget/goods_specs_sheet.dart';
+import 'package:akuCommunity/extensions/page_router.dart';

 class GoodsDetailsBottomBar extends StatefulWidget {
  final String itemid, itemtitle, itemprice, itempic;
@ -112,7 +113,7 @@ class _GoodsDetailsBottomBarState extends State<GoodsDetailsBottomBar> {
                ],
              ),
              onTap: () {
-                Get.to(MarketCartPage());
+                MarketCartPage().to();
              },
            ),
            SizedBox(width: 53.w),
--- a/lib/pages/goods_deto_page/goods_deto_page.dart
+++ b/lib/pages/goods_deto_page/goods_deto_page.dart
@ -79,8 +79,6 @@ class _GoodsDetoPageState extends State<GoodsDetoPage> {
    _refreshController.loadComplete();
  }

-  
-
  @override
  void dispose() {
    super.dispose();
@ -131,7 +129,7 @@ class _GoodsDetoPageState extends State<GoodsDetoPage> {
            child: BottomButton(
              title: '新增',
              fun: () {
-                Get.to(DetoCreatePage());
+                DetoCreatePage().to();
              },
            ),
          ),
--- a/lib/pages/home/home_page.dart
+++ b/lib/pages/home/home_page.dart
@ -62,19 +62,19 @@ class _HomePageState extends State<HomePage>

  List<GridButton> _gridList = [
    GridButton('一键开门', R.ASSETS_ICONS_TOOL_YJKM_PNG, () {
-      Get.to(OpenDoorPage());
+      OpenDoorPage().to();
    }),
    GridButton('访客通行', R.ASSETS_ICONS_TOOL_FKYQ_PNG, () {
-      Get.to(VisitorAccessPage());
+      VisitorAccessPage().to();
    }),
    GridButton('报事报修', R.ASSETS_ICONS_TOOL_BSBX_PNG, () {
-      Get.to(FixedSubmitPage());
+      FixedSubmitPage().to();
    }),
    GridButton('生活缴费', R.ASSETS_ICONS_TOOL_SHJF_PNG, () {
-      Get.to(LifePayPage());
+      LifePayPage().to();
    }),
    GridButton('业委会', R.ASSETS_ICONS_TOOL_YWH_PNG, () {
-      Get.to(IndustryCommitteePage());
+      IndustryCommitteePage().to();
    }),
    GridButton('建议咨询', R.ASSETS_ICONS_TOOL_JYTS_PNG, () {
      Get.to(ThingsPage(
@ -89,10 +89,10 @@ class _HomePageState extends State<HomePage>
      ));
    }),
    GridButton('便民电话', R.ASSETS_ICONS_TOOL_BMDH_PNG, () {
-      Get.to(ConvenientPhonePage());
+      ConvenientPhonePage().to();
    }),
    GridButton('全部应用', R.ASSETS_ICONS_TOOL_QBYY_PNG, () {
-      Get.to(TotalApplicationsPage());
+      TotalApplicationsPage().to();
    }),
  ];

--- a/lib/pages/personal/personal_page.dart
+++ b/lib/pages/personal/personal_page.dart
@ -9,6 +9,7 @@ import 'package:akuCommunity/pages/setting_page/settings_page.dart';
 import 'package:akuCommunity/pages/sign/sign_in_page.dart';
 import 'package:akuCommunity/pages/things_page/fixed_submit_page.dart';
 import 'package:akuCommunity/pages/visitor_access_page/visitor_access_page.dart';
+import 'package:akuCommunity/painters/user_bottom_bar_painter.dart';
 import 'package:akuCommunity/provider/user_provider.dart';
 import 'package:akuCommunity/utils/net_util.dart';
 import 'package:akuCommunity/widget/grid_buttons.dart';
@ -38,7 +39,7 @@ class _PersonalIndexState extends State<PersonalIndex>
    with SingleTickerProviderStateMixin {
  List<GridButton> _manageGridList = [
    GridButton('我的房屋', R.ASSETS_ICONS_USER_ICON_WDFW_PNG, () {
-      Get.to(MineHousePage());
+      MineHousePage().to();
    }),
    GridButton('我的车位', R.ASSETS_ICONS_USER_ICON_WDCW_PNG, () {
      Get.to(MineCarPage(
@ -56,20 +57,20 @@ class _PersonalIndexState extends State<PersonalIndex>
      ));
    }),
    GridButton('我的缴费', R.ASSETS_ICONS_USER_ICON_WDJF_PNG, () {
-      Get.to(LifePayPage());
+      LifePayPage().to();
    }),
    GridButton('我的保修', R.ASSETS_ICONS_USER_ICON_WDBX_PNG, () {
-      Get.to(FixedSubmitPage());
+      FixedSubmitPage().to();
    }),
    GridButton('我的地址', R.ASSETS_ICONS_USER_ICON_WDDZ_PNG, () {
-      Get.to(AddressPage());
+      AddressPage().to();
    }),
    GridButton('我的管家', R.ASSETS_ICONS_USER_ICON_WDGJ_PNG, () {}),
    GridButton('我的访客', R.ASSETS_ICONS_USER_ICON_WDFK_PNG, () {
-      Get.to(VisitorAccessPage());
+      VisitorAccessPage().to();
    }),
    GridButton('设置', R.ASSETS_ICONS_USER_ICON_SZ_PNG, () {
-      Get.to(SettingsPage());
+      SettingsPage().to();
    }),
  ];

@ -120,7 +121,7 @@ class _PersonalIndexState extends State<PersonalIndex>
                  children: [
                    Spacer(),
                    Container(
-                      margin: EdgeInsets.only(top: 175.w, left: 32.w),
+                      margin: EdgeInsets.only(left: 32.w),
                      child: Row(
                        children: [
                          Container(
@ -160,20 +161,37 @@ class _PersonalIndexState extends State<PersonalIndex>
                        ],
                      ),
                    ),
+                    Stack(
+                      children: [
+                        Positioned(
+                          bottom: 0,
+                          left: 0,
+                          right: 0,
+                          child: Container(
+                            height: 41.w,
+                            width: double.infinity,
+                            child: CustomPaint(
+                              painter: UserBottomBarPainter(),
+                            ),
+                          ),
+                        ),
                        Container(
                          margin: EdgeInsets.only(
                            top: 38.w,
                            left: 36.w,
                            right: 36.w,
+                            bottom: 18.w,
                          ),
                          child: Image.asset(
-                        'assets/images/member_bg.png',
+                            R.ASSETS_IMAGES_MEMBER_BG_PNG,
                            width: 678.w,
                            height: 129.w,
                          ),
                        ),
                      ],
                    ),
+                  ],
+                ),
              ),
            )
          ],
--- a/lib/pages/property/property_index.dart
+++ b/lib/pages/property/property_index.dart
@ -40,22 +40,22 @@ class _PropertyIndexState extends State<PropertyIndex>
    with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin {
  List<GridButton> _gridList = [
    GridButton('一键开门', R.ASSETS_ICONS_TOOL_YJKM_PNG, () {
-      Get.to(OpenDoorPage());
+      OpenDoorPage().to();
    }),
    GridButton('开门码', R.ASSETS_ICONS_TOOL_KMM_PNG, () {
-      Get.to(OpeningCodePage());
+      OpeningCodePage().to();
    }),
    GridButton('访客通行', R.ASSETS_ICONS_TOOL_FKYQ_PNG, () {
-      Get.to(VisitorAccessPage());
+      VisitorAccessPage().to();
    }),
    GridButton('报事报修', R.ASSETS_ICONS_TOOL_BSBX_PNG, () {
-      Get.to(FixedSubmitPage());
+      FixedSubmitPage().to();
    }),
    GridButton('生活缴费', R.ASSETS_ICONS_TOOL_SHJF_PNG, () {
-      Get.to(LifePayPage());
+      LifePayPage().to();
    }),
    GridButton('业委会', R.ASSETS_ICONS_TOOL_YWH_PNG, () {
-      Get.to(IndustryCommitteePage());
+      IndustryCommitteePage().to();
    }),
    GridButton('建议咨询', R.ASSETS_ICONS_TOOL_JYTS_PNG, () {
      Get.to(ThingsPage(
@ -70,7 +70,7 @@ class _PropertyIndexState extends State<PropertyIndex>
      ));
    }),
    GridButton('便民电话', R.ASSETS_ICONS_TOOL_BMDH_PNG, () {
-      Get.to(ConvenientPhonePage());
+      ConvenientPhonePage().to();
    }),
    GridButton('活动投票', R.ASSETS_ICONS_TOOL_HDTP_PNG, () {
      Get.to(ActivitiesPage(
@ -78,7 +78,7 @@ class _PropertyIndexState extends State<PropertyIndex>
      ));
    }),
    GridButton('物品出户', R.ASSETS_ICONS_TOOL_WPCM_PNG, () {
-      Get.to(GoodsDetoPage());
+      GoodsDetoPage().to();
    }),
    GridButton('投诉表扬', R.ASSETS_ICONS_TOOL_TSBY_PNG, () {
      Get.to(ThingsPage(
@ -93,13 +93,13 @@ class _PropertyIndexState extends State<PropertyIndex>
      ));
    }),
    GridButton('问卷调查', R.ASSETS_ICONS_TOOL_WJDC_PNG, () {
-      Get.to(QuestionnairePage());
+      QuestionnairePage().to();
    }),
    GridButton('装修管理', R.ASSETS_ICONS_TOOL_ZXGL_PNG, () {
-      Get.to(FitupManagePage());
+      FitupManagePage().to();
    }),
    GridButton('全部应用', R.ASSETS_ICONS_TOOL_QBYY_PNG, () {
-      Get.to(TotalApplicationsPage());
+      TotalApplicationsPage().to();
    }),
  ];
  @override
--- a/lib/pages/setting_page/settings_page.dart
+++ b/lib/pages/setting_page/settings_page.dart
@ -6,6 +6,8 @@ import 'package:akuCommunity/pages/setting_page/invite_page/invite_page.dart';
 import 'package:akuCommunity/pages/sign/sign_in_page.dart';
 import 'package:akuCommunity/provider/user_provider.dart';
 import 'package:akuCommunity/widget/bee_scaffold.dart';
+import 'package:akuCommunity/extensions/page_router.dart';
+
 import 'package:akuCommunity/extensions/widget_list_ext.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter/cupertino.dart';
@ -85,7 +87,7 @@ class _SettingsPageState extends State<SettingsPage> {
                  );
                },
              )
-            : Get.to(SignInPage());
+            : SignInPage().to();
      },
      child: userProvider.isSigned
          ? Container(
@ -144,11 +146,11 @@ class _SettingsPageState extends State<SettingsPage> {
            ),
            _buildTile(
              title: '关于小蜜蜂智慧社区',
-              onTap: () => Get.to(AboutPage()),
+              onTap: () => AboutPage().to(),
            ),
            _buildTile(
              title: '邀请注册',
-              onTap: () => Get.to(InvitePage()),
+              onTap: () => InvitePage().to(),
            ),
          ].sepWidget(
              separate: Divider(
@ -166,7 +168,7 @@ class _SettingsPageState extends State<SettingsPage> {
            ),
            _buildTile(
              title: '意见反馈',
-              onTap: () => Get.to(FeedBackPage()),
+              onTap: () => FeedBackPage().to(),
            ),
            _buildTile(
              title: '账号管理',
--- a/lib/pages/total_application_page/total_applications_page.dart
+++ b/lib/pages/total_application_page/total_applications_page.dart
@ -17,7 +17,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:akuCommunity/utils/headers.dart';
 import 'package:akuCommunity/base/assets_image.dart';
 import 'package:akuCommunity/routers/page_routers.dart';
-import 'package:get/get.dart';
 import 'widget/applications_bar.dart';

 class TotalApplicationsPage extends StatefulWidget {
@ -126,7 +125,7 @@ class _TotalApplicationsPageState extends State<TotalApplicationsPage> {
                        ).to;
                        break;
                      case '一键开门':
-                        Get.to(OpenDoorPage());
+                        OpenDoorPage().to();
                        break;
                      case '开门码':
                        OpeningCodePage().to();
--- a/lib/painters/user_bottom_bar_painter.dart
+++ b/lib/painters/user_bottom_bar_painter.dart
@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class UserBottomBarPainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    Paint paint = Paint()..color = Color(0xFFE9E9E9);
+    Path path = Path();
+
+    path.moveTo(26.w, 0);
+    path.lineTo(size.width - 26.w, 0);
+    path.lineTo(size.width + 16.w, size.height);
+    path.lineTo(-16.w, size.height);
+    path.close();
+    canvas.drawPath(path, paint);
+
+    Paint secondPaint = Paint()..color = Color(0xFF767676);
+    Path secondPath = Path();
+    secondPath.moveTo(30.w, 13.w);
+    secondPath.lineTo(size.width - 30.w, 13.w);
+    secondPath.lineTo(size.width - 24.w, 23.w);
+    secondPath.lineTo(24.w, 23.w);
+    secondPath.close();
+    canvas.drawPath(secondPath, secondPaint);
+  }
+
+  @override
+  bool shouldRepaint(UserBottomBarPainter oldDelegate) => false;
+
+  @override
+  bool shouldRebuildSemantics(UserBottomBarPainter oldDelegate) => false;
+}
--- a/lib/utils/logger_view.dart
+++ b/lib/utils/logger_view.dart
@ -1,7 +1,8 @@
 import 'package:akuCommunity/utils/logger_card.dart';
 import 'package:akuCommunity/utils/logger_data.dart';
+import 'package:akuCommunity/extensions/page_router.dart';
+
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';

 class LoggerFAB extends StatefulWidget {
  static openLogger(BuildContext context) {
@ -52,7 +53,7 @@ class _LoggerFABState extends State<LoggerFAB> {
              setState(() {});
            },
            onTap: () {
-              Get.to(LoggerView());
+              LoggerView().to();
            },
            child: Container(
              decoration: BoxDecoration(