ソースを参照

[new]替换logo&启屏页名称

zk 8 ヶ月 前
コミット
030eeee165

BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png


BIN
assets/images/icon_logo.webp


BIN
assets/images/icon_logo_max.webp


BIN
assets/images/icon_splash_title.webp


+ 84 - 74
lib/module/member/member_page.dart

@@ -239,61 +239,71 @@ class MemberPage extends BasePage<MemberController> {
   }
 
   Widget buildMemberBottomView() {
-    return Align(
-      alignment: Alignment.bottomCenter,
-      child: Container(
-        padding:
-            EdgeInsets.only(left: 12.w, right: 12.w, top: 13.w, bottom: 20.w),
-        decoration: BoxDecoration(
-          color: Colors.white,
-          boxShadow: [
-            BoxShadow(
-                color: Colors.black.withOpacity(0.05),
-                offset: Offset(0, -2),
-                blurRadius: 4)
-          ],
-          borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(16.w), topRight: Radius.circular(16.w)),
-        ),
-        child: Row(
-          children: [
-            Text('¥',
-                style: TextStyle(
-                    fontSize: 14.sp,
-                    color: '#EA1231'.color,
-                    fontWeight: FontWeight.bold)),
-            Text(
-              '168',
-              style: TextStyle(
-                  fontSize: 24.sp,
-                  color: '#EA1231'.color,
-                  fontWeight: FontWeight.bold),
-            ),
-            Text(
-              ' / 永久会员',
-              style: TextStyle(fontSize: 12.sp, color: '#000000'.color),
+    return Obx(() {
+      return Visibility(
+        visible: controller.memberStatusInfo == null ||
+            controller.memberStatusInfo?.permanent == false,
+        child: Align(
+          alignment: Alignment.bottomCenter,
+          child: Container(
+            padding: EdgeInsets.only(left: 12.w, right: 12.w, top: 13.w, bottom: 20.w),
+            decoration: BoxDecoration(
+              color: Colors.white,
+              boxShadow: [
+                BoxShadow(
+                    color: Colors.black.withOpacity(0.05),
+                    offset: Offset(0, -2),
+                    blurRadius: 4)
+              ],
+              borderRadius: BorderRadius.only(
+                  topLeft: Radius.circular(16.w),
+                  topRight: Radius.circular(16.w)),
             ),
-            Spacer(),
-            Container(
-              decoration: BoxDecoration(
-                  color: ColorName.colorPrimary,
-                  borderRadius: BorderRadius.circular(100.w)),
-              width: 164.w,
-              height: 44.w,
-              child: Center(
-                child: Text(
-                  '立即解锁',
-                  style: TextStyle(
-                      fontSize: 15.sp,
-                      color: Colors.white,
-                      fontWeight: FontWeight.bold),
-                ),
-              ),
-            )
-          ],
+            child: Obx(() {
+              return Row(
+                children: [
+                  Text('¥',
+                      style: TextStyle(
+                          fontSize: 14.sp,
+                          color: '#EA1231'.color,
+                          fontWeight: FontWeight.bold)),
+                  Text(
+                    controller.selectedGoods?.amount.divideBy100() ?? '--',
+                    style: TextStyle(
+                        fontSize: 24.sp,
+                        color: '#EA1231'.color,
+                        fontWeight: FontWeight.bold),
+                  ),
+                  Text(
+                    ' / ${controller.selectedGoods?.name}',
+                    style: TextStyle(fontSize: 12.sp, color: '#000000'.color),
+                  ),
+                  Spacer(),
+                  Container(
+                    decoration: BoxDecoration(
+                        color: ColorName.colorPrimary,
+                        borderRadius: BorderRadius.circular(100.w)),
+                    width: 164.w,
+                    height: 44.w,
+                    child: Center(
+                      child: Text(
+                        controller.memberStatusInfo?.expired == false
+                            ? StringName.memberVipRenew
+                            : StringName.memberVipUnlock,
+                        style: TextStyle(
+                            fontSize: 15.sp,
+                            color: Colors.white,
+                            fontWeight: FontWeight.bold),
+                      ),
+                    ),
+                  )
+                ],
+              );
+            }),
+          ),
         ),
-      ),
-    );
+      );
+    });
   }
 
   Widget buildUserInfoView() {
@@ -404,27 +414,27 @@ class MemberPage extends BasePage<MemberController> {
           text: TextSpan(
               style: TextStyle(fontSize: 12.sp, color: ColorName.black40),
               children: [
-            TextSpan(text: '购买前请先阅读'),
-            TextSpan(
-                recognizer: TapGestureRecognizer()
-                  ..onTap = () {
-                    controller.onPrivacyPolicyClick();
-                  },
-                text: '隐私政策',
-                style: TextStyle(
-                    color: ColorName.black60,
-                    decoration: TextDecoration.underline)),
-            TextSpan(text: '&'),
-            TextSpan(
-                recognizer: TapGestureRecognizer()
-                  ..onTap = () {
-                    controller.onTermOfServiceClick();
-                  },
-                text: '服务条款',
-                style: TextStyle(
-                    color: ColorName.black60,
-                    decoration: TextDecoration.underline)),
-          ])),
+                TextSpan(text: '购买前请先阅读'),
+                TextSpan(
+                    recognizer: TapGestureRecognizer()
+                      ..onTap = () {
+                        controller.onPrivacyPolicyClick();
+                      },
+                    text: '隐私政策',
+                    style: TextStyle(
+                        color: ColorName.black60,
+                        decoration: TextDecoration.underline)),
+                TextSpan(text: '&'),
+                TextSpan(
+                    recognizer: TapGestureRecognizer()
+                      ..onTap = () {
+                        controller.onTermOfServiceClick();
+                      },
+                    text: '服务条款',
+                    style: TextStyle(
+                        color: ColorName.black60,
+                        decoration: TextDecoration.underline)),
+              ])),
     );
   }
 

+ 5 - 0
lib/resource/assets.gen.dart

@@ -164,6 +164,10 @@ class $AssetsImagesGen {
   AssetGenImage get iconLogo =>
       const AssetGenImage('assets/images/icon_logo.webp');
 
+  /// File path: assets/images/icon_logo_max.webp
+  AssetGenImage get iconLogoMax =>
+      const AssetGenImage('assets/images/icon_logo_max.webp');
+
   /// File path: assets/images/icon_main_add_friend.webp
   AssetGenImage get iconMainAddFriend =>
       const AssetGenImage('assets/images/icon_main_add_friend.webp');
@@ -380,6 +384,7 @@ class $AssetsImagesGen {
         iconLoginPhone,
         iconLoginWx,
         iconLogo,
+        iconLogoMax,
         iconMainAddFriend,
         iconMainFriendGuard,
         iconMainHelp,