feat: 更新代码仓库全部修改

2025-10-30 04:47:53 -07:00
parent 145832093e
commit f42a481452
134 changed files with 8032 additions and 4270 deletions
@@ -2,137 +2,64 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:kaer_with_panels/app/common/app_run_data.dart';
+import 'package:kaer_with_panels/app/widgets/hi_base_scaffold.dart';
 import 'package:kaer_with_panels/app/widgets/kr_local_image.dart';
 import '../controllers/kr_delete_account_controller.dart';
 import 'package:kaer_with_panels/app/localization/app_translations.dart';
+import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';
+

 class KRDeleteAccountView extends GetView<KRDeleteAccountController> {
  const KRDeleteAccountView({super.key});

  @override
  Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: true,
-      appBar: AppBar(
-        title: Text(
-          AppTranslations.kr_userInfo.myAccount,
-          style: TextStyle(
-            fontSize: 16.sp,
-            fontWeight: FontWeight.w500,
-            color: Theme.of(context).textTheme.bodyMedium?.color,
-          ),
-        ),
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        elevation: 0,
-        leading: IconButton(
-          icon: Icon(
-            Icons.arrow_back,
-            color: Theme.of(context).textTheme.bodyMedium?.color,
-          ),
-          onPressed: () {
-            // 先收起键盘
-            FocusScope.of(context).unfocus();
-            // 返回到首页
-            Get.until((route) => route.isFirst);
-          },
-        ),
-      ),
-      body: SingleChildScrollView(
+    return HIBaseScaffold(
+      child: SingleChildScrollView(
        child: Padding(
-          padding: EdgeInsets.all(16.w),
+          padding: EdgeInsets.all(40.w),
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
-              SizedBox(height: 20.w),
-              KrLocalImage(
-                imageName: 'delete_account',
-                width: 150.w,
-                height: 150.w,
-                imageType: ImageType.png,
-              ),
-              SizedBox(height: 20.w),
-              Text(
-                '${AppTranslations.kr_userInfo.myAccount} ${KRAppRunData.getInstance().kr_account}\n${AppTranslations.kr_userInfo.willBeDeleted}',
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                  fontSize: 18.sp,
-                  fontWeight: FontWeight.bold,
-                  color: Theme.of(context).textTheme.bodyMedium?.color,
-                ),
-              ),
-              SizedBox(height: 20.w),
-              Text(
-                AppTranslations.kr_userInfo.deleteAccountWarning,
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                  fontSize: 14.sp,
-                  color: Theme.of(context).textTheme.bodySmall?.color,
-                ),
-              ),
-              SizedBox(height: 20.w),
+              _buildUserInfoSection(),
+              SizedBox(height: 12.w),
              // 验证码输入框
-              Container(
-                width: double.infinity,
-                height: 52.w,
-                decoration: ShapeDecoration(
-                  color: Theme.of(context).cardColor,
-                  shape: RoundedRectangleBorder(
-                    side: BorderSide(width: 0.5, color: const Color(0xFFD2D2D2)),
-                    borderRadius: BorderRadius.circular(10.r),
-                  ),
+              ConstrainedBox(
+                constraints: BoxConstraints(
+                  minHeight: 250.h, // 2. 设置最小高度为 300 (使用 .h 适配屏幕)
                ),
-                child: Row(
+                // 3. 使用 Column 和 MainAxisAlignment.center 使其垂直居中
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.start,
                  children: [
-                    Padding(
-                      padding: EdgeInsets.only(left: 12.w),
-                      child: Icon(
-                        Icons.lock_outline,
-                        size: 20.w,
-                        color: Theme.of(context).textTheme.bodyMedium?.color,
-                      ),
-                    ),
-                    SizedBox(width: 8.w),
-                    Expanded(
-                      child: TextField(
-                        controller: controller.kr_codeController,
-                        keyboardType: TextInputType.number,
-                        decoration: InputDecoration(
-                          hintText: 'login.enterCode'.tr,
-                          hintStyle: Theme.of(context).textTheme.bodySmall?.copyWith(
-                            fontSize: 14.sp,
-                            fontFamily: 'AlibabaPuHuiTi-Regular',
-                          ),
-                          border: InputBorder.none,
-                          contentPadding: EdgeInsets.symmetric(vertical: 16.w),
-                        ),
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          fontSize: 14.sp,
-                          fontFamily: 'AlibabaPuHuiTi-Regular',
-                        ),
-                      ),
-                    ),
-                    if (controller.kr_codeHasText.value)
-                      GestureDetector(
-                        onTap: () {
-                          controller.kr_codeController.clear();
-                        },
-                        child: Container(
-                          height: double.infinity,
-                          padding: EdgeInsets.symmetric(horizontal: 8.w),
-                          child: Icon(
-                            Icons.close,
-                            size: 20.w,
-                            color: Theme.of(context).textTheme.bodyMedium?.color,
-                          ),
-                        ),
-                      ),
-                    _buildSendCodeButton(context),
+                    _buildVerificationCodeField(), // 4. 在这里调用，不修改其内部
                  ],
                ),
              ),
              SizedBox(height: 20.w),
-              SizedBox(
+              GestureDetector(
+                onTap: () {
+                  controller.requestDeleteAccount();
+                },
+                child: Container(
+                  width: double.infinity,
+                  padding: EdgeInsets.symmetric(vertical: 12.w),
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(24.w),
+                    border: Border.all(color: const Color(0xFFFF2ED1), width: 2),
+                  ),
+                  alignment: Alignment.center,
+                  child: Text(
+                    '注销账户',
+                    style: TextStyle(
+                      color: const Color(0xFFFF2ED1),
+                      fontSize: 16.sp,
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                ),
+              ),
+              /*SizedBox(
                width: double.infinity,
                child: ElevatedButton(
                  onPressed: controller.requestDeleteAccount,
@@ -151,7 +78,7 @@ class KRDeleteAccountView extends GetView<KRDeleteAccountController> {
                    ),
                  ),
                ),
-              ),
+              ),*/
              SizedBox(height: 20.w),
            ],
          ),
@@ -160,7 +87,185 @@ class KRDeleteAccountView extends GetView<KRDeleteAccountController> {
    );
  }

-  Widget _buildSendCodeButton(BuildContext context) {
+
+  Widget _buildUserInfoSection() {
+    return Row(
+      children: [
+        Container(
+          width: 60.w,
+          height: 60.w,
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(18.r),
+          ),
+          alignment: Alignment.center,
+          child: KrLocalImage(
+            imageName: 'hi-home-logo',
+            imageType: ImageType.svg,
+            width: 30.w,
+            height: 30.w,
+            color: Colors.black,
+          ),
+        ),
+        SizedBox(width: 12.w),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Obx(() {
+                final _ = KRAppRunData.getInstance().kr_isLogin.value;
+                final email = KRAppRunData.getInstance().kr_account.value ?? '';
+                return Text(
+                  email.isNotEmpty ? email : '',
+                  style: TextStyle(
+                    color: Colors.white,
+                    fontSize: 20.sp,
+                    fontWeight: FontWeight.bold,
+                    height: 0.9,
+                  ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                );
+              }),
+              Obx(() {
+                final _ = KRAppRunData.getInstance().kr_isLogin.value;
+                final userId = (KRAppRunData.getInstance().kr_userId.value ?? '').toString();
+                final deviceId = KRAppRunData.getInstance().deviceId ?? '';
+
+                return Text(
+                  'ID: ${userId.isNotEmpty ? userId : deviceId}',
+                  style: TextStyle(
+                    color: Colors.white.withOpacity(0.85),
+                    fontSize: 14.sp,
+                    fontWeight: FontWeight.w500,
+                  ),
+                );
+              }),
+              Obx(() {
+                final currentSubscribe =
+                    controller.kr_subscribeService.kr_currentSubscribe.value;
+                String expiryText;
+
+                if (currentSubscribe == null) {
+                  expiryText = '尚未购买套餐';
+                } else {
+                  final now = DateTime.now();
+                  DateTime? expireDateTime;
+                  try {
+                    expireDateTime =
+                        DateTime.parse(currentSubscribe.expireTime);
+                  } catch (e) {
+                    expireDateTime = null;
+                  }
+
+                  if (expireDateTime == null) {
+                    expiryText = '套餐信息无效';
+                  } else if (expireDateTime.isBefore(now)) {
+                    final formattedExpireDate =
+                        '${expireDateTime.year}/${expireDateTime.month.toString().padLeft(2, '0')}/${expireDateTime.day.toString().padLeft(2, '0')}';
+                    expiryText = '已于 $formattedExpireDate 到期';
+                  } else {
+                    expiryText = '到期时间：${expireDateTime}';final year = expireDateTime.year;
+                    final month = expireDateTime.month.toString().padLeft(2, '0');
+                    final day = expireDateTime.day.toString().padLeft(2, '0');
+                    final hour = expireDateTime.hour.toString().padLeft(2, '0');
+                    final minute = expireDateTime.minute.toString().padLeft(2, '0');
+                    final second = expireDateTime.second.toString().padLeft(2, '0');
+
+                    // 2. 拼接成最终的字符串
+                    final formattedDateTime = '$year/$month/$day $hour:$minute:$second';
+
+                    expiryText = '到期时间：$formattedDateTime';
+                  }
+                }
+                return Text(
+                  expiryText,
+                  style: TextStyle(
+                    color: Colors.white,
+                    fontSize: 12.sp,
+                  ),
+                );
+              }),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// 构建注册页面的验证码输入框（包含间距）
+  Widget _buildVerificationCodeField() {
+    return SizedBox(
+      height: 50.w, // 固定高度
+      child: TextField(
+        controller: controller.kr_codeController,
+        keyboardType: TextInputType.number,
+        style: KrAppTextStyle(
+          fontSize: 16,
+          color: Colors.white,
+        ),
+        decoration: InputDecoration(
+          hintText: '验证码',
+          hintStyle: KrAppTextStyle(
+            fontSize: 16,
+            color: const Color(0xFFA6A6A6),
+            fontWeight: FontWeight.w600,
+          ),
+          contentPadding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 10.w),
+          border: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(25.w),
+            borderSide: BorderSide(color: Colors.white, width: 2),
+          ),
+          enabledBorder: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(25.w),
+            borderSide: BorderSide(color: Colors.white, width: 2),
+          ),
+          focusedBorder: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(25.w),
+            borderSide: BorderSide(color: Colors.white, width: 2),
+          ),
+          isDense: true,
+          suffixIconConstraints: BoxConstraints(
+            maxHeight: 50.w, // 限制最大高度
+          ),
+          suffixIcon: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.w, vertical: 5.w),
+            child: Obx(() {
+
+              return GestureDetector(
+                onTap: controller.kr_canSendCode.value ? controller.kr_sendCode : null,
+                child: Container(
+                  width: 100.w,
+                  alignment: Alignment.center,
+                  decoration: BoxDecoration(
+                    color:  controller.kr_canSendCode.value
+                        ? Theme.of(Get.context!).primaryColor
+                        : const Color(0xFFD5D5D5),
+                    borderRadius: BorderRadius.circular(100.r), // 药丸状
+                  ),
+                  child: Text(
+                    controller.kr_canSendCode.value
+                        ? AppTranslations.kr_login.sendCode
+                        : '${controller.kr_countdown}s',
+                    style: KrAppTextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w600,
+                      color: controller.kr_canSendCode.value
+                          ? Colors.black
+                          : const Color(0xFF464655) ,
+                    ),
+                  ),
+                ),
+              );
+            }),
+          ),
+        ),
+      ),
+    );
+  }
+
+  /*Widget _buildSendCodeButton(BuildContext context) {
    return Obx(() => GestureDetector(
      onTap: controller.kr_canSendCode.value ? controller.kr_sendCode : null,
      child: Container(
@@ -191,5 +296,5 @@ class KRDeleteAccountView extends GetView<KRDeleteAccountController> {
        ),
      ),
    ));
-  }
+  }*/
 }