Merge branch 'dev' of http://git.wmzhubo.com/guadoutech/YYHome into dev

app/android/app/build.gradle

@@ -62,7 +62,6 @@ android {
 
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
             abiFilters 'armeabi-v7a', 'arm64-v8a'
 //            abiFilters 'armeabi-v7a'
 //            abiFilters 'arm64-v8a'

packages/cpt_main/lib/modules/home/home_page.dart

@@ -120,19 +120,22 @@ class HomePage extends HookConsumerWidget {
                         Positioned(
                           left: 0,
                           top: 0,
-                          child: Transform.translate(
-                            offset: const Offset(-10, -5),
-                            child: MyTextView(
-                              UserConfigService.getState(ref: ref).user?.unreadNotificationsCount ?? "0",
-                              boxWidth: 20.0,
-                              textColor: Colors.white,
-                              fontSize: 10,
-                              isFontLight: true,
-                              backgroundColor: context.appColors.redDefault,
-                              cornerRadius: 8,
-                              paddingTop: 2,
-                              paddingBottom: 2,
-                              textAlign: TextAlign.center,
+                          child: Visibility(
+                            visible: UserConfigService.getState(ref: ref).user?.unreadNotificationsCount != null,
+                            child: Transform.translate(
+                              offset: const Offset(-10, -5),
+                              child: MyTextView(
+                                UserConfigService.getState(ref: ref).user?.unreadNotificationsCount ?? "0",
+                                boxWidth: 20.0,
+                                textColor: Colors.white,
+                                fontSize: 10,
+                                isFontLight: true,
+                                backgroundColor: context.appColors.redDefault,
+                                cornerRadius: 8,
+                                paddingTop: 2,
+                                paddingBottom: 2,
+                                textAlign: TextAlign.center,
+                              ),
                             ),
                           ),
                         ),

packages/cpt_payment/lib/modules/payment/payment_page.dart

@@ -59,8 +59,8 @@ class PaymentPage extends HookConsumerWidget {
                     _buildTopCategory(
                       context,
                       Assets.paymentInfoIcon,
-                      41.0,
-                      41.0,
+                      50.0,
+                      50.0,
                       S.current.info,
                       tabsRouter.activeIndex == 0,
                     ).onTap(