logo和名称替换
This commit is contained in:
@@ -2,9 +2,9 @@ import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
|
||||
import '../../../tools_base/event_bus/event_bus_util.dart';
|
||||
import '../../../tools_base/event_bus/events.dart';
|
||||
@@ -62,7 +62,8 @@ class BindPhoneLogic extends GetxController {
|
||||
Get.back();
|
||||
}
|
||||
} else {
|
||||
final result = await globalStore.loginByMobile(phoneCtr.text, codeCtr.text);
|
||||
final result =
|
||||
await globalStore.loginByMobile(phoneCtr.text, codeCtr.text);
|
||||
if (result != null) {
|
||||
showToast('登录成功');
|
||||
eventBus.emit(ReLoginEvent());
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/app_colors.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:wydj/assets_tool/app_colors.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
|
||||
import 'bind_phone_logic.dart';
|
||||
|
||||
@@ -41,7 +41,9 @@ class BindPhonePage extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
'手机号',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.9), fontSize: 16),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.9),
|
||||
fontSize: 16),
|
||||
),
|
||||
12.sizeBoxW,
|
||||
Expanded(
|
||||
@@ -58,7 +60,9 @@ class BindPhonePage extends StatelessWidget {
|
||||
isCollapsed: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
counterText: '',
|
||||
hintStyle: TextStyle(color: Colors.white.withValues(alpha: 0.5), fontSize: 14)),
|
||||
hintStyle: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.5),
|
||||
fontSize: 14)),
|
||||
),
|
||||
)
|
||||
],
|
||||
@@ -78,7 +82,9 @@ class BindPhonePage extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
'验证码',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.9), fontSize: 16),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.9),
|
||||
fontSize: 16),
|
||||
),
|
||||
12.sizeBoxW,
|
||||
Expanded(
|
||||
@@ -95,7 +101,9 @@ class BindPhonePage extends StatelessWidget {
|
||||
isCollapsed: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
counterText: '',
|
||||
hintStyle: TextStyle(color: Colors.white.withValues(alpha: 0.5), fontSize: 14)),
|
||||
hintStyle: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.5),
|
||||
fontSize: 14)),
|
||||
),
|
||||
),
|
||||
12.sizeBoxW,
|
||||
@@ -103,13 +111,17 @@ class BindPhonePage extends StatelessWidget {
|
||||
onTap: () => controller.onSendCode(),
|
||||
child: ValueListenableBuilder(
|
||||
valueListenable: controller.countDownNof,
|
||||
builder: (BuildContext context, int value, Widget? child) {
|
||||
builder:
|
||||
(BuildContext context, int value, Widget? child) {
|
||||
final iscountdown = value > -1;
|
||||
return Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 4, vertical: 4),
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 4, vertical: 4),
|
||||
child: Text(
|
||||
iscountdown ? '${60 - value}秒' : '获取验证码',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.5), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.5),
|
||||
fontSize: 12),
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -139,7 +151,10 @@ class BindPhonePage extends StatelessWidget {
|
||||
),
|
||||
child: Text(
|
||||
controller.pageType.buttonTitle,
|
||||
style: TextStyle(color: Colors.black, fontSize: 18, fontWeight: FontWeight.w500),
|
||||
style: TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
|
||||
/// 绑定邀请码逻辑
|
||||
class InviteBindLogic extends GetxController {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/app_colors.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:wydj/assets_tool/app_colors.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
|
||||
import 'invite_bind_logic.dart';
|
||||
|
||||
@@ -26,7 +26,10 @@ class InviteBindPage extends StatelessWidget {
|
||||
// 标题
|
||||
Text(
|
||||
'输入邀请码',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.9), fontSize: 30, fontWeight: FontWeight.w500),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.9),
|
||||
fontSize: 30,
|
||||
fontWeight: FontWeight.w500),
|
||||
),
|
||||
12.sizeBoxH,
|
||||
Text(
|
||||
@@ -46,7 +49,9 @@ class InviteBindPage extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
'邀请码',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.9), fontSize: 16),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.9),
|
||||
fontSize: 16),
|
||||
),
|
||||
24.sizeBoxW,
|
||||
Expanded(
|
||||
@@ -63,7 +68,9 @@ class InviteBindPage extends StatelessWidget {
|
||||
isCollapsed: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
counterText: '',
|
||||
hintStyle: TextStyle(color: Colors.white.withValues(alpha: 0.35), fontSize: 14)),
|
||||
hintStyle: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.35),
|
||||
fontSize: 14)),
|
||||
),
|
||||
)
|
||||
],
|
||||
@@ -77,7 +84,8 @@ class InviteBindPage extends StatelessWidget {
|
||||
18.sizeBoxH,
|
||||
Text(
|
||||
'邀请1人 获得1天会员',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.35), fontSize: 14),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.35), fontSize: 14),
|
||||
),
|
||||
30.sizeBoxH,
|
||||
// 立即绑定按钮
|
||||
@@ -93,7 +101,10 @@ class InviteBindPage extends StatelessWidget {
|
||||
),
|
||||
child: Text(
|
||||
'立即绑定',
|
||||
style: TextStyle(color: Colors.black, fontSize: 18, fontWeight: FontWeight.w500),
|
||||
style: TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_model/mine/exchange_record_model.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:hgmj/tools_base/debug_log.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_alert_widget.dart';
|
||||
import 'package:wydj/hj_model/mine/exchange_record_model.dart';
|
||||
import 'package:wydj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
import 'package:wydj/tools_base/debug_log.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_alert_widget.dart';
|
||||
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||
|
||||
class MineExchangeCodeLogic extends GetxController {
|
||||
@@ -33,7 +33,9 @@ class MineExchangeCodeLogic extends GetxController {
|
||||
groupList.addAll(res.data ?? []);
|
||||
}
|
||||
refreshController?.refreshCompleted();
|
||||
(res?.total ?? 0) > (res?.data?.length ?? 0) ? refreshController?.loadComplete() : refreshController?.loadNoData();
|
||||
(res?.total ?? 0) > (res?.data?.length ?? 0)
|
||||
? refreshController?.loadComplete()
|
||||
: refreshController?.loadNoData();
|
||||
} catch (e) {
|
||||
refreshController?.refreshCompleted();
|
||||
refreshController?.loadComplete();
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/app_colors.dart';
|
||||
import 'package:hgmj/extension/extensions.dart';
|
||||
import 'package:hgmj/hj_model/mine/exchange_record_model.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:hgmj/tools_base/refresh/pull_refresh.dart';
|
||||
import 'package:wydj/assets_tool/app_colors.dart';
|
||||
import 'package:wydj/extension/extensions.dart';
|
||||
import 'package:wydj/hj_model/mine/exchange_record_model.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:wydj/tools_base/refresh/pull_refresh.dart';
|
||||
|
||||
import 'mine_code_logic.dart';
|
||||
|
||||
@@ -35,7 +35,8 @@ class _MineExchangeCodePageState extends State<MineExchangeCodePage> {
|
||||
onRefresh: (controller) => _.loadData(),
|
||||
onLoading: (controller) => _.loadMoreData(),
|
||||
child: CustomScrollView(
|
||||
keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
|
||||
keyboardDismissBehavior:
|
||||
ScrollViewKeyboardDismissBehavior.onDrag,
|
||||
slivers: <Widget>[
|
||||
SliverToBoxAdapter(
|
||||
child: _buildContent(_),
|
||||
@@ -47,7 +48,8 @@ class _MineExchangeCodePageState extends State<MineExchangeCodePage> {
|
||||
),
|
||||
),
|
||||
),
|
||||
InkWell(enableFeedback: false,
|
||||
InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () => _.onExChangeCode(),
|
||||
child: Container(
|
||||
height: 44,
|
||||
@@ -142,7 +144,8 @@ class _MineExchangeCodePageState extends State<MineExchangeCodePage> {
|
||||
style: TextStyle(color: Colors.white, fontSize: 14),
|
||||
decoration: InputDecoration(
|
||||
hintText: '请输入${widget.type == 0 ? '邀请码' : '兑换码'}(字母大写)',
|
||||
hintStyle: TextStyle(color: Colors.white.withValues(alpha: .35)),
|
||||
hintStyle:
|
||||
TextStyle(color: Colors.white.withValues(alpha: .35)),
|
||||
border: InputBorder.none,
|
||||
),
|
||||
),
|
||||
@@ -212,7 +215,8 @@ class _MineExchangeCodePageState extends State<MineExchangeCodePage> {
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
item.code ?? '',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: .55), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: .55), fontSize: 12),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -224,7 +228,8 @@ class _MineExchangeCodePageState extends State<MineExchangeCodePage> {
|
||||
item.desc ?? '',
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: .55), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: .55), fontSize: 12),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -234,7 +239,8 @@ class _MineExchangeCodePageState extends State<MineExchangeCodePage> {
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
'${item.createdAt.utcToYMD(gap: '.')}',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: .55), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: .55), fontSize: 12),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
|
||||
import '../../../hj_utils/permission_util.dart';
|
||||
import 'bing_phone_page.dart';
|
||||
@@ -10,7 +10,8 @@ class MineFindAccountPage extends StatelessWidget {
|
||||
late final dataSource = [
|
||||
{
|
||||
'title': '手机号找回',
|
||||
'ontap': () => Get.to(() => const BindPhonePage(pageType: PhonePageType.find)),
|
||||
'ontap': () =>
|
||||
Get.to(() => const BindPhonePage(pageType: PhonePageType.find)),
|
||||
},
|
||||
{
|
||||
'title': '凭证找回',
|
||||
@@ -58,7 +59,9 @@ class MineFindAccountPage extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
(data['title'] ?? '').toString(),
|
||||
style: TextStyle(fontSize: 14, color: Colors.white.withValues(alpha: 0.9)),
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Colors.white.withValues(alpha: 0.9)),
|
||||
),
|
||||
Spacer(),
|
||||
Icon(
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_page/splash/splash_page.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:wydj/hj_page/splash/splash_page.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
|
||||
/// 手势密码用途:设置 / 关闭 / 进 app 解锁校验
|
||||
enum MinePasswordType { setting, close, check }
|
||||
@@ -22,8 +22,9 @@ class MinePasswordLogic extends GetxController {
|
||||
|
||||
/// 校验/关闭模式下,把手势组件的 [answer] 设为已保存密码,让组件自己判断对错、
|
||||
/// 画错时展示错误态并停留;设置模式无旧密码,传 null 走 minLength 判断
|
||||
List<int>? get answer =>
|
||||
(isCheck || type == MinePasswordType.close) ? List<int>.from(globalStore.password) : null;
|
||||
List<int>? get answer => (isCheck || type == MinePasswordType.close)
|
||||
? List<int>.from(globalStore.password)
|
||||
: null;
|
||||
|
||||
/// 画完手势:设置/关闭成功即退出本页,解锁通过则回启动页重走流程
|
||||
Future<void> onComplete(List<int> result) async {
|
||||
@@ -37,7 +38,8 @@ class MinePasswordLogic extends GetxController {
|
||||
case MinePasswordType.close:
|
||||
if (await globalStore.closeLockPassword(result) == true) Get.back();
|
||||
case MinePasswordType.check:
|
||||
if (await globalStore.checkLockPassword(result) == true) Get.toNamed(SplashPage.routeName);
|
||||
if (await globalStore.checkLockPassword(result) == true)
|
||||
Get.toNamed(SplashPage.routeName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
|
||||
import '../mine_gesture_pwd/widget/gesture_password_widget.dart';
|
||||
import 'mine_password_logic.dart';
|
||||
@@ -31,15 +31,16 @@ class MinePasswordPage extends StatelessWidget {
|
||||
100.sizeBoxH,
|
||||
SafeArea(
|
||||
bottom: false,
|
||||
child: Image.asset('mine_lock_password.png'.mineImgPath, width: 29),
|
||||
child: Image.asset('mine_lock_password.png'.mineImgPath,
|
||||
width: 29),
|
||||
),
|
||||
],
|
||||
if(!logic.isCheck)
|
||||
129.sizeBoxH,
|
||||
if (!logic.isCheck) 129.sizeBoxH,
|
||||
24.sizeBoxH,
|
||||
Text(
|
||||
logic.title,
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.9), fontSize: 18),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.9), fontSize: 18),
|
||||
),
|
||||
75.sizeBoxH,
|
||||
GesturePasswordWidget(
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:image_pickers/image_pickers.dart';
|
||||
import 'package:hgmj/hj_utils/image_util.dart';
|
||||
import 'package:hgmj/tools_base/event_bus/event_bus_util.dart';
|
||||
import 'package:hgmj/tools_base/event_bus/events.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_helper.dart';
|
||||
import 'package:hgmj/tools_base/net/net_manager.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:wydj/hj_utils/image_util.dart';
|
||||
import 'package:wydj/tools_base/event_bus/event_bus_util.dart';
|
||||
import 'package:wydj/tools_base/event_bus/events.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_helper.dart';
|
||||
import 'package:wydj/tools_base/net/net_manager.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
import 'package:qr_code_scanner/qr_code_scanner.dart';
|
||||
|
||||
import '../identity/mine_identity_page.dart';
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:qr_code_scanner/qr_code_scanner.dart';
|
||||
|
||||
import 'mine_scan_login_logic.dart';
|
||||
@@ -27,7 +27,8 @@ class _MineScanLoginPageState extends State<MineScanLoginPage> {
|
||||
backgroundColor: Colors.transparent,
|
||||
title: Text(
|
||||
'扫码登录',
|
||||
style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w500),
|
||||
style: TextStyle(
|
||||
color: Colors.white, fontSize: 18, fontWeight: FontWeight.w500),
|
||||
),
|
||||
),
|
||||
body: Stack(
|
||||
@@ -59,7 +60,10 @@ class _MineScanLoginPageState extends State<MineScanLoginPage> {
|
||||
12.sizeBoxH,
|
||||
Text(
|
||||
'相册',
|
||||
style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w500),
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500),
|
||||
)
|
||||
],
|
||||
),
|
||||
@@ -74,7 +78,10 @@ class _MineScanLoginPageState extends State<MineScanLoginPage> {
|
||||
12.sizeBoxH,
|
||||
Text(
|
||||
'我的凭证',
|
||||
style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w500),
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500),
|
||||
)
|
||||
],
|
||||
),
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hgmj/assets_tool/app_colors.dart';
|
||||
import 'package:hgmj/routers/jump_router.dart';
|
||||
import 'package:wydj/assets_tool/app_colors.dart';
|
||||
import 'package:wydj/routers/jump_router.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/config/config.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/hj_utils/version_util.dart';
|
||||
import 'package:hgmj/hj_utils/video_cache_manager.dart';
|
||||
import 'package:hgmj/tools_base/cache/cache_util.dart';
|
||||
import 'package:hgmj/tools_base/cache/image_cache_manager.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:hgmj/tools_base/image/image_disk_cache.dart';
|
||||
import 'package:hgmj/tools_base/video_download/video_download_manager.dart';
|
||||
import 'package:hgmj/tools_base/widget/net_image_widget.dart';
|
||||
import 'package:wydj/config/config.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/hj_utils/version_util.dart';
|
||||
import 'package:wydj/hj_utils/video_cache_manager.dart';
|
||||
import 'package:wydj/tools_base/cache/cache_util.dart';
|
||||
import 'package:wydj/tools_base/cache/image_cache_manager.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/tools_base/image/image_disk_cache.dart';
|
||||
import 'package:wydj/tools_base/video_download/video_download_manager.dart';
|
||||
import 'package:wydj/tools_base/widget/net_image_widget.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:hgmj/tools_base/widget/common_alert.dart';
|
||||
import 'package:wydj/tools_base/widget/common_alert.dart';
|
||||
|
||||
import '../../../alert/splash/update_dialog.dart';
|
||||
import '../identity/mine_identity_page.dart';
|
||||
@@ -103,7 +103,8 @@ class _MineSettingPageState extends State<MineSettingPage> {
|
||||
}
|
||||
return;
|
||||
}
|
||||
Get.to(() => const SettingProfilePage(SettingProfileType.nickName));
|
||||
Get.to(() =>
|
||||
const SettingProfilePage(SettingProfileType.nickName));
|
||||
}),
|
||||
_buildLine(),
|
||||
_buildItem(
|
||||
@@ -167,7 +168,9 @@ class _MineSettingPageState extends State<MineSettingPage> {
|
||||
onTap: () {
|
||||
//比对启动页拉到的版本配置,确实有新版才弹更新框
|
||||
final target = checkUpdate();
|
||||
target == null ? showToast("当前已是最新版!") : UpdateDialog.show(target);
|
||||
target == null
|
||||
? showToast("当前已是最新版!")
|
||||
: UpdateDialog.show(target);
|
||||
}),
|
||||
_buildLine(),
|
||||
],
|
||||
@@ -197,7 +200,8 @@ class _MineSettingPageState extends State<MineSettingPage> {
|
||||
children: [
|
||||
Text(
|
||||
title,
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.9), fontSize: 14),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.9), fontSize: 14),
|
||||
),
|
||||
Spacer(),
|
||||
if (avatarUrl != null)
|
||||
@@ -210,13 +214,15 @@ class _MineSettingPageState extends State<MineSettingPage> {
|
||||
if (subTitle != null)
|
||||
Text(
|
||||
subTitle,
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.45), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.45), fontSize: 12),
|
||||
),
|
||||
if (showCopy) ...[
|
||||
4.sizeBoxW,
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
Clipboard.setData(ClipboardData(text: '${globalStore.meInfo?.uid}'));
|
||||
Clipboard.setData(
|
||||
ClipboardData(text: '${globalStore.meInfo?.uid}'));
|
||||
showToast('复制成功');
|
||||
},
|
||||
child: Container(
|
||||
@@ -230,7 +236,10 @@ class _MineSettingPageState extends State<MineSettingPage> {
|
||||
),
|
||||
child: const Text(
|
||||
'复制',
|
||||
style: TextStyle(color: Colors.black, fontSize: 12, fontWeight: FontWeight.w500),
|
||||
style: TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_helper.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:wydj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_helper.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
|
||||
import 'mine_setting_profile_page.dart';
|
||||
import 'setting_profile_widget.dart';
|
||||
@@ -76,7 +76,8 @@ class SettingSloganController extends MineSettingProfilePage {
|
||||
}
|
||||
}
|
||||
|
||||
MineSettingProfilePage instanceSettingProfileController(SettingProfileType type) {
|
||||
MineSettingProfilePage instanceSettingProfileController(
|
||||
SettingProfileType type) {
|
||||
switch (type) {
|
||||
case SettingProfileType.nickName:
|
||||
return SettingNickNameController();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
|
||||
import 'mine_setting_profile_logic.dart';
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:hgmj/tools_base/base_list_controller.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:wydj/hj_utils/api_service/mine_service.dart';
|
||||
import 'package:wydj/tools_base/base_list_controller.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
|
||||
class SettingAvatarLogic extends ListBaseLogic<String> {
|
||||
int selectIndex = -1;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:hgmj/tools_base/widget/net_image_widget.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:wydj/tools_base/widget/net_image_widget.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'setting_avatar_logic.dart';
|
||||
@@ -21,11 +21,13 @@ class SettingAvatarPage extends StatelessWidget {
|
||||
appBar: AppBar(
|
||||
title: Text('选择头像'),
|
||||
actions: [
|
||||
InkWell(enableFeedback: false,
|
||||
InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: controller.confirmChangeAvatar,
|
||||
child: Text(
|
||||
'保存',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.55), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.55), fontSize: 12),
|
||||
),
|
||||
),
|
||||
16.sizeBoxW,
|
||||
@@ -48,7 +50,8 @@ class SettingAvatarPage extends StatelessWidget {
|
||||
10.verticalSpace,
|
||||
Text(
|
||||
'当前头像',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.55), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.55), fontSize: 12),
|
||||
),
|
||||
20.verticalSpace,
|
||||
Expanded(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/tools_base/global_store/store.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/tools_base/global_store/store.dart';
|
||||
|
||||
import 'mine_setting_profile_logic.dart';
|
||||
|
||||
@@ -35,21 +35,27 @@ class _SettingNickNameState extends State<SettingNickName> {
|
||||
child: TextField(
|
||||
controller: controller.nickNameTfCtr,
|
||||
maxLength: 20,
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.9), fontSize: 18),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.9), fontSize: 18),
|
||||
decoration: InputDecoration(
|
||||
border: InputBorder.none,
|
||||
hintText: '输入新的昵称',
|
||||
hintStyle: TextStyle(color: Colors.white.withValues(alpha: 0.35), fontSize: 18),
|
||||
hintStyle: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.35),
|
||||
fontSize: 18),
|
||||
counterText: '',
|
||||
isCollapsed: true,
|
||||
contentPadding: EdgeInsets.zero),
|
||||
),
|
||||
),
|
||||
InkWell(enableFeedback: false,
|
||||
InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () => controller.nickNameTfCtr.clear(),
|
||||
child: Container(
|
||||
padding: EdgeInsets.all(2),
|
||||
decoration: BoxDecoration(color: Colors.black.withValues(alpha: 0.9), borderRadius: BorderRadius.circular(90)),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black.withValues(alpha: 0.9),
|
||||
borderRadius: BorderRadius.circular(90)),
|
||||
child: Image.asset(
|
||||
'close_button.png'.commonImgPath,
|
||||
width: 24,
|
||||
@@ -62,7 +68,8 @@ class _SettingNickNameState extends State<SettingNickName> {
|
||||
12.sizeBoxH,
|
||||
Text(
|
||||
'昵称30天内可修改4次',
|
||||
style: TextStyle(color: Colors.white.withValues(alpha: 0.35), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.35), fontSize: 12),
|
||||
)
|
||||
],
|
||||
),
|
||||
@@ -85,7 +92,9 @@ class _SettingSloganState extends State<SettingSlogan> {
|
||||
return Container(
|
||||
margin: EdgeInsets.only(left: 16, top: 12, right: 16),
|
||||
padding: EdgeInsets.all(10),
|
||||
decoration: BoxDecoration(color: Colors.black.withValues(alpha: .04), borderRadius: BorderRadius.circular(8)),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black.withValues(alpha: .04),
|
||||
borderRadius: BorderRadius.circular(8)),
|
||||
constraints: BoxConstraints(
|
||||
minHeight: 111,
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user