HI-VPN/hi-client
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: bugfix

Browse Source
This commit is contained in:
speakeloudest
2025-12-03 01:28:18 -08:00
parent dbcdf8b8a4
commit ce4abb7e01
15 changed files with 280 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/app/modules/kr_home/views/hi_animated_connect_button.dart
+46 -30
View File
@@ -1,6 +1,7 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:kaer_with_panels/app/modules/kr_home/controllers/kr_home_controller.dart';
import 'package:kaer_with_panels/app/widgets/kr_local_image.dart';
@@ -25,14 +26,16 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
final delay = controller.kr_currentNodeLatency.value;
// 🔧 关键: 强制读取两个 observable 确保追踪
final _ = KRSingBoxImp.instance.kr_status.value; // 强制追踪
final isConnected = controller.kr_isConnected.value; // 使用 controller 的状态
final _ = KRSingBoxImp.instance.kr_status.value; // 强制追踪
final isConnected = controller.kr_isConnected.value; // 使用 controller 的状态
// 再次读取状态用于判断
final status = KRSingBoxImp.instance.kr_status.value;
final isSwitching = status is SingboxStarting || status is SingboxStopping;
final isSwitching =
status is SingboxStarting || status is SingboxStopping;
print('🔵 Switch UI 更新: status=${status.runtimeType}, isConnected=$isConnected, isSwitching=$isSwitching');
print(
'🔵 Switch UI 更新: status=${status.runtimeType}, isConnected=$isConnected, isSwitching=$isSwitching');
final isShow = delay == -1 || isConnected;
@@ -61,32 +64,37 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
maxWidth: buttonSize * 3,
maxHeight: buttonSize * 3,
child: ContinuousRippleEffect(
color: Theme.of(context).primaryColor
),
color: Theme.of(context).primaryColor),
),
),
if (!isShow)
Positioned(
top: -20, // 距离顶部 10.w
top: -20, // 距离顶部 10.w
left: 115, // 距离右侧 10.w
child: KrLocalImage(
imageName: "hi-home-slogan",
imageType: ImageType.svg,
),
),
/// ✅ 按钮主体
Material(
shape: const CircleBorder(),
color: isShow ? Colors.transparent : Theme.of(context).primaryColor,
color: isShow
? Colors.transparent
: Theme.of(context).primaryColor,
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: () {
if(isSwitching) {
print('🔵 Switch UI 正在更新,切换中点击了按钮: status=${status.runtimeType}, isConnected=$isConnected, isSwitching=$isSwitching');
HapticFeedback.lightImpact();
if (isSwitching) {
print(
'🔵 Switch UI 正在更新,切换中点击了按钮: status=${status.runtimeType}, isConnected=$isConnected, isSwitching=$isSwitching');
return;
}
final current = controller.kr_subscribeService.kr_currentSubscribe.value;
final current = controller
.kr_subscribeService.kr_currentSubscribe.value;
bool hasValidSubscription = false;
if (current != null) {
DateTime? expire;
@@ -95,10 +103,12 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
} catch (_) {
expire = null;
}
hasValidSubscription = expire != null && expire.isAfter(DateTime.now());
hasValidSubscription =
expire != null && expire.isAfter(DateTime.now());
}
if (hasValidSubscription) {
controller.kr_toggleSwitch(!controller.kr_isConnected.value);
controller
.kr_toggleSwitch(!controller.kr_isConnected.value);
} else {
HIDialog.show(
customMessageWidget: Padding(
@@ -107,7 +117,10 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
'尚未购买套餐，请前往购买页面下单后即可开始极速网络体验',
textAlign: TextAlign.left,
style: KrAppTextStyle(
color: Theme.of(context).textTheme.bodyMedium?.color,
color: Theme.of(context)
.textTheme
.bodyMedium
?.color,
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
@@ -116,7 +129,8 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
cancelText: '取消',
confirmText: '前往',
onConfirm: () {
GlobalOverlayService.instance.triggerSubscriptionAnimation();
GlobalOverlayService.instance
.triggerSubscriptionAnimation();
},
);
}
@@ -128,7 +142,8 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
alignment: Alignment.center,
children: [
if (isShow)
/// ✅ isShow = true，图片居中，文字贴近底部
/// ✅ isShow = true，图片居中，文字贴近底部
Stack(
alignment: Alignment.center,
children: [
@@ -148,20 +163,21 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
controller.kr_connectText.value == '已连接'
? '已连接\n点击断开'
: controller.kr_connectText.value,
key: ValueKey(controller.kr_connectText.value),
key: ValueKey(
controller.kr_connectText.value),
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.black,
fontSize: 18,
fontWeight: FontWeight.bold,
height: 1
),
color: Colors.black,
fontSize: 18,
fontWeight: FontWeight.bold,
height: 1),
),
),
],
)
else
/// ✅ isShow = false，恢复原本布局
/// ✅ isShow = false，恢复原本布局
Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
@@ -176,7 +192,8 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
controller.kr_connectText.value == '已连接'
? '已连接\n点击断开'
: controller.kr_connectText.value,
key: ValueKey(controller.kr_connectText.value),
key:
ValueKey(controller.kr_connectText.value),
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.black,
@@ -189,11 +206,8 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
],
),
),
),
),
],
),
),
@@ -202,6 +216,7 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
});
}
}
/// ✅ 呼吸式同心圆动画（最小圆固定270，其他圆在270~479间波动，初始直径差10%）
/// ✅ 呼吸式同心圆动画（所有圆在270~470之间运动，起点相同但周期不同）
class ContinuousRippleEffect extends StatefulWidget {
@@ -232,10 +247,11 @@ class _ContinuousRippleEffectState extends State<ContinuousRippleEffect>
// 动画周期差异：外层慢，内层快
final duration = Duration(milliseconds: 3000 + i * 1200);
final controller =
AnimationController(vsync: this, duration: duration)..repeat(reverse: true);
final controller = AnimationController(vsync: this, duration: duration)
..repeat(reverse: true);
final curved = CurvedAnimation(parent: controller, curve: Curves.easeInOutSine);
final curved =
CurvedAnimation(parent: controller, curve: Curves.easeInOutSine);
_controllers.add(controller);
_animations.add(curved);
}