3532d0111b
循环训练(circuit)
- 新增 utils/circuitTimer.js 状态机: 工作->休息->...->完成, stop() 返回有效撑总秒(不含休息)
- 首页新增「循环训练·分组练习」入口 + stepper 配置弹窗
- 配置本地持久化 circuit_config(每组时长/组数/休息/每周目标), 下次自动预填
- 记录以 planId:'circuit' + mode:'circuit' 落库, duration 语义不变 -> 排行榜/统计/每日计划进度零改动
- 记录页展示「循环 N组xMs·休Rs」
计时器顶部循环进度面板
- 组进度点阵按组数等分铺满(flex:1 1 0, 去掉 max-width 封顶), 当前组以增高而非加宽强调
- 大号「X/Y 组」+ 四态阶段徽章(撑住/休息中/准备开始/已暂停) + 累计秒数副行
- 状态灯用纯 CSS 圆点(SVG 图标颜色烤死在 data URI 里, CSS 改不动)
- 超过 15 组自动降级为线性进度条; 面板不设固定高度, 规避真机大字体档裁字
修复: 循环训练全程无语音
- 根因: circuit 的 onTick 走 _circuitCue(只有震动), 从未调用 _remind
- 接入整场进度播报, 基准为 sets x holdPerSet(而非每组), 避免 4 组播 4 次「已完成一半」
- 新增 restStart/nextSet/lastSet 三条不含数字的词条, 客户端与 tts 云函数词表同步
- 修复必然撞车的时序: 偶数组时 halfway 与休息切换同一 tick, 加 2.6s 优先窗口让位
- 防吵闸门: 每组 <10s 不播过场语音, 休息 <5s 不播; 预载按模式取词条
训练期间屏幕常亮
- wx.setKeepScreenOn: onStart 开 / onUnload 关 / onShow 在 isRunning 时重新武装
- 切后台再回来该标志会被系统清掉, 故必须重新武装, 否则后半程丢语音与震动
- 低基础库与 Android 省电模式静默降级, 不弹 toast
修复: 首页打卡卡片左侧两个竖条
- 根因: ui-card 宿主节点无 display 声明为 inline, 页面侧加的 border 被打断成两个零宽行盒碎片
- ui-card 加 :host{display:block}, margin-bottom 从内部 view 上提到宿主
- 高亮由 border 改为 box-shadow spread 描边(不占布局, 无跳动) + 补 border-radius
- 连带修复失效的交错入场: nth-child 跨组件边界恒匹配 1, 改为 index 属性驱动内联 animation-delay, 14 处调用点补序号
注意: tts 云函数需重新部署, 否则新增的 3 条词条返回 Unknown prompt key(静默降级不报错)
236 lines
10 KiB
Plaintext
236 lines
10 KiB
Plaintext
<view class="container timer-page page-enter" style="{{themeStyle}}">
|
|
|
|
<!-- 全屏彩带完成庆祝 -->
|
|
<view class="confetti" wx:if="{{isCompleted}}">
|
|
<view
|
|
wx:for="{{confettiPieces}}"
|
|
wx:key="i"
|
|
class="confetti-piece confetti-piece--{{celebrationLevel}}"
|
|
style="left: {{item.left}}%; background: {{item.color}}; animation-delay: {{item.delay}}s; transform: rotate({{item.rotate}}deg); width: {{item.size}}rpx; height: {{item.size * 2}}rpx;"
|
|
></view>
|
|
</view>
|
|
|
|
<!-- 成就横幅 (record / milestone / first) -->
|
|
<view class="achievement-banner" wx:if="{{isCompleted && celebrationLevel !== 'normal'}}">
|
|
<text class="achievement-text">{{celebrationMessage}}</text>
|
|
</view>
|
|
|
|
<!-- 循环训练进度面板:组点阵 + 第 X/Y 组 + 阶段徽章 + 累计秒数。
|
|
层次分工:这里管「第几组」(宏观),中间的进度环管「本组还剩几秒」(微观)。 -->
|
|
<view
|
|
class="circuit-bar {{isResting ? 'is-rest' : ''}} {{status === 'paused' ? 'is-paused' : ''}}"
|
|
wx:if="{{isCircuitMode && status !== 'completed'}}"
|
|
>
|
|
<!-- 组进度点阵:已完成 / 进行中 / 下一组 三态 -->
|
|
<view class="circuit-dots" wx:if="{{circuitShowDots}}">
|
|
<view
|
|
wx:for="{{circuitDots}}"
|
|
wx:key="*this"
|
|
class="circuit-dot {{item <= dotsDone ? 'is-done' : ''}} {{item === dotsActive ? 'is-active' : ''}} {{item === dotsNext ? 'is-next' : ''}}"
|
|
></view>
|
|
</view>
|
|
<!-- 组数过多(>15)时退化为线性进度条,避免点阵挤成头发丝 -->
|
|
<view class="circuit-track" wx:else>
|
|
<view class="circuit-track-fill" style="width: {{dotsDone * 100 / totalSets}}%"></view>
|
|
</view>
|
|
|
|
<view class="circuit-meta">
|
|
<view class="circuit-count">
|
|
<text class="circuit-count-num">{{status === 'idle' ? totalSets : currentSet}}</text>
|
|
<text class="circuit-count-total" wx:if="{{status !== 'idle'}}">/{{totalSets}}</text>
|
|
<text class="circuit-count-unit">组</text>
|
|
</view>
|
|
<view class="circuit-phase circuit-phase--{{status === 'paused' ? 'pause' : (status === 'idle' ? 'idle' : (isResting ? 'rest' : 'work'))}}">
|
|
<view class="circuit-phase-dot"></view>
|
|
<text class="circuit-phase-text">{{status === 'paused' ? '已暂停' : (status === 'idle' ? '准备开始' : (isResting ? '休息中' : '撑住'))}}</text>
|
|
</view>
|
|
</view>
|
|
|
|
<text class="circuit-sub">
|
|
<block wx:if="{{status === 'idle'}}">每组 {{circuitHold}} 秒{{circuitRest > 0 ? ' · 休息 ' + circuitRest + ' 秒' : ''}}</block>
|
|
<block wx:else>已撑 {{workTotal}} 秒 · 目标 {{circuitTotalWork}} 秒</block>
|
|
</text>
|
|
</view>
|
|
|
|
<!-- 呼吸引导环 + 进度条 -->
|
|
<view class="ring-wrapper">
|
|
<view class="breathe-ring breathe-ring-1 {{status === 'running' ? 'fast' : ''}}"
|
|
wx:if="{{status !== 'completed'}}"></view>
|
|
<view class="breathe-ring breathe-ring-2 {{status === 'running' ? 'fast' : ''}}"
|
|
wx:if="{{status !== 'completed'}}"></view>
|
|
<view class="breathe-ring breathe-ring-3 {{status === 'running' ? 'fast' : ''}}"
|
|
wx:if="{{status !== 'completed'}}"></view>
|
|
|
|
<progress-ring
|
|
wx:if="{{status !== 'completed'}}"
|
|
duration="{{duration}}"
|
|
remaining="{{isCompleted ? 0 : remaining}}"
|
|
elapsed="{{elapsed}}"
|
|
size="{{360}}"
|
|
ringWidth="{{22}}"
|
|
status="{{status}}"
|
|
primaryColor="{{theme.primary}}"
|
|
primaryLightColor="{{theme.primaryLight}}"
|
|
trackColor="{{isCircuitMode ? '#EEEEEE' : (elapsed >= duration ? '#00B578' : '#EEEEEE')}}"
|
|
></progress-ring>
|
|
|
|
<!-- 完成庆祝粒子 -->
|
|
<view class="celebrate-burst" wx:if="{{isCompleted}}">
|
|
<image class="spark s1" src="{{icons.sparkleFill}}" mode="aspectFit"></image>
|
|
<image class="spark s2" src="{{icons.sparkleFill}}" mode="aspectFit"></image>
|
|
<image class="spark s3" src="{{icons.crownFill}}" mode="aspectFit"></image>
|
|
<image class="spark s4" src="{{icons.sparkleFill}}" mode="aspectFit"></image>
|
|
<image class="spark s5" src="{{icons.sparkleFill}}" mode="aspectFit"></image>
|
|
<image class="spark s6" src="{{icons.likeFill}}" mode="aspectFit"></image>
|
|
</view>
|
|
</view>
|
|
|
|
<!-- 状态提示 -->
|
|
<view class="hint-section">
|
|
<view class="hint-row" wx:if="{{status === 'idle'}}">
|
|
<image class="hint-icon" src="{{icons.targetFill}}" mode="aspectFit"></image>
|
|
<text class="hint-text">
|
|
<block wx:if="{{isCircuitMode}}">循环训练 · 共需撑 {{circuitTotalWork}} 秒</block>
|
|
<block wx:elif="{{isFreeMode}}">自由训练 · 目标 {{duration}} 秒</block>
|
|
<block wx:else>今日目标 {{duration}} 秒 · 第 {{planDay}} 天</block>
|
|
</text>
|
|
</view>
|
|
<view class="hint-row" wx:elif="{{status === 'running' && goalReached}}">
|
|
<image class="hint-icon running-pulse" src="{{icons.hotFill}}" mode="aspectFit"></image>
|
|
<text class="hint-text running">目标达成,继续挑战!</text>
|
|
</view>
|
|
<view class="hint-row" wx:elif="{{status === 'running'}}">
|
|
<image class="hint-icon running-pulse" src="{{icons.likeFill}}" mode="aspectFit"></image>
|
|
<text class="hint-text running">{{isCircuitMode ? phaseTip : hintTip}}</text>
|
|
</view>
|
|
<view class="hint-row" wx:elif="{{status === 'paused'}}">
|
|
<image class="hint-icon" src="{{icons.notificationForbidFill}}" mode="aspectFit"></image>
|
|
<text class="hint-text paused">已暂停</text>
|
|
</view>
|
|
<view class="hint-row completed-hint" wx:elif="{{status === 'completed'}}">
|
|
<image class="hint-icon completed-bounce" src="{{icons.roundCheckFill}}" mode="aspectFit"></image>
|
|
<text class="hint-text completed">目标完成! 继续坚持!</text>
|
|
</view>
|
|
</view>
|
|
|
|
<!-- 控制按钮 -->
|
|
<view class="controls">
|
|
<ui-btn
|
|
wx:if="{{!isRunning && !isPaused}}"
|
|
variant="primary"
|
|
size="xl"
|
|
block
|
|
text="开始"
|
|
icon-src="{{icons.playWhite}}"
|
|
bindtap="onStart"
|
|
></ui-btn>
|
|
|
|
<view class="ctrl-row" wx:if="{{isRunning || isPaused}}">
|
|
<ui-btn
|
|
wx:if="{{!isPaused}}"
|
|
variant="ghost"
|
|
size="xl"
|
|
text="暂停"
|
|
icon-src="{{icons.notificationForbidFill}}"
|
|
custom-style="margin-right: 28rpx;"
|
|
bindtap="onPause"
|
|
></ui-btn>
|
|
<ui-btn
|
|
wx:if="{{isPaused}}"
|
|
variant="primary"
|
|
size="xl"
|
|
text="继续"
|
|
icon-src="{{icons.playWhite}}"
|
|
custom-style="margin-right: 28rpx;"
|
|
bindtap="onStart"
|
|
></ui-btn>
|
|
<ui-btn
|
|
variant="outline"
|
|
size="xl"
|
|
text="结束"
|
|
icon-src="{{icons.stop}}"
|
|
bindtap="onStop"
|
|
></ui-btn>
|
|
</view>
|
|
</view>
|
|
|
|
<!-- 自定义"结束训练"确认弹窗 — 替代 wx.showModal,避免系统原生 modal
|
|
在 WebView stacking context 下 hit-test 不稳的问题 -->
|
|
<view class="stop-confirm-mask" wx:if="{{showStopConfirm}}" catchtouchmove="onNoop">
|
|
<view class="stop-confirm-card" catchtap="onNoop">
|
|
<text class="stop-confirm-title">结束训练</text>
|
|
<text class="stop-confirm-content">确定要结束本次训练吗?</text>
|
|
<view class="stop-confirm-actions">
|
|
<view class="stop-confirm-btn" bindtap="onStopCancel">取消</view>
|
|
<view class="stop-confirm-btn stop-confirm-btn--primary" bindtap="onStopConfirm">确定</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
|
|
<!-- 完成训练全屏弹窗 -->
|
|
<wxs module="fmt">
|
|
// 秒数 -> 分秒展示: 45->"45"/"秒", 83->"1分23"/"秒", 120->"2"/"分钟"
|
|
// 与 utils/util.js 的 formatDuration 口径一致(整分钟走分钟单位)
|
|
module.exports = {
|
|
numPart: function (s) {
|
|
s = Math.floor(s || 0)
|
|
if (s < 60) return '' + s
|
|
var m = Math.floor(s / 60)
|
|
var sec = s % 60
|
|
return sec === 0 ? '' + m : m + '分' + sec
|
|
},
|
|
unitPart: function (s) {
|
|
s = Math.floor(s || 0)
|
|
if (s < 60) return '秒'
|
|
return s % 60 === 0 ? '分钟' : '秒'
|
|
}
|
|
}
|
|
</wxs>
|
|
<view class="completion-mask" wx:if="{{showCompletion}}" catchtouchmove="onNoop">
|
|
<view class="completion-card">
|
|
<view class="completion-emoji-wrap">
|
|
<image class="completion-icon" src="{{completionLevel === 'first' ? icons.partyWhite : completionLevel === 'record' ? icons.trophyWhite : completionLevel === 'milestone' ? icons.hotWhite : icons.sparkleWhite}}" mode="aspectFit"></image>
|
|
</view>
|
|
<text class="completion-title">{{completionMessage}}</text>
|
|
|
|
<view class="completion-number-wrap">
|
|
<text class="completion-number {{completionElapsed >= 60 ? 'completion-number--long' : ''}}">{{fmt.numPart(completionElapsed)}}</text>
|
|
<text class="completion-unit">{{fmt.unitPart(completionElapsed)}}</text>
|
|
</view>
|
|
<text class="completion-label">本次训练</text>
|
|
|
|
<view class="completion-overtime" wx:if="{{completionOvertime > 0}}">
|
|
<text class="overtime-plus">+{{completionOvertime}}</text>
|
|
<text class="overtime-label">秒超长发挥</text>
|
|
</view>
|
|
|
|
<view class="completion-streak" wx:if="{{completionStreak > 0}}">
|
|
<image class="streak-flame" src="{{icons.hotFill}}" mode="aspectFit"></image>
|
|
<text class="streak-text">连续打卡 {{completionStreak}} 天</text>
|
|
</view>
|
|
|
|
<view class="completion-actions">
|
|
<view class="completion-btn completion-btn--primary" bindtap="onTrainAgain">
|
|
<text>再来一次</text>
|
|
</view>
|
|
<view class="completion-btn" bindtap="onViewRecords">
|
|
<text>查看记录</text>
|
|
</view>
|
|
<!-- openType="share" 会触发 Page.onShareAppMessage(已实现),
|
|
没有这个属性 + onShareAppMessage 时分享按钮就是灰色的。
|
|
ui-btn 透传 openType 到内部原生 button。 -->
|
|
<ui-btn
|
|
variant="ghost"
|
|
size="md"
|
|
customStyle="flex:1; height:88rpx;"
|
|
text="分享"
|
|
openType="share"
|
|
></ui-btn>
|
|
</view>
|
|
<view class="completion-btn completion-btn--text" bindtap="onCloseCompletion">
|
|
<text>回到首页</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|