常守达 / doublefeel_flutter · Commits

Go to a project

Commit 6057916c3a57140859e33e19eb909b78cd91e182

Authored by 常守达
1 parent 71db927b
build: skipped

fix(today)：看板问题修复

Inline Side-by-side
Showing 25 changed files with 1091 additions and 334 deletions
... ... @@ -8,6 +8,7 @@ import '../../core/services/user_state_service.dart';
import '../../data/local/local_storage.dart';
import '../../data/local/user_account_storage.dart';
import '../../data/local/user_preferences_storage.dart';
import '../../core/services/loading_service.dart';
import '../bindings/initial_binding.dart';
/// Application startup before [runApp].
... ... @@ -36,6 +37,8 @@ abstract final class AppBootstrap {
localStorage: local,
).dependencies();
LoadingService.init();
if (local.termsAgreed) {
await Get.find<UserStateService>().initializeSdks();
}
... ...
... ... @@ -66,11 +66,8 @@ class BindPartnerController extends GetxController {
void onShareMyCode() async {
try {
final success =
await PlatformHostApi().shareText("""嘿 ❤️ 我发现了一个叫 DoubleFeel 的 App！
它可以帮我们互相关心 — 记录压力和睡眠、查看 HRV 与身体状态、及时了解彼此的健康状况。
快来一起使用吧 👉 https://doublefeel.cn/
我的好友id：${myInviteCode.value}""");
final success = await PlatformHostApi()
.shareText(l10n.sharePartnerCodeTemplate(myInviteCode.value));
} catch (e) {
AppToast.show(e.toString());
}
... ... @@ -91,25 +88,25 @@ class BindPartnerController extends GetxController {
switch (err.businessCode) {
case -1011201:
DialogUtils.showCommonDialog(DialogMetaData(
title: '该ID不存在',
message: '这个ID不存在哦，请检查后重新输入',
confirmText: '我知道了',
title: l10n.bindPartnerIdNotExistTitle,
message: l10n.bindPartnerIdNotExistMessage,
confirmText: l10n.bindPartnerDialogGotIt,
iconAsset: null,
));
break;
case -1011202:
DialogUtils.showCommonDialog(DialogMetaData(
title: '添加失败',
message: '该用户不允许被添加好友，无法添加Ta哦',
confirmText: '我知道了',
title: l10n.bindPartnerAddFailedTitle,
message: l10n.bindPartnerAddFailedMessage,
confirmText: l10n.bindPartnerDialogGotIt,
iconAsset: null,
));
break;
case -1011203:
DialogUtils.showCommonDialog(DialogMetaData(
title: '对方已经是你的好友啦',
message: '请不要重复添加哦',
confirmText: '我知道了',
title: l10n.bindPartnerAlreadyFriendTitle,
message: l10n.bindPartnerAlreadyFriendMessage,
confirmText: l10n.bindPartnerDialogGotIt,
iconAsset: null,
));
break;
... ... @@ -125,40 +122,6 @@ class BindPartnerController extends GetxController {
}
break;
}
// if (result is AppFailure) {
// if (result.error is AppHttpError) {
// var error = result.error as AppHttpError;
// switch (error.businessCode) {
// case -1011201:
// DialogUtils.showCommonDialog(DialogMetaData(
// title: '该ID不存在',
// message: '这个ID不存在哦，请检查后重新输入',
// confirmText: '我知道了',
// iconAsset: null,
// ));
// break;
// case -1011202:
// DialogUtils.showCommonDialog(DialogMetaData(
// title: '添加失败',
// message: '该用户不允许被添加好友，无法添加Ta哦',
// confirmText: '我知道了',
// iconAsset: null,
// ));
// break;
// case -1011203:
// DialogUtils.showCommonDialog(DialogMetaData(
// title: '对方已经是你的好友啦',
// message: '请不要重复添加哦',
// confirmText: '我知道了',
// iconAsset: null,
// ));
// break;
// }
// }
// return;
// }
// if (result is AppSuccess) {}
} catch (e) {
} finally {
isSubmitting.value = false;
... ... @@ -168,25 +131,18 @@ class BindPartnerController extends GetxController {
Future<void> onSkip() async {
final userStateService = Get.find<UserStateService>();
if (!userStateService.isVip) {
await Get.toNamed(
// 使用 offNamed 移除 BIND_PARTNER，并将 onboarding 标识传入 PURCHASE
// 关闭 PURCHASE 后的跳转逻辑由 PurchaseController.onBackPressed() 接管
Get.offNamed(
Routes.PURCHASE,
arguments: {PurchaseRouteArgs.showCloseButton: true},
arguments: {
PurchaseRouteArgs.showCloseButton: true,
'from': 'onboarding',
},
);
final userStateService = Get.find<UserStateService>();
if (userStateService.isVip) {
Get.offAllNamed(AppRoutes.home);
} else {
await Future.delayed(Durations.medium1);
Get.toNamed(
Routes.MEMBERSHIP_OFFER,
arguments: {'from': 'onboarding'},
);
}
} else {
Get.offAllNamed(AppRoutes.home);
}
// Get.to(_BindSuccessPage(FriendItem(
// avatar: 'https://cdn.couple360.net/couple360/themes/im_theme7.png')));
}
}
... ... @@ -207,20 +163,13 @@ class _BindSuccessPage extends StatelessWidget {
onPressed: () async {
final userStateService = Get.find<UserStateService>();
if (!userStateService.isVip) {
await Get.toNamed(
Get.offNamed(
Routes.PURCHASE,
arguments: {PurchaseRouteArgs.showCloseButton: true},
arguments: {
PurchaseRouteArgs.showCloseButton: true,
'from': 'onboarding',
},
);
final userStateService = Get.find<UserStateService>();
if (userStateService.isVip) {
Get.offAllNamed(AppRoutes.home);
} else {
await Future.delayed(Durations.medium1);
Get.toNamed(
Routes.MEMBERSHIP_OFFER,
arguments: {'from': 'onboarding'},
);
}
} else {
Get.offAllNamed(AppRoutes.home);
}
... ...
... ... @@ -187,9 +187,7 @@ class _FeedbackInput extends GetView<SubmitFeedbackController> {
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
counterText: '',
hintText: '''1.请说明问题的界面和使用场景
2.请提供截图，以便提升解决问题效率
3.请留下联系方式，我们尽快回复联系您''',
hintText: context.l10n.feedbackHintText,
hintStyle: TextStyle(
color: context.colors.textTertiary,
fontSize: 14,
... ...
... ... @@ -21,6 +21,7 @@ import 'package:doublefeel_flutter/data/models/friend/friend_models.dart';
import 'package:doublefeel_flutter/data/models/health/health_v2_models.dart';
import 'package:doublefeel_flutter/data/models/local/user_preferences.dart';
import 'package:doublefeel_flutter/data/models/pay/pay_models.dart';
import 'package:doublefeel_flutter/l10n/l10n_extensions.dart';
import 'package:doublefeel_flutter/pigeon/health_kit_api.g.dart';
import 'package:doublefeel_flutter/pigeon/platform_api.g.dart';
import 'package:doublefeel_flutter/pigeon/wear_engine_api.g.dart';
... ... @@ -89,7 +90,7 @@ class TodayController extends GetMaterialController {
final isLoadingToday = false.obs;
final showHealthDataAuthCardStatus = 1.obs;
final stressSubtitle = 'Hi, 你今日的综合压力状态'.obs;
final stressSubtitle = ''.obs;
// ── HRV 表盘引导 Banner ───────────────────
final showHrvAdBanner = false.obs;
... ... @@ -267,13 +268,13 @@ class TodayController extends GetMaterialController {
if (showHealthDataAuthCardStatus.value == 1) {
return;
} else if (showHealthDataAuthCardStatus.value == 0) {
Get.to(NoHealthDataPage(
onRefresh: requestHealthAuthorization,
));
} else {
Get.to(NoHealthDataNoPermissionPage(
onRequest: requestHealthAuthorization,
));
} else {
Get.to(NoHealthDataPage(
onRefresh: requestHealthAuthorization,
));
}
}
... ... @@ -296,18 +297,17 @@ class TodayController extends GetMaterialController {
Future<void> checkHealthDataAuthCardVisible() async {
try {
final result = await _hostApi.checkHealthAppAuthorization();
if (result.status == 1) {
await _performDataUpload();
}
final hasUploaded =
switch (await _healthApi.getHealthDataEverUploaded()) {
AppSuccess(:final data) => data,
AppFailure() => false,
};
final result = await _hostApi.checkHealthAppAuthorization();
if (result.status == 1) {
_performDataUpload();
}
showHealthDataAuthCardStatus.value = !hasUploaded ? 0 : result.status;
showHealthDataAuthCardStatus.value = !hasUploaded ? -1 : result.status;
} catch (e) {}
}
... ... @@ -316,7 +316,8 @@ class TodayController extends GetMaterialController {
final intDate = int.parse(DateFormat('yyyyMMdd').format(date));
final isToday = DateUtils.isSameDay(date, lastSelectableDay);
stressSubtitle.value = isToday ? 'Hi, 你今日的综合压力状态' : '该日压力状态';
stressSubtitle.value = (isFriend ? 'Ta' : '') +
(isToday ? l10n.overallStressLevelToday : l10n.stressLevelsOnThatDay);
switch (await _healthApi.getV2HealthData(friendUserId, intDate)) {
case AppSuccess(:final data):
v2HealthData.value = data;
... ...
... ... @@ -271,7 +271,7 @@ class _Avatar extends StatelessWidget {
),
alignment: Alignment.center,
child: Text(
'拍摄',
l10n.filming,
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 14,
... ... @@ -298,7 +298,7 @@ class _Avatar extends StatelessWidget {
),
alignment: Alignment.center,
child: Text(
'相册上传',
l10n.uploadPhotos,
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 14,
... ... @@ -321,7 +321,7 @@ class _Avatar extends StatelessWidget {
),
alignment: Alignment.center,
child: Text(
'取消',
l10n.cancel,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 14,
... ... @@ -396,8 +396,8 @@ class _UnlockPremiumCard extends StatelessWidget {
Color(0xFFFFFFFF)
],
).createShader(bounds),
child: const Text(
'解锁专业版',
child: Text(
l10n.unlockTheProVersion,
style: TextStyle(
color: Colors.white,
fontSize: 16,
... ... @@ -409,14 +409,15 @@ class _UnlockPremiumCard extends StatelessWidget {
height: 4,
),
Text(
'开启压力预警与健康陪伴之旅',
textAlign: TextAlign.center,
l10n.embarkOnAJourneyOfStressAwarenessAndWellnessSupport,
textAlign: TextAlign.left,
style: TextStyle(
color: const Color(0xFFC6B2FF),
fontSize: 12,
fontFamily: 'PingFang SC',
fontWeight: FontWeight.w500,
),
color: const Color(0xFFC6B2FF),
fontSize: 12,
fontWeight: FontWeight.w500,
height: 1.2),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
Container(
height: 32,
... ... @@ -445,7 +446,7 @@ class _UnlockPremiumCard extends StatelessWidget {
height: 18,
color: context.colors.textPrimary),
Text(
'立即解锁',
l10n.unlockNow,
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 14,
... ...
... ... @@ -2,6 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:doublefeel_flutter/app/modules/home/widgets/today/hrv_measurement_bottom_sheet.dart';
import 'package:doublefeel_flutter/app/modules/report_common/models/report_period.dart';
import 'package:doublefeel_flutter/app/modules/report_common/widgets/report_bottom_slogan.dart';
import 'package:doublefeel_flutter/app/modules/report_common/widgets/report_date_picker_sheet.dart';
import 'package:doublefeel_flutter/core/services/user_state_service.dart';
... ... @@ -166,7 +167,7 @@ class TodayTabBody extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
controller.stressSubtitle.value,
'Hi,${controller.stressSubtitle.value}',
textAlign: TextAlign.center,
style: const TextStyle(
color: Color(0xFF78787D),
... ... @@ -246,7 +247,10 @@ class TodayTabBody extends StatelessWidget {
Padding(
padding: const EdgeInsets.symmetric(vertical: 12),
child: Text(
controller.isFriend ? 'TA的今日行动' : context.l10n.dailyActions,
(controller.isFriend
? context.l10n
.reportOtherPossessiveTitle(context.l10n.dailyActions)
: context.l10n.dailyActions),
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 16,
... ... @@ -259,14 +263,10 @@ class TodayTabBody extends StatelessWidget {
Container(
alignment: Alignment.center,
margin: EdgeInsets.only(
bottom: 16 + MediaQuery.paddingOf(context).bottom,
top: 28,
),
child: Image.asset(
'assets/images/common/ic_bottom_slogan.png',
width: 223,
height: 35,
bottom: 16,
// top: 28,
),
child: ReportBottomSlogan(),
),
]),
),
... ... @@ -425,7 +425,7 @@ class TodayTabBody extends StatelessWidget {
: null,
child: Text(
isSameDay(day, controller.lastSelectableDay)
? AppLocalizations.of(context)!.today
? l10n.todayOnWeeklyCalendar
: _weekdayText(context, day),
style: TextStyle(
color: _calendarTextColor(context, day, selected: selected),
... ... @@ -489,7 +489,7 @@ class TodayTabBody extends StatelessWidget {
return context.l10n.yesterday;
}
if (isSameDay(selectedDay, today.subtract(const Duration(days: 2)))) {
return '前天';
return l10n.theDayBeforeYesterday;
}
final locale = Localizations.localeOf(context).toString();
if (selectedDay.year == today.year) {
... ... @@ -571,7 +571,7 @@ class _LatestHrvCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'最近一次（$latestDataTimeText）',
'${l10n.mostRecent}（$latestDataTimeText）',
style: TextStyle(
color: colors.textSecondary,
fontSize: 12,
... ... @@ -661,7 +661,8 @@ class _TopFriendBar extends StatelessWidget {
),
),
Text(
'${controller.targetFriendInfo.value?.remarkName}的状态',
context.l10n.friendStatusTitle(
controller.targetFriendInfo.value?.remarkName ?? ''),
style: TextStyle(
color: Colors.black,
fontSize: 16,
... ... @@ -775,7 +776,7 @@ class _TopDateBar extends StatelessWidget {
),
const SizedBox(width: 2),
Text(
'20%优惠',
l10n.purchaseAnnualDiscount,
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
... ...
... ... @@ -6,6 +6,7 @@ import 'package:doublefeel_flutter/app/utils/dialog_utils.dart';
import 'package:doublefeel_flutter/core/network/api/user_api.dart';
import 'package:doublefeel_flutter/core/result/app_result.dart';
import 'package:doublefeel_flutter/core/services/loading_service.dart';
import 'package:doublefeel_flutter/core/services/user_state_service.dart';
import 'package:doublefeel_flutter/core/theme/app_colors.dart';
import 'package:doublefeel_flutter/core/theme/app_theme.dart';
... ... @@ -174,23 +175,28 @@ class AccountSettingView extends GetView<MyController> {
Future<void> _logout() async {
final confirmResult = await DialogUtils.showCommonDialog(DialogMetaData(
title: '退出登录',
message: '确认退出登录吗？',
confirmText: '确认退出',
title: l10n.logOut,
message: l10n.confirmLogoutPrompt,
confirmText: l10n.confirmLogout,
iconAsset: null));
if (confirmResult.action != DialogAction.confirm) return;
await Get.find<UserStateService>().onLogout();
AppToast.show('已退出登录');
await LoadingService.instance.run(() async {
await Get.find<UserStateService>().onLogout();
});
AppToast.show(l10n.loggedOutSuccessfully);
Get.offAllNamed(AppRoutes.login);
}
Future<void> _deleteAccount() async {
final deleteResult = await Get.find<UserApi>().deleteAccount();
if (deleteResult is! AppSuccess<void>) return;
await LoadingService.instance.run(() async {
final deleteResult = await Get.find<UserApi>().deleteAccount();
if (deleteResult is! AppSuccess<void>) return;
await Get.find<UserStateService>().onLogout(callServerLogout: false);
AppToast.show('账号注销成功');
await Get.find<UserStateService>().onLogout(callServerLogout: false);
});
AppToast.show(l10n.accountDeletedSuccessfully);
Get.offAllNamed(AppRoutes.login);
}
}
... ... @@ -269,7 +275,7 @@ class _DeleteAccountBottomSheet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'注销账号后将无法找回！请谨慎操作',
context.l10n.deleteAccountWarningTitle,
textAlign: TextAlign.center,
style: TextStyle(
color: context.colors.warning,
... ... @@ -281,7 +287,7 @@ class _DeleteAccountBottomSheet extends StatelessWidget {
height: 12,
),
Text(
'提示：注销账号将会删除该账号内包括但不限于\n个人资料、情绪记录、统计数据等全部信息。',
context.l10n.deleteAccountWarningPrompt,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -292,7 +298,7 @@ class _DeleteAccountBottomSheet extends StatelessWidget {
height: 12,
),
Text(
'注1：你的健康数据会保存在苹果健康，我们不会删除苹果健康中的数据。',
context.l10n.deleteAccountWarningNote1,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -303,7 +309,7 @@ class _DeleteAccountBottomSheet extends StatelessWidget {
height: 12,
),
Text(
'注2：删除账号不会影响你在App Store的订阅状态，如果需要取消订阅，请在APPs Store - 头像 - 订阅中手动取消订阅。',
context.l10n.deleteAccountWarningNote2,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ...
... ... @@ -59,7 +59,7 @@ class PremiumCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'年度会员优惠',
l10n.annualMemberDiscounts,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w500,
... ... @@ -81,11 +81,11 @@ class PremiumCard extends StatelessWidget {
),
),
const SizedBox(width: 4),
const Padding(
padding: EdgeInsets.only(bottom: 4),
Padding(
padding: const EdgeInsets.only(bottom: 4),
child: Text(
'优惠',
style: TextStyle(
l10n.specialOffers,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: _accent,
... ... @@ -102,7 +102,7 @@ class PremiumCard extends StatelessWidget {
? Row(
children: [
Text(
'现价',
l10n.currentPrice,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w500,
... ... @@ -120,7 +120,8 @@ class PremiumCard extends StatelessWidget {
),
const SizedBox(width: 8),
Text(
'原价${controller.originDisplayPrice()}',
l10n.originalPrice(
controller.originDisplayPrice()),
style: TextStyle(
fontSize: 12,
color: context.colors.textTertiary,
... ...
... ... @@ -130,16 +130,21 @@ class TodayHrvChartCard extends StatelessWidget {
return Row(
children: [
Text(
controller.isFriend
? (sameDay ? 'Ta的今日HRV趋势' : 'Ta的该日HRV趋势')
: (sameDay ? '今日HRV趋势' : context.l10n.averageHrvForTheDay),
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
Builder(builder: (context) {
final s = (sameDay
? context.l10n.todaySHrvTrend
: context.l10n.averageHrvForTheDay);
return Text(
(controller.isFriend
? context.l10n.reportOtherPossessiveTitle(s)
: s),
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w600,
),
);
}),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => showHrvPrincipleExplanationBottomSheet(context),
... ... @@ -353,7 +358,7 @@ class TodayHrvChartCard extends StatelessWidget {
return Stack(
children: [
if (stressPoints.isEmpty)
_EmptyChart(text: '暂无压力数据')
_EmptyChart(text: context.l10n.noPressureDataAvailableAtThisTime)
else
LayoutBuilder(
builder: (context, constraints) {
... ... @@ -623,7 +628,7 @@ class TodayHrvChartCard extends StatelessWidget {
color: context.colors.textTertiary,
),
Text(
'会员可查看完整数据',
context.l10n.membersCanViewTheCompleteData,
style: TextStyle(
color: context.colors.textTertiary,
fontSize: 14,
... ... @@ -647,8 +652,8 @@ class TodayHrvChartCard extends StatelessWidget {
borderRadius: BorderRadius.circular(24),
),
),
child: const Text(
'立即解锁',
child: Text(
context.l10n.unlockNow,
textAlign: TextAlign.center,
style: TextStyle(
color: Color(0xFF0F0F11),
... ... @@ -695,15 +700,15 @@ class TodayHrvChartCard extends StatelessWidget {
String _getStatusByState(int? state) {
switch (state) {
case 1:
return '压力过载';
return l10n.pressureOverload;
case 2:
return '注意压力';
return l10n.beMindfulOfStress;
case 3:
return '状态正常';
return l10n.statusNormal;
case 4:
return '状态优秀';
return l10n.inExcellentCondition;
}
return '等待数据';
return l10n.waitingForData;
}
List<TextSpan>? _getTooltip(BarChartRodData rod, int x, int? state) {
... ... @@ -723,7 +728,8 @@ class TodayHrvChartCard extends StatelessWidget {
),
),
TextSpan(
text: '♥ 压力 ${_formatNumber(rod.toY)} · ${_formatHour(x.toDouble())}',
text:
'♥ ${l10n.pressure} ${_formatNumber(rod.toY)} · ${_formatHour(x.toDouble())}',
style: const TextStyle(
color: Color(0xFF78787D),
fontWeight: FontWeight.bold,
... ...
... ... @@ -23,14 +23,17 @@ class TodayHrvNumberCard extends StatelessWidget {
var sameDay = DateUtils.isSameDay(
controller.selectedDate.value, controller.lastSelectableDay);
var otherHrv = (sameDay
? context.l10n.todaySHrvTrend
: context.l10n.averageHrvForTheDay);
return Row(
children: [
// HRV
Expanded(
child: _NumberItem(
label: controller.isFriend
? (sameDay ? 'Ta的今日平均HRV' : 'Ta的该日平均HRV')
: (sameDay ? '今日平均HRV' : context.l10n.averageHrvForTheDay),
? context.l10n.reportOtherPossessiveTitle(otherHrv)
: otherHrv,
value:
controller.v2HealthData.value?.hrvAvg?.toString() ?? '--',
unit: 'ms',
... ... @@ -40,7 +43,8 @@ class TodayHrvNumberCard extends StatelessWidget {
Expanded(
child: _NumberItem(
label: controller.isFriend
? 'Ta的静息心率'
? context.l10n.reportOtherPossessiveTitle(
context.l10n.restingHeartRate)
: context.l10n.restingHeartRate,
value: controller.v2HealthData.value?.lastRestingHrValue
?.toString() ??
... ...
... ... @@ -20,7 +20,7 @@ class TodaySleepCard extends StatelessWidget {
int sleepDuration = healthData?.sleepDuration ?? 0;
int sleepHours = sleepDuration ~/ 3600;
int sleepMinutes = sleepDuration % 60;
int sleepMinutes = (sleepDuration % 3600) ~/ 60;
Color sleepStateColor = sleepDuration == 0
? context.colors.textPrimary
: healthData?.sleepStateColor(context);
... ... @@ -46,9 +46,10 @@ class TodaySleepCard extends StatelessWidget {
label: context.l10n.duration,
labelColor: context.colors.primary,
valueSpans: [
_MetricValueSpan(sleepHours > 0 ? '$sleepHours' : '--', '小时'),
_MetricValueSpan(
sleepMinutes > 0 ? '$sleepMinutes' : '--', '分钟'),
sleepHours > 0 ? '$sleepHours' : '--', l10n.reportUnitHour),
_MetricValueSpan(sleepMinutes > 0 ? '$sleepMinutes' : '--',
l10n.reportUnitMinute),
],
),
_MetricData(
... ... @@ -121,22 +122,23 @@ class TodayActivityCard extends StatelessWidget {
final exHours = exercise ~/ 3600;
final exMinutes = (exercise % 3600) ~/ 60;
exerciseSpans = [
if (exHours > 0) _MetricValueSpan('$exHours', '小时'),
if (exHours > 0) _MetricValueSpan('$exHours', l10n.reportUnitHour),
if (exMinutes > 0 || exHours == 0)
_MetricValueSpan(exMinutes > 0 ? '$exMinutes' : '0', '分钟'),
_MetricValueSpan(
exMinutes > 0 ? '$exMinutes' : '0', l10n.reportUnitMinute),
];
} else {
exerciseSpans = [_MetricValueSpan('--', '分钟')];
exerciseSpans = [_MetricValueSpan('--', l10n.reportUnitMinute)];
}
// stand 单位为秒，转换为小时+分钟
List<_MetricValueSpan> standSpans;
if (stand > 0 && (activityTarget?.stand ?? 0) > 0) {
standSpans = [
_MetricValueSpan('$stand', '小时'),
_MetricValueSpan('$stand', l10n.reportUnitHour),
];
} else {
standSpans = [_MetricValueSpan('--', '小时')];
standSpans = [_MetricValueSpan('--', l10n.reportUnitHour)];
}
double activityProgress =
(activity > 0 && (activityTarget?.move ?? 0) > 0)
... ... @@ -160,7 +162,7 @@ class TodayActivityCard extends StatelessWidget {
label: context.l10n.event,
labelColor: context.colors.warning,
valueSpans: [
_MetricValueSpan(activityStr, '千卡'),
_MetricValueSpan(activityStr, l10n.reportUnitKcal),
],
),
_MetricData(
... ...
... ... @@ -19,6 +19,7 @@ import 'package:doublefeel_flutter/data/models/user/user_models.dart';
import 'package:doublefeel_flutter/data/models/vip/vip_info.dart';
import 'package:doublefeel_flutter/core/result/app_result.dart';
import 'package:doublefeel_flutter/app/routes/app_pages.dart';
import 'package:doublefeel_flutter/core/services/loading_service.dart';
class LoginController extends GetxController {
final UserApi _userApi = Get.find<UserApi>();
... ... @@ -30,6 +31,7 @@ class LoginController extends GetxController {
final phoneController = TextEditingController();
final codeController = TextEditingController();
final codeFocusNode = FocusNode();
final phoneInput = ''.obs;
final codeInput = ''.obs;
... ... @@ -113,6 +115,7 @@ class LoginController extends GetxController {
_countdownTimer?.cancel();
phoneController.dispose();
codeController.dispose();
codeFocusNode.dispose();
super.onClose();
}
... ... @@ -145,6 +148,7 @@ class LoginController extends GetxController {
AppToast.show(
AppLocalizations.of(Get.context!)!.phoneLoginCodeSentSuccess);
_startCountdown();
codeFocusNode.requestFocus();
}
}
... ... @@ -175,27 +179,35 @@ class LoginController extends GetxController {
}
isLoggingIn.value = true;
final loginRes = await _userApi.login(
telephone: cleanPhone,
verifyCode: codeInput.value,
);
try {
await LoadingService.instance.run(() async {
final loginRes = await _userApi.login(
telephone: cleanPhone,
verifyCode: codeInput.value,
);
if (loginRes is AppSuccess<LoginResponse>) {
await _handleLoginSuccess(loginRes.data);
await Get.find<LocalStorage>().setLastLoginMethod('phone');
} else {
if (loginRes is AppSuccess<LoginResponse>) {
await _handleLoginSuccess(loginRes.data);
await Get.find<LocalStorage>().setLastLoginMethod('phone');
}
});
} finally {
isLoggingIn.value = false;
}
}
Future<void> _loginWithApple(AppleSignInModel appleModel) async {
isLoggingIn.value = true;
final loginRes = await _userApi.loginWithApple(appleModel);
try {
await LoadingService.instance.run(() async {
final loginRes = await _userApi.loginWithApple(appleModel);
if (loginRes is AppSuccess<LoginResponse>) {
await _handleLoginSuccess(loginRes.data, appleModel: appleModel);
await Get.find<LocalStorage>().setLastLoginMethod('apple');
} else {
if (loginRes is AppSuccess<LoginResponse>) {
await _handleLoginSuccess(loginRes.data, appleModel: appleModel);
await Get.find<LocalStorage>().setLastLoginMethod('apple');
}
});
} finally {
isLoggingIn.value = false;
}
}
... ... @@ -284,8 +296,6 @@ class LoginController extends GetxController {
// 用户登录成功即代表同意了协议，持久化到本地供冷启动时 SDK 初始化判断使用
await Get.find<LocalStorage>().setTermsAgreed(true);
isLoggingIn.value = false;
// 根据引导完成状态决定跳转目标
final userId = me.id ?? 0;
if (_userAccount.hasCompletedOnboarding(userId) ||
... ... @@ -301,7 +311,7 @@ class LoginController extends GetxController {
);
}
} else {
isLoggingIn.value = false;
// userInfoRes 失败，外层 finally 会重置 isLoggingIn
}
}
}
... ...
... ... @@ -171,6 +171,7 @@ class PhoneLoginView extends GetView<LoginController> {
return TextField(
controller: controller.codeController,
focusNode: controller.codeFocusNode,
keyboardType: TextInputType.text,
maxLength: 8,
style: TextStyle(
... ...
... ... @@ -17,126 +17,135 @@ class MembershipOfferView extends GetView<MembershipOfferController> {
@override
Widget build(BuildContext context) {
final l10n = context.l10n;
return GuideCommonScaffold(
showGradientBg: true,
onBackPressed: () {
controller.onBackPressed();
},
backIcon: 'assets/images/common/ic_close.png',
bottom: OnboardingBottomButton(
label: controller.isFromOnboard ? l10n.continueButton : '免费兑换优惠',
enabled: true,
onPressed: () {
controller.unlock();
return PopScope(
canPop: !controller.isFromOnboard,
onPopInvokedWithResult: (didPop, _) {
if (!didPop) {
controller.onBackPressed();
}
},
),
child: SingleChildScrollView(
physics: const ClampingScrollPhysics(),
padding: EdgeInsets.fromLTRB(
0,
MediaQuery.paddingOf(context).top + 4,
0,
140,
),
child: Stack(
children: [
IgnorePointer(
child: Lottie.asset('assets/lottie/scatter_flowers.json'),
child: GuideCommonScaffold(
showGradientBg: true,
onBackPressed: () {
controller.onBackPressed();
},
backIcon: 'assets/images/common/ic_close.png',
bottom: OnboardingBottomButton(
label: controller.isFromOnboard
? l10n.continueButton
: l10n.freeRedemptionOffer,
enabled: true,
onPressed: () {
controller.unlock();
},
),
child: SingleChildScrollView(
physics: const ClampingScrollPhysics(),
padding: EdgeInsets.fromLTRB(
0,
MediaQuery.paddingOf(context).top + 4,
0,
140,
),
Column(
mainAxisSize: MainAxisSize.max,
child: Stack(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
children: [
SizedBox(height: 48),
OnboardingTitleText(l10n.onboardingMemberTitle),
const SizedBox(height: 12),
OnboardingBodyText(
l10n.onboardingMemberBody,
fontSize: 14,
),
],
),
IgnorePointer(
child: Lottie.asset('assets/lottie/scatter_flowers.json'),
),
const SizedBox(height: 12),
Image.asset(
'assets/images/user_onboarding/ic_membership_box.png'),
const SizedBox(height: 4),
Obx(() {
final yearInfo = controller.yearlyProductAppleInfo.value;
final yearProduct = controller.yearlyProduct.value;
return yearInfo == null || yearProduct == null
? const SizedBox(child: CircularProgressIndicator())
: Column(
children: [
Text(
'原价${_originDisplayPrice(yearInfo)}/年',
textAlign: TextAlign.center,
style: const TextStyle(
color: Color(0xFFB0B0B6),
fontSize: 16,
decoration: TextDecoration.lineThrough,
decorationColor: Color(0xFFB0B0B6),
letterSpacing: 0,
),
),
const SizedBox(height: 6),
Text(
_displayPrice(yearInfo),
textAlign: TextAlign.center,
style: TextStyle(
color: context.colors.primary,
fontSize: 28,
fontWeight: FontWeight.w600,
letterSpacing: 0,
),
),
const SizedBox(height: 6),
Text(
_planSubtitle(yearProduct, yearInfo),
textAlign: TextAlign.center,
style: const TextStyle(
color: Color(0xFFB0B0B6),
fontSize: 12,
letterSpacing: 0,
),
),
],
);
}),
const SizedBox(height: 58),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Get.offNamed(Routes.PURCHASE);
},
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 12,
horizontal: 24,
Column(
mainAxisSize: MainAxisSize.max,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
children: [
SizedBox(height: 48),
OnboardingTitleText(l10n.onboardingMemberTitle),
const SizedBox(height: 12),
OnboardingBodyText(
l10n.onboardingMemberBody,
fontSize: 14,
),
],
),
),
child: Text(
l10n.onboardingMemberAllOptions,
textAlign: TextAlign.center,
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 12,
decoration: TextDecoration.underline,
decorationColor: context.colors.textPrimary,
letterSpacing: 0,
const SizedBox(height: 12),
Image.asset(
'assets/images/user_onboarding/ic_membership_box.png'),
const SizedBox(height: 4),
Obx(() {
final yearInfo = controller.yearlyProductAppleInfo.value;
final yearProduct = controller.yearlyProduct.value;
return yearInfo == null || yearProduct == null
? const SizedBox(child: CircularProgressIndicator())
: Column(
children: [
Text(
'原价${_originDisplayPrice(yearInfo)}/年',
textAlign: TextAlign.center,
style: const TextStyle(
color: Color(0xFFB0B0B6),
fontSize: 16,
decoration: TextDecoration.lineThrough,
decorationColor: Color(0xFFB0B0B6),
letterSpacing: 0,
),
),
const SizedBox(height: 6),
Text(
_displayPrice(yearInfo),
textAlign: TextAlign.center,
style: TextStyle(
color: context.colors.primary,
fontSize: 28,
fontWeight: FontWeight.w600,
letterSpacing: 0,
),
),
const SizedBox(height: 6),
Text(
_planSubtitle(yearProduct, yearInfo),
textAlign: TextAlign.center,
style: const TextStyle(
color: Color(0xFFB0B0B6),
fontSize: 12,
letterSpacing: 0,
),
),
],
);
}),
const SizedBox(height: 58),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Get.offNamed(Routes.PURCHASE);
},
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 12,
horizontal: 24,
),
child: Text(
l10n.onboardingMemberAllOptions,
textAlign: TextAlign.center,
style: TextStyle(
color: context.colors.textPrimary,
fontSize: 12,
decoration: TextDecoration.underline,
decorationColor: context.colors.textPrimary,
letterSpacing: 0,
),
),
),
),
),
],
),
],
),
],
),
),
);
),
));
}
String _originDisplayPrice(AppleProductInfo appleInfo) {
... ...
... ... @@ -53,9 +53,15 @@ class PurchaseController extends GetxController {
final isUnlocking = false.obs;
final isRestoring = false.obs;
bool isFromOnboard = false;
@override
void onInit() {
super.onInit();
final args = Get.arguments;
if (args is Map) {
isFromOnboard = args['from'] == 'onboarding';
}
scrollController.addListener(_handleScroll);
unawaited(loadProductList());
}
... ... @@ -69,6 +75,17 @@ class PurchaseController extends GetxController {
super.onClose();
}
void onBackPressed() {
if (isFromOnboard) {
Get.offNamed(
Routes.MEMBERSHIP_OFFER,
arguments: {'from': 'onboarding'},
);
} else {
Get.back();
}
}
void _handleScroll() {
final next = scrollController.hasClients && scrollController.offset > 250;
if (next != isScrolled.value) {
... ... @@ -223,7 +240,12 @@ class PurchaseController extends GetxController {
try {
await _refreshVipInfo();
} finally {
Get.offNamed(Routes.PREMIUM_ACTIVATED);
if (isFromOnboard) {
// onboarding 流程购买成功，清空栈进入首页
Get.offAllNamed(AppRoutes.home);
} else {
Get.offNamed(Routes.PREMIUM_ACTIVATED);
}
}
}
... ...
... ... @@ -17,16 +17,21 @@ class PurchaseView extends GetView<PurchaseController> {
@override
Widget build(BuildContext context) {
return AnnotatedRegion<SystemUiOverlayStyle>(
value: const SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.dark,
statusBarBrightness: Brightness.light,
systemNavigationBarColor: PurchaseColors.background,
systemNavigationBarIconBrightness: Brightness.dark,
),
child: Scaffold(
backgroundColor: PurchaseColors.background,
return PopScope(
canPop: !controller.isFromOnboard,
onPopInvokedWithResult: (didPop, _) {
if (!didPop) controller.onBackPressed();
},
child: AnnotatedRegion<SystemUiOverlayStyle>(
value: const SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.dark,
statusBarBrightness: Brightness.light,
systemNavigationBarColor: PurchaseColors.background,
systemNavigationBarIconBrightness: Brightness.dark,
),
child: Scaffold(
backgroundColor: PurchaseColors.background,
body: Stack(
children: [
Positioned.fill(
... ... @@ -85,7 +90,7 @@ class PurchaseView extends GetView<PurchaseController> {
],
),
),
);
));
}
}
... ... @@ -190,7 +195,7 @@ class _PurchaseNavigationBar extends StatelessWidget {
children: [
const SizedBox(width: 4),
IconButton(
onPressed: Get.back,
onPressed: controller.onBackPressed,
icon: Image.asset(
showCloseButton
? R.assetsImagesCloseIcon
... ...
... ... @@ -274,12 +274,6 @@ class UserOnboardingController extends GetxController {
return;
}
if (status.isDenied && GetPlatform.isIOS) {
// iOS 上被拒绝后无法再弹窗，引导去设置
await openAppSettings();
return;
}
// 未决定 → 弹出系统授权弹窗
final result = await Permission.notification.request();
AppLogger.d(result.isGranted
... ...
... ... @@ -50,7 +50,7 @@ List<Widget> buildUserOnboardingPages(BuildContext context,
_SelectionPage(
pageIndex: 2,
title: l10n.onboardingStressGoalQuestion,
multiple: false,
multiple: true,
options: [
OnboardingOptionData(
label: l10n.onboardingStressGoalSource,
... ... @@ -353,7 +353,7 @@ class _HrvResearchPageState extends State<_HrvResearchPage> {
void _startAutoScroll() {
_autoScrollTimer?.cancel();
_autoScrollTimer = Timer.periodic(const Duration(seconds: 3), (_) {
_autoScrollTimer = Timer.periodic(const Duration(seconds: 2), (_) {
if (!mounted || _userScrolling) return;
if (_pageController.hasClients) {
final next = (_pageController.page?.round() ?? _initialPage) + 1;
... ...
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:lottie/lottie.dart';
class LoadingService {
OverlayEntry? _entry;
int _counter = 0;
static void init() {
Get.put(LoadingService());
}
static LoadingService get instance => Get.find();
/// 包装一个异步操作，执行期间显示 Loading，完成后自动隐藏。
Future<T> run<T>(Future<T> Function() block) async {
show();
try {
return await block();
} finally {
hide();
}
}
void show() {
_counter++;
if (_counter > 1) return;
// 直接从根 Navigator 获取 Overlay，避免 context 查找失败
final overlay = Get.key.currentState?.overlay;
if (overlay == null) {
_counter--;
return;
}
// 防御：清理可能残留的旧 entry
_entry?.remove();
_entry = OverlayEntry(builder: (_) => const _GlobalLoadingWidget());
overlay.insert(_entry!);
}
void hide() {
if (_counter <= 0) return;
_counter--;
if (_counter == 0) {
_entry?.remove();
_entry = null;
}
}
}
class _GlobalLoadingWidget extends StatelessWidget {
const _GlobalLoadingWidget();
@override
Widget build(BuildContext context) {
// GestureDetector 吸收所有点击，防止穿透触发底层 UI
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {},
child: SizedBox.expand(
child: ColoredBox(
color: Colors.black.withValues(alpha: 0.3),
child: Align(
alignment: const Alignment(0.0, -0.1),
child: Lottie.asset(
'assets/lottie/loading.json',
width: 130,
height: 90,
repeat: true,
animate: true,
),
),
),
),
);
}
}
... ...
import 'dart:ui';
import 'package:doublefeel_flutter/core/theme/app_theme.dart';
import 'package:doublefeel_flutter/l10n/l10n_extensions.dart';
import 'package:flutter/src/widgets/framework.dart';
int? _parseInt(dynamic value) {
... ... @@ -36,15 +37,15 @@ class V2LatestHrvData {
String stateString() {
switch (state) {
case 1:
return '压力过载';
return l10n.pressureOverload;
case 2:
return '注意压力';
return l10n.beMindfulOfStress;
case 3:
return '状态正常';
return l10n.statusNormal;
case 4:
return '状态优秀';
return l10n.inExcellentCondition;
}
return '等待数据';
return l10n.waitingForData;
}
stateColor(BuildContext context) {
... ... @@ -187,11 +188,11 @@ class V2HealthData {
sleepStateStr() {
switch (sleepState) {
case 1:
return '优秀';
return l10n.sleepQualityExcellent;
case 2:
return '正常';
return l10n.sleepQualityNormal;
case 3:
return '注意';
return l10n.sleepQualityAttention;
}
return '--';
}
... ... @@ -238,15 +239,15 @@ class V2StressScore {
String stateString() {
switch (state) {
case 1:
return '压力过载';
return l10n.pressureOverload;
case 2:
return '注意压力';
return l10n.beMindfulOfStress;
case 3:
return '状态正常';
return l10n.statusNormal;
case 4:
return '状态优秀';
return l10n.inExcellentCondition;
}
return '等待数据';
return l10n.waitingForData;
}
String stateBg() {
... ...
... ... @@ -250,6 +250,7 @@
"submit": "Submit",
"questionsAndFeedback": "Questions and Feedback",
"ifYouWouldLikeUsToReplyPleaseProvideYourEmailAddress": "If you would like us to reply, please provide your email address",
"feedbackHintText": "1. Please describe the screen and scenario where the issue occurred\n2. Please provide screenshots to help us resolve the issue more efficiently\n3. Please leave your contact information so we can get back to you as soon as possible",
"uploadProof": "Upload Proof",
"frequentlyAskedQuestions": "Frequently Asked Questions",
"areYouSureYouWantToDeleteYourAccount": "Are you sure you want to delete your account?",
... ... @@ -257,6 +258,14 @@
"deleteAccount": "Delete Account",
"mobilePhoneNumber": "Mobile phone number",
"logOut": "Log Out",
"confirmLogoutPrompt": "Are you sure you want to log out?",
"confirmLogout": "Log Out",
"loggedOutSuccessfully": "Logged out successfully",
"accountDeletedSuccessfully": "Account deleted successfully",
"deleteAccountWarningTitle": "Once deleted, the account cannot be recovered! Please proceed with caution.",
"deleteAccountWarningPrompt": "Note: Deleting the account will remove all information in this account, including but not limited to\npersonal profile, mood records, and statistical data.",
"deleteAccountWarningNote1": "Note 1: Your health data will be saved in Apple Health, and we will not delete data from Apple Health.",
"deleteAccountWarningNote2": "Note 2: Deleting the account will not affect your subscription status in the App Store. If you need to cancel the subscription, please cancel it manually in the App Store -> Profile -> Subscriptions.",
"confirmDeletion": "Confirm Deletion",
"iLlThinkAboutItSomeMore": "I'll think about it some more.",
"sleep": "Sleep",
... ... @@ -494,5 +503,62 @@
"appReviewFeedbackMessage": "Would you tell us what went wrong?\nYour feedback helps us improve the stress and health experience. 💜",
"appReviewFeedbackSendAction": "Send Feedback",
"appReviewFeedbackLaterAction": "Maybe Later",
"appReviewIllustrationPlaceholder": "Illustration Placeholder"
}
"appReviewIllustrationPlaceholder": "Illustration Placeholder",
"overallStressLevelToday": "Overall Stress Level Today",
"stressLevelsOnThatDay": "Stress Levels on That Day",
"noPressureDataAvailableAtThisTime": "No pressure data available at this time",
"membersCanViewTheCompleteData": "Members can view the complete data",
"unlockNow": "Unlock Now",
"pressureOverload": "Pressure Overload",
"beMindfulOfStress": "Be Aware of Stress",
"statusNormal": "Status: Normal",
"inExcellentCondition": "In excellent condition",
"waitingForData": "Waiting for data",
"pressure": "Pressure",
"mostRecent": "Most recent",
"theDayBeforeYesterday": "The day before yesterday",
"uploadPhotos": "Upload Photos",
"filming": "Filming",
"unlockTheProVersion": "Unlock the Pro Version",
"embarkOnAJourneyOfStressAwarenessAndWellnessSupport": "Embark on a Journey of Stress Awareness and Wellness Support",
"sharePartnerCodeTemplate": "Hey ❤️ I found an app called DoubleFeel!\nIt helps us care for each other — track stress and sleep, view HRV and physical status, and stay updated on each other's health in real-time.\nCome join me 👉 https://doublefeel.cn/\nMy friend ID: {inviteCode}",
"@sharePartnerCodeTemplate": {
"description": "Share partner code template",
"placeholders": {
"inviteCode": {
"type": "String"
}
}
},
"bindPartnerIdNotExistTitle": "ID does not exist",
"bindPartnerIdNotExistMessage": "This ID does not exist. Please check and try again",
"bindPartnerDialogGotIt": "Got it",
"bindPartnerAddFailedTitle": "Failed to add",
"bindPartnerAddFailedMessage": "This user does not allow adding friends, cannot add them",
"bindPartnerAlreadyFriendTitle": "They are already your friend",
"bindPartnerAlreadyFriendMessage": "Please do not add again",
"friendStatusTitle": "{remarkName}'s Status",
"@friendStatusTitle": {
"description": "Friend status title",
"placeholders": {
"remarkName": {
"type": "String"
}
}
},
"annualMemberDiscounts": "Annual Member Discounts",
"specialOffers": "Special Offers",
"currentPrice": "Current Price",
"originalPrice": "Original price {price}",
"@originalPrice": {
"description": "Original price label",
"placeholders": {
"price": {
"type": "String"
}
}
},
"freeRedemptionOffer": "Free Redemption Offer",
"cellPhoneNumber": "Cell phone number",
"todayOnWeeklyCalendar": "today"
}
\ No newline at end of file
... ...
... ... @@ -333,6 +333,7 @@
"submit": "提交",
"questionsAndFeedback": "问题和反馈",
"ifYouWouldLikeUsToReplyPleaseProvideYourEmailAddress": "如果需要我们回复，请填写联系邮箱",
"feedbackHintText": "1.请说明问题的界面和使用场景\n2.请提供截图，以便提升解决问题效率\n3.请留下联系方式，我们尽快回复联系您",
"uploadProof": "上传凭证",
"frequentlyAskedQuestions": "常见问题",
"areYouSureYouWantToDeleteYourAccount": "确认注销账号吗？",
... ... @@ -340,6 +341,14 @@
"deleteAccount": "注销账号",
"mobilePhoneNumber": "手机号",
"logOut": "退出登录",
"confirmLogoutPrompt": "确认退出登录吗？",
"confirmLogout": "确认退出",
"loggedOutSuccessfully": "已退出登录",
"accountDeletedSuccessfully": "账号注销成功",
"deleteAccountWarningTitle": "注销账号后将无法找回！请谨慎操作",
"deleteAccountWarningPrompt": "提示：注销账号将会删除该账号内包括但不限于\n个人资料、情绪记录、统计数据等全部信息。",
"deleteAccountWarningNote1": "注1：你的健康数据会保存在苹果健康，我们不会删除苹果健康中的数据。",
"deleteAccountWarningNote2": "注2：删除账号不会影响你在App Store的订阅状态，如果需要取消订阅，请在APPs Store - 头像 - 订阅中手动取消订阅。",
"confirmDeletion": "确认注销",
"iLlThinkAboutItSomeMore": "我再想想",
"sleep": "睡眠",
... ... @@ -741,6 +750,9 @@
"purchaseNoteContact": "如果有更多其他问题，请联系我们。",
"reportBottomSlogan": "双倍感知 压力减半",
"refundExplanationTitle": "退费说明",
"@refundExplanationTitle": {
"description": "退费说明"
},
"refundAppStoreReviewTitle": "退款由 App Store 审核处理",
"refundAppStoreReviewDescription": "所有订阅与虚拟商品均通过 App Store 官方支付系统完成，DoubleFeel 无法直接处理付款或退款。",
"refundAppleRulesIntroduction": "根据 Apple 的平台规则：",
... ... @@ -779,5 +791,62 @@
"appReviewFeedbackMessage": "愿意告诉我们遇到了什么问题吗？\n你的反馈可以帮助我们持续改进压力与健康体验 💜",
"appReviewFeedbackSendAction": "发送反馈",
"appReviewFeedbackLaterAction": "稍后再说",
"appReviewIllustrationPlaceholder": "插图占位"
}
"appReviewIllustrationPlaceholder": "插图占位",
"overallStressLevelToday": "今日的综合压力状态",
"stressLevelsOnThatDay": "该日压力状态",
"noPressureDataAvailableAtThisTime": "暂无压力数据",
"membersCanViewTheCompleteData": "会员可查看完整数据",
"unlockNow": "立即解锁",
"pressureOverload": "压力过载",
"beMindfulOfStress": "注意压力",
"statusNormal": "状态正常",
"inExcellentCondition": "状态优秀",
"waitingForData": "等待数据",
"pressure": "压力",
"mostRecent": "最近一次",
"theDayBeforeYesterday": "前天",
"uploadPhotos": "相册上传",
"filming": "拍摄",
"unlockTheProVersion": "解锁专业版",
"embarkOnAJourneyOfStressAwarenessAndWellnessSupport": "开启压力预警与健康陪伴之旅",
"sharePartnerCodeTemplate": "嘿 ❤️ 我发现了一个叫 DoubleFeel 的 App！\n它可以帮我们互相关心 — 记录压力和睡眠、查看 HRV 与身体状态、及时了解彼此的健康状况。\n快来一起使用吧 👉 https://doublefeel.cn/\n我的好友id：{inviteCode}",
"@sharePartnerCodeTemplate": {
"description": "分享好友邀请码文案模板",
"placeholders": {
"inviteCode": {
"type": "String"
}
}
},
"bindPartnerIdNotExistTitle": "该ID不存在",
"bindPartnerIdNotExistMessage": "这个ID不存在哦，请检查后重新输入",
"bindPartnerDialogGotIt": "我知道了",
"bindPartnerAddFailedTitle": "添加失败",
"bindPartnerAddFailedMessage": "该用户不允许被添加好友，无法添加Ta哦",
"bindPartnerAlreadyFriendTitle": "对方已经是你的好友啦",
"bindPartnerAlreadyFriendMessage": "请不要重复添加哦",
"friendStatusTitle": "{remarkName}的状态",
"@friendStatusTitle": {
"description": "好友的状态标题",
"placeholders": {
"remarkName": {
"type": "String"
}
}
},
"annualMemberDiscounts": "年度会员优惠",
"specialOffers": "优惠",
"currentPrice": "现价",
"originalPrice": "原价{price}",
"@originalPrice": {
"description": "原价标签",
"placeholders": {
"price": {
"type": "String"
}
}
},
"freeRedemptionOffer": "免费兑换优惠",
"cellPhoneNumber": "手机号",
"todayOnWeeklyCalendar": "今"
}
\ No newline at end of file
... ...
... ... @@ -1599,6 +1599,12 @@ abstract class AppLocalizations {
/// **'如果需要我们回复，请填写联系邮箱'**
String get ifYouWouldLikeUsToReplyPleaseProvideYourEmailAddress;
/// No description provided for @feedbackHintText.
///
/// In zh, this message translates to:
/// **'1.请说明问题的界面和使用场景\n2.请提供截图，以便提升解决问题效率\n3.请留下联系方式，我们尽快回复联系您'**
String get feedbackHintText;
/// No description provided for @uploadProof.
///
/// In zh, this message translates to:
... ... @@ -1641,6 +1647,54 @@ abstract class AppLocalizations {
/// **'退出登录'**
String get logOut;
/// No description provided for @confirmLogoutPrompt.
///
/// In zh, this message translates to:
/// **'确认退出登录吗？'**
String get confirmLogoutPrompt;
/// No description provided for @confirmLogout.
///
/// In zh, this message translates to:
/// **'确认退出'**
String get confirmLogout;
/// No description provided for @loggedOutSuccessfully.
///
/// In zh, this message translates to:
/// **'已退出登录'**
String get loggedOutSuccessfully;
/// No description provided for @accountDeletedSuccessfully.
///
/// In zh, this message translates to:
/// **'账号注销成功'**
String get accountDeletedSuccessfully;
/// No description provided for @deleteAccountWarningTitle.
///
/// In zh, this message translates to:
/// **'注销账号后将无法找回！请谨慎操作'**
String get deleteAccountWarningTitle;
/// No description provided for @deleteAccountWarningPrompt.
///
/// In zh, this message translates to:
/// **'提示：注销账号将会删除该账号内包括但不限于\n个人资料、情绪记录、统计数据等全部信息。'**
String get deleteAccountWarningPrompt;
/// No description provided for @deleteAccountWarningNote1.
///
/// In zh, this message translates to:
/// **'注1：你的健康数据会保存在苹果健康，我们不会删除苹果健康中的数据。'**
String get deleteAccountWarningNote1;
/// No description provided for @deleteAccountWarningNote2.
///
/// In zh, this message translates to:
/// **'注2：删除账号不会影响你在App Store的订阅状态，如果需要取消订阅，请在APPs Store - 头像 - 订阅中手动取消订阅。'**
String get deleteAccountWarningNote2;
/// No description provided for @confirmDeletion.
///
/// In zh, this message translates to:
... ... @@ -2829,7 +2883,7 @@ abstract class AppLocalizations {
/// **'双倍感知 压力减半'**
String get reportBottomSlogan;
/// No description provided for @refundExplanationTitle.
/// 退费说明
///
/// In zh, this message translates to:
/// **'退费说明'**
... ... @@ -3068,6 +3122,204 @@ abstract class AppLocalizations {
/// In zh, this message translates to:
/// **'插图占位'**
String get appReviewIllustrationPlaceholder;
/// No description provided for @overallStressLevelToday.
///
/// In zh, this message translates to:
/// **'今日的综合压力状态'**
String get overallStressLevelToday;
/// No description provided for @stressLevelsOnThatDay.
///
/// In zh, this message translates to:
/// **'该日压力状态'**
String get stressLevelsOnThatDay;
/// No description provided for @noPressureDataAvailableAtThisTime.
///
/// In zh, this message translates to:
/// **'暂无压力数据'**
String get noPressureDataAvailableAtThisTime;
/// No description provided for @membersCanViewTheCompleteData.
///
/// In zh, this message translates to:
/// **'会员可查看完整数据'**
String get membersCanViewTheCompleteData;
/// No description provided for @unlockNow.
///
/// In zh, this message translates to:
/// **'立即解锁'**
String get unlockNow;
/// No description provided for @pressureOverload.
///
/// In zh, this message translates to:
/// **'压力过载'**
String get pressureOverload;
/// No description provided for @beMindfulOfStress.
///
/// In zh, this message translates to:
/// **'注意压力'**
String get beMindfulOfStress;
/// No description provided for @statusNormal.
///
/// In zh, this message translates to:
/// **'状态正常'**
String get statusNormal;
/// No description provided for @inExcellentCondition.
///
/// In zh, this message translates to:
/// **'状态优秀'**
String get inExcellentCondition;
/// No description provided for @waitingForData.
///
/// In zh, this message translates to:
/// **'等待数据'**
String get waitingForData;
/// No description provided for @pressure.
///
/// In zh, this message translates to:
/// **'压力'**
String get pressure;
/// No description provided for @mostRecent.
///
/// In zh, this message translates to:
/// **'最近一次'**
String get mostRecent;
/// No description provided for @theDayBeforeYesterday.
///
/// In zh, this message translates to:
/// **'前天'**
String get theDayBeforeYesterday;
/// No description provided for @uploadPhotos.
///
/// In zh, this message translates to:
/// **'相册上传'**
String get uploadPhotos;
/// No description provided for @filming.
///
/// In zh, this message translates to:
/// **'拍摄'**
String get filming;
/// No description provided for @unlockTheProVersion.
///
/// In zh, this message translates to:
/// **'解锁专业版'**
String get unlockTheProVersion;
/// No description provided for @embarkOnAJourneyOfStressAwarenessAndWellnessSupport.
///
/// In zh, this message translates to:
/// **'开启压力预警与健康陪伴之旅'**
String get embarkOnAJourneyOfStressAwarenessAndWellnessSupport;
/// 分享好友邀请码文案模板
///
/// In zh, this message translates to:
/// **'嘿 ❤️ 我发现了一个叫 DoubleFeel 的 App！\n它可以帮我们互相关心 — 记录压力和睡眠、查看 HRV 与身体状态、及时了解彼此的健康状况。\n快来一起使用吧 👉 https://doublefeel.cn/\n我的好友id：{inviteCode}'**
String sharePartnerCodeTemplate(String inviteCode);
/// No description provided for @bindPartnerIdNotExistTitle.
///
/// In zh, this message translates to:
/// **'该ID不存在'**
String get bindPartnerIdNotExistTitle;
/// No description provided for @bindPartnerIdNotExistMessage.
///
/// In zh, this message translates to:
/// **'这个ID不存在哦，请检查后重新输入'**
String get bindPartnerIdNotExistMessage;
/// No description provided for @bindPartnerDialogGotIt.
///
/// In zh, this message translates to:
/// **'我知道了'**
String get bindPartnerDialogGotIt;
/// No description provided for @bindPartnerAddFailedTitle.
///
/// In zh, this message translates to:
/// **'添加失败'**
String get bindPartnerAddFailedTitle;
/// No description provided for @bindPartnerAddFailedMessage.
///
/// In zh, this message translates to:
/// **'该用户不允许被添加好友，无法添加Ta哦'**
String get bindPartnerAddFailedMessage;
/// No description provided for @bindPartnerAlreadyFriendTitle.
///
/// In zh, this message translates to:
/// **'对方已经是你的好友啦'**
String get bindPartnerAlreadyFriendTitle;
/// No description provided for @bindPartnerAlreadyFriendMessage.
///
/// In zh, this message translates to:
/// **'请不要重复添加哦'**
String get bindPartnerAlreadyFriendMessage;
/// 好友的状态标题
///
/// In zh, this message translates to:
/// **'{remarkName}的状态'**
String friendStatusTitle(String remarkName);
/// No description provided for @annualMemberDiscounts.
///
/// In zh, this message translates to:
/// **'年度会员优惠'**
String get annualMemberDiscounts;
/// No description provided for @specialOffers.
///
/// In zh, this message translates to:
/// **'优惠'**
String get specialOffers;
/// No description provided for @currentPrice.
///
/// In zh, this message translates to:
/// **'现价'**
String get currentPrice;
/// 原价标签
///
/// In zh, this message translates to:
/// **'原价{price}'**
String originalPrice(String price);
/// No description provided for @freeRedemptionOffer.
///
/// In zh, this message translates to:
/// **'免费兑换优惠'**
String get freeRedemptionOffer;
/// No description provided for @cellPhoneNumber.
///
/// In zh, this message translates to:
/// **'手机号'**
String get cellPhoneNumber;
/// No description provided for @todayOnWeeklyCalendar.
///
/// In zh, this message translates to:
/// **'今'**
String get todayOnWeeklyCalendar;
}
class _AppLocalizationsDelegate
... ...
... ... @@ -879,6 +879,10 @@ class AppLocalizationsEn extends AppLocalizations {
'If you would like us to reply, please provide your email address';
@override
String get feedbackHintText =>
'1. Please describe the screen and scenario where the issue occurred\n2. Please provide screenshots to help us resolve the issue more efficiently\n3. Please leave your contact information so we can get back to you as soon as possible';
@override
String get uploadProof => 'Upload Proof';
@override
... ... @@ -901,6 +905,34 @@ class AppLocalizationsEn extends AppLocalizations {
String get logOut => 'Log Out';
@override
String get confirmLogoutPrompt => 'Are you sure you want to log out?';
@override
String get confirmLogout => 'Log Out';
@override
String get loggedOutSuccessfully => 'Logged out successfully';
@override
String get accountDeletedSuccessfully => 'Account deleted successfully';
@override
String get deleteAccountWarningTitle =>
'Once deleted, the account cannot be recovered! Please proceed with caution.';
@override
String get deleteAccountWarningPrompt =>
'Note: Deleting the account will remove all information in this account, including but not limited to\npersonal profile, mood records, and statistical data.';
@override
String get deleteAccountWarningNote1 =>
'Note 1: Your health data will be saved in Apple Health, and we will not delete data from Apple Health.';
@override
String get deleteAccountWarningNote2 =>
'Note 2: Deleting the account will not affect your subscription status in the App Store. If you need to cancel the subscription, please cancel it manually in the App Store -> Profile -> Subscriptions.';
@override
String get confirmDeletion => 'Confirm Deletion';
@override
... ... @@ -1708,4 +1740,114 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get appReviewIllustrationPlaceholder => 'Illustration Placeholder';
@override
String get overallStressLevelToday => 'Overall Stress Level Today';
@override
String get stressLevelsOnThatDay => 'Stress Levels on That Day';
@override
String get noPressureDataAvailableAtThisTime =>
'No pressure data available at this time';
@override
String get membersCanViewTheCompleteData =>
'Members can view the complete data';
@override
String get unlockNow => 'Unlock Now';
@override
String get pressureOverload => 'Pressure Overload';
@override
String get beMindfulOfStress => 'Be Aware of Stress';
@override
String get statusNormal => 'Status: Normal';
@override
String get inExcellentCondition => 'In excellent condition';
@override
String get waitingForData => 'Waiting for data';
@override
String get pressure => 'Pressure';
@override
String get mostRecent => 'Most recent';
@override
String get theDayBeforeYesterday => 'The day before yesterday';
@override
String get uploadPhotos => 'Upload Photos';
@override
String get filming => 'Filming';
@override
String get unlockTheProVersion => 'Unlock the Pro Version';
@override
String get embarkOnAJourneyOfStressAwarenessAndWellnessSupport =>
'Embark on a Journey of Stress Awareness and Wellness Support';
@override
String sharePartnerCodeTemplate(String inviteCode) {
return 'Hey ❤️ I found an app called DoubleFeel!\nIt helps us care for each other — track stress and sleep, view HRV and physical status, and stay updated on each other\'s health in real-time.\nCome join me 👉 https://doublefeel.cn/\nMy friend ID: $inviteCode';
}
@override
String get bindPartnerIdNotExistTitle => 'ID does not exist';
@override
String get bindPartnerIdNotExistMessage =>
'This ID does not exist. Please check and try again';
@override
String get bindPartnerDialogGotIt => 'Got it';
@override
String get bindPartnerAddFailedTitle => 'Failed to add';
@override
String get bindPartnerAddFailedMessage =>
'This user does not allow adding friends, cannot add them';
@override
String get bindPartnerAlreadyFriendTitle => 'They are already your friend';
@override
String get bindPartnerAlreadyFriendMessage => 'Please do not add again';
@override
String friendStatusTitle(String remarkName) {
return '$remarkName\'s Status';
}
@override
String get annualMemberDiscounts => 'Annual Member Discounts';
@override
String get specialOffers => 'Special Offers';
@override
String get currentPrice => 'Current Price';
@override
String originalPrice(String price) {
return 'Original price $price';
}
@override
String get freeRedemptionOffer => 'Free Redemption Offer';
@override
String get cellPhoneNumber => 'Cell phone number';
@override
String get todayOnWeeklyCalendar => 'today';
}
... ...
... ... @@ -818,6 +818,10 @@ class AppLocalizationsZh extends AppLocalizations {
'如果需要我们回复，请填写联系邮箱';
@override
String get feedbackHintText =>
'1.请说明问题的界面和使用场景\n2.请提供截图，以便提升解决问题效率\n3.请留下联系方式，我们尽快回复联系您';
@override
String get uploadProof => '上传凭证';
@override
... ... @@ -839,6 +843,32 @@ class AppLocalizationsZh extends AppLocalizations {
String get logOut => '退出登录';
@override
String get confirmLogoutPrompt => '确认退出登录吗？';
@override
String get confirmLogout => '确认退出';
@override
String get loggedOutSuccessfully => '已退出登录';
@override
String get accountDeletedSuccessfully => '账号注销成功';
@override
String get deleteAccountWarningTitle => '注销账号后将无法找回！请谨慎操作';
@override
String get deleteAccountWarningPrompt =>
'提示：注销账号将会删除该账号内包括但不限于\n个人资料、情绪记录、统计数据等全部信息。';
@override
String get deleteAccountWarningNote1 => '注1：你的健康数据会保存在苹果健康，我们不会删除苹果健康中的数据。';
@override
String get deleteAccountWarningNote2 =>
'注2：删除账号不会影响你在App Store的订阅状态，如果需要取消订阅，请在APPs Store - 头像 - 订阅中手动取消订阅。';
@override
String get confirmDeletion => '确认注销';
@override
... ... @@ -1615,4 +1645,110 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get appReviewIllustrationPlaceholder => '插图占位';
@override
String get overallStressLevelToday => '今日的综合压力状态';
@override
String get stressLevelsOnThatDay => '该日压力状态';
@override
String get noPressureDataAvailableAtThisTime => '暂无压力数据';
@override
String get membersCanViewTheCompleteData => '会员可查看完整数据';
@override
String get unlockNow => '立即解锁';
@override
String get pressureOverload => '压力过载';
@override
String get beMindfulOfStress => '注意压力';
@override
String get statusNormal => '状态正常';
@override
String get inExcellentCondition => '状态优秀';
@override
String get waitingForData => '等待数据';
@override
String get pressure => '压力';
@override
String get mostRecent => '最近一次';
@override
String get theDayBeforeYesterday => '前天';
@override
String get uploadPhotos => '相册上传';
@override
String get filming => '拍摄';
@override
String get unlockTheProVersion => '解锁专业版';
@override
String get embarkOnAJourneyOfStressAwarenessAndWellnessSupport =>
'开启压力预警与健康陪伴之旅';
@override
String sharePartnerCodeTemplate(String inviteCode) {
return '嘿 ❤️ 我发现了一个叫 DoubleFeel 的 App！\n它可以帮我们互相关心 — 记录压力和睡眠、查看 HRV 与身体状态、及时了解彼此的健康状况。\n快来一起使用吧 👉 https://doublefeel.cn/\n我的好友id：$inviteCode';
}
@override
String get bindPartnerIdNotExistTitle => '该ID不存在';
@override
String get bindPartnerIdNotExistMessage => '这个ID不存在哦，请检查后重新输入';
@override
String get bindPartnerDialogGotIt => '我知道了';
@override
String get bindPartnerAddFailedTitle => '添加失败';
@override
String get bindPartnerAddFailedMessage => '该用户不允许被添加好友，无法添加Ta哦';
@override
String get bindPartnerAlreadyFriendTitle => '对方已经是你的好友啦';
@override
String get bindPartnerAlreadyFriendMessage => '请不要重复添加哦';
@override
String friendStatusTitle(String remarkName) {
return '$remarkName的状态';
}
@override
String get annualMemberDiscounts => '年度会员优惠';
@override
String get specialOffers => '优惠';
@override
String get currentPrice => '现价';
@override
String originalPrice(String price) {
return '原价$price';
}
@override
String get freeRedemptionOffer => '免费兑换优惠';
@override
String get cellPhoneNumber => '手机号';
@override
String get todayOnWeeklyCalendar => '今';
}
... ...