优化邀请码在不登录的时候要求客户去登录
This commit is contained in:
parent
17ea51b583
commit
f1a8dfe4e7
@ -201,6 +201,7 @@
|
|||||||
"myInviteCode": "My Invite Code",
|
"myInviteCode": "My Invite Code",
|
||||||
"inviteCodeCopied": "Invite code copied to clipboard",
|
"inviteCodeCopied": "Invite code copied to clipboard",
|
||||||
"close": "Close",
|
"close": "Close",
|
||||||
|
"pleaseLoginFirst": "Please login first to view invitation code",
|
||||||
"saveQRCode": "Save QR Code",
|
"saveQRCode": "Save QR Code",
|
||||||
"qrCodeSaved": "QR Code saved",
|
"qrCodeSaved": "QR Code saved",
|
||||||
"copiedToClipboard": "Copied to clipboard",
|
"copiedToClipboard": "Copied to clipboard",
|
||||||
|
|||||||
@ -264,6 +264,7 @@
|
|||||||
"myInviteCode": "我的邀请码",
|
"myInviteCode": "我的邀请码",
|
||||||
"inviteCodeCopied": "邀请码已复制到剪贴板",
|
"inviteCodeCopied": "邀请码已复制到剪贴板",
|
||||||
"close": "关闭",
|
"close": "关闭",
|
||||||
|
"pleaseLoginFirst": "请先登录后查看邀请码",
|
||||||
"saveQRCode": "保存二维码",
|
"saveQRCode": "保存二维码",
|
||||||
"qrCodeSaved": "二维码已保存",
|
"qrCodeSaved": "二维码已保存",
|
||||||
"copiedToClipboard": "已复制到剪贴板",
|
"copiedToClipboard": "已复制到剪贴板",
|
||||||
|
|||||||
@ -653,6 +653,9 @@ class AppTranslationsInvite {
|
|||||||
|
|
||||||
/// 关闭
|
/// 关闭
|
||||||
String get close => 'invite.close'.tr;
|
String get close => 'invite.close'.tr;
|
||||||
|
|
||||||
|
/// 请先登录
|
||||||
|
String get pleaseLoginFirst => 'invite.pleaseLoginFirst'.tr;
|
||||||
}
|
}
|
||||||
|
|
||||||
class AppTranslationsMessage {
|
class AppTranslationsMessage {
|
||||||
|
|||||||
@ -13,6 +13,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
|
|||||||
import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';
|
import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';
|
||||||
import 'package:kaer_with_panels/app/modules/kr_main/controllers/kr_main_controller.dart';
|
import 'package:kaer_with_panels/app/modules/kr_main/controllers/kr_main_controller.dart';
|
||||||
import 'package:easy_refresh/easy_refresh.dart';
|
import 'package:easy_refresh/easy_refresh.dart';
|
||||||
|
import 'package:kaer_with_panels/app/widgets/dialogs/kr_dialog.dart';
|
||||||
|
|
||||||
/// 邀请进度状态
|
/// 邀请进度状态
|
||||||
class KRInviteProgress {
|
class KRInviteProgress {
|
||||||
@ -47,13 +48,22 @@ class KRInviteController extends GetxController {
|
|||||||
final count = 0.obs;
|
final count = 0.obs;
|
||||||
final EasyRefreshController refreshController = EasyRefreshController();
|
final EasyRefreshController refreshController = EasyRefreshController();
|
||||||
|
|
||||||
|
// 用于标记是否已经显示过对话框(避免重复弹出)
|
||||||
|
bool _hasShownDialog = false;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void onInit() {
|
void onInit() {
|
||||||
super.onInit();
|
super.onInit();
|
||||||
ever(KRAppRunData.getInstance().kr_isLogin, (value) {
|
|
||||||
if (value) {
|
final appRunData = KRAppRunData.getInstance();
|
||||||
|
|
||||||
|
// 监听登录状态变化
|
||||||
|
ever(appRunData.kr_isLogin, (value) {
|
||||||
|
// 只有账号密码登录才获取数据
|
||||||
|
if (value && !appRunData.isDeviceLogin()) {
|
||||||
_kr_fetchUserInfo();
|
_kr_fetchUserInfo();
|
||||||
_kr_fetchAffiliateCount();
|
_kr_fetchAffiliateCount();
|
||||||
|
_hasShownDialog = false; // 重置对话框标记
|
||||||
} else {
|
} else {
|
||||||
kr_progress.value = KRInviteProgress(
|
kr_progress.value = KRInviteProgress(
|
||||||
pending: 0,
|
pending: 0,
|
||||||
@ -66,12 +76,68 @@ class KRInviteController extends GetxController {
|
|||||||
kr_referCode.value = '';
|
kr_referCode.value = '';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (KRAppRunData.getInstance().kr_isLogin.value) {
|
|
||||||
|
// 如果已经是正常登录状态,加载数据
|
||||||
|
if (appRunData.kr_isLogin.value && !appRunData.isDeviceLogin()) {
|
||||||
_kr_fetchUserInfo();
|
_kr_fetchUserInfo();
|
||||||
_kr_fetchAffiliateCount();
|
_kr_fetchAffiliateCount();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 当页面进入视图时调用(从视图层调用)
|
||||||
|
void kr_onPageEnter() {
|
||||||
|
final appRunData = KRAppRunData.getInstance();
|
||||||
|
final isDeviceLogin = appRunData.isDeviceLogin();
|
||||||
|
|
||||||
|
KRLogUtil.kr_i('📄 [InviteController] 页面进入', tag: 'InviteController');
|
||||||
|
KRLogUtil.kr_i(' - kr_isLogin: ${appRunData.kr_isLogin.value}', tag: 'InviteController');
|
||||||
|
KRLogUtil.kr_i(' - isDeviceLogin: $isDeviceLogin', tag: 'InviteController');
|
||||||
|
KRLogUtil.kr_i(' - _hasShownDialog: $_hasShownDialog', tag: 'InviteController');
|
||||||
|
|
||||||
|
// 如果未登录或设备登录,且还没显示过对话框
|
||||||
|
if ((!appRunData.kr_isLogin.value || isDeviceLogin) && !_hasShownDialog) {
|
||||||
|
_hasShownDialog = true; // 标记已显示
|
||||||
|
|
||||||
|
KRLogUtil.kr_i('🔒 [InviteController] 未登录或设备登录,显示绑定提示对话框', tag: 'InviteController');
|
||||||
|
|
||||||
|
// 延迟执行,确保页面加载完成
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
KRLogUtil.kr_i('💬 [InviteController] 准备显示对话框...', tag: 'InviteController');
|
||||||
|
try {
|
||||||
|
KRDialog.show(
|
||||||
|
title: AppTranslations.kr_dialog.deviceLoginBindingTitle,
|
||||||
|
message: AppTranslations.kr_dialog.deviceLoginBindingMessage,
|
||||||
|
confirmText: AppTranslations.kr_dialog.kr_ok,
|
||||||
|
cancelText: AppTranslations.kr_dialog.kr_cancel,
|
||||||
|
onConfirm: () {
|
||||||
|
KRLogUtil.kr_i('✅ [InviteController] 用户点击确定,跳转到登录页', tag: 'InviteController');
|
||||||
|
Get.back(); // 关闭对话框
|
||||||
|
// 等待对话框完全关闭后再跳转到登录页面
|
||||||
|
Future.delayed(const Duration(milliseconds: 300), () {
|
||||||
|
// 先跳转到首页,确保登录后返回到首页而不是邀请页面
|
||||||
|
Get.find<KRMainController>().kr_setPage(0);
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
Get.toNamed(Routes.MR_LOGIN);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onCancel: () {
|
||||||
|
KRLogUtil.kr_i('❌ [InviteController] 用户点击取消,返回首页', tag: 'InviteController');
|
||||||
|
Get.back(); // 关闭对话框
|
||||||
|
// 等待对话框完全关闭后再跳转到首页
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
Get.find<KRMainController>().kr_setPage(0);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
KRLogUtil.kr_i('✅ [InviteController] 对话框已显示', tag: 'InviteController');
|
||||||
|
} catch (e) {
|
||||||
|
KRLogUtil.kr_e('❌ [InviteController] 显示对话框失败: $e', tag: 'InviteController');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ⚠️ 已废弃:新版本后端不再提供 kr_getUserInfo 接口
|
// ⚠️ 已废弃:新版本后端不再提供 kr_getUserInfo 接口
|
||||||
// 从 AppRunData 获取邀请码(登录后自动获取)
|
// 从 AppRunData 获取邀请码(登录后自动获取)
|
||||||
Future<void> _kr_fetchUserInfo() async {
|
Future<void> _kr_fetchUserInfo() async {
|
||||||
@ -105,7 +171,9 @@ class KRInviteController extends GetxController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<bool> kr_checkLoginStatus() async {
|
Future<bool> kr_checkLoginStatus() async {
|
||||||
return KRAppRunData.getInstance().kr_isLogin.value;
|
final appRunData = KRAppRunData.getInstance();
|
||||||
|
// 只有账号密码登录才算登录,设备登录不算
|
||||||
|
return appRunData.kr_isLogin.value && !appRunData.isDeviceLogin();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 获取分享链接
|
/// 获取分享链接
|
||||||
@ -306,11 +374,13 @@ class KRInviteController extends GetxController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> kr_onRefresh() async {
|
Future<void> kr_onRefresh() async {
|
||||||
if (!KRAppRunData.getInstance().kr_isLogin.value) {
|
final appRunData = KRAppRunData.getInstance();
|
||||||
|
// 只有账号密码登录才允许刷新
|
||||||
|
if (!appRunData.kr_isLogin.value || appRunData.isDeviceLogin()) {
|
||||||
refreshController.finishRefresh();
|
refreshController.finishRefresh();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await _kr_fetchUserInfo();
|
await _kr_fetchUserInfo();
|
||||||
await _kr_fetchAffiliateCount();
|
await _kr_fetchAffiliateCount();
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||||
import 'package:kaer_with_panels/app/common/app_config.dart';
|
import 'package:kaer_with_panels/app/common/app_config.dart';
|
||||||
|
import 'package:kaer_with_panels/app/common/app_run_data.dart';
|
||||||
import 'package:kaer_with_panels/app/localization/app_translations.dart';
|
import 'package:kaer_with_panels/app/localization/app_translations.dart';
|
||||||
import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';
|
import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';
|
||||||
import 'package:kaer_with_panels/app/widgets/kr_local_image.dart';
|
import 'package:kaer_with_panels/app/widgets/kr_local_image.dart';
|
||||||
@ -48,16 +49,32 @@ class KRInviteView extends GetView<KRInviteController> {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: Theme.of(context).primaryColor,
|
backgroundColor: Theme.of(context).primaryColor,
|
||||||
body: EasyRefresh(
|
body: Obx(() {
|
||||||
controller: controller.refreshController,
|
// 使用 Obx 响应式监听登录状态
|
||||||
onRefresh: controller.kr_onRefresh,
|
final appRunData = KRAppRunData.getInstance();
|
||||||
header: DeliveryHeader(
|
final isDeviceLogin = appRunData.isDeviceLogin();
|
||||||
triggerOffset: 50.0,
|
final isLoggedIn = appRunData.kr_isLogin.value && !isDeviceLogin;
|
||||||
springRebound: true,
|
|
||||||
),
|
if (!isLoggedIn) {
|
||||||
child: CustomScrollView(
|
// 未登录或设备登录,显示空白页面并触发对话框
|
||||||
physics: const BouncingScrollPhysics(),
|
// 使用 WidgetsBinding 确保在构建完成后调用
|
||||||
slivers: [
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
controller.kr_onPageEnter();
|
||||||
|
});
|
||||||
|
return Container(); // 空白容器
|
||||||
|
}
|
||||||
|
|
||||||
|
// 正常登录用户显示邀请页面内容
|
||||||
|
return EasyRefresh(
|
||||||
|
controller: controller.refreshController,
|
||||||
|
onRefresh: controller.kr_onRefresh,
|
||||||
|
header: DeliveryHeader(
|
||||||
|
triggerOffset: 50.0,
|
||||||
|
springRebound: true,
|
||||||
|
),
|
||||||
|
child: CustomScrollView(
|
||||||
|
physics: const BouncingScrollPhysics(),
|
||||||
|
slivers: [
|
||||||
SliverAppBar(
|
SliverAppBar(
|
||||||
expandedHeight: 150.w,
|
expandedHeight: 150.w,
|
||||||
floating: false,
|
floating: false,
|
||||||
@ -140,7 +157,8 @@ class KRInviteView extends GetView<KRInviteController> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
);
|
||||||
|
}), // 闭合 Obx
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user