1) 版本对齐分支 - package.json / tauri.conf.json / Cargo.toml / Cargo.lock: 0.1.0 -> 0.2.0, OTA 包版本变为 0.2.0-ota - 新增 scripts/ci/check-version.mjs: 分支 dev-x.y 与 package.json 版本不一致时 CI 直接失败 - docker-build.yml / ota-build.yml: min_binary_version 与前端版本解耦, 固定 0.1.0 (现有 APK 原生层仍是 0.1.0, 抬高会导致旧 APK 收不到更新) 2) 我的页 OTA「开发版本」开关 (默认关, 持久化 localStorage.iboard_ota_dev_mode) - 关: 按版本号逐字段比较 (src/utils/version.js), 服务端 version 更高才算新 - 开: 按 build sequence 判新 (hotswap checkUpdate), 每次构建都能推到设备 - Web 端: 开发口径退化为版本不同即算新; 生产口径严格比较大小 3) 打卡 Tab 移到最左并默认选中, 移除特效开关 - BottomNav: 打卡/宏观/监控/我; 删除 home 图标 - App: / 与 404 均重定向到 /checkin - RingProgress/Celebrate: 删除 effectsEnabled/setEffectsEnabled, 特效恒开 - HabitView: 去掉头部「特效开/关」按钮 4) 取消首页 Tab, 报警/新闻并入宏观 - 新增 pages/macro/AlertsView.jsx、NewsView.jsx; 删除 HomePage.jsx - MacroPage: 6 个子 Tab (油价/经济数据/策略研究/经济文章/报警/新闻), 报警角标保留 - 新闻详情 /news/:id -> /macro/news/:id (宏观 Tab 保持高亮) 5) 文档: 需求文档补 F-OT 需求点与已决策项; 设计文档新增 §10 变更记录与判新设计; 界面设计.html 11 屏 (Tab 4 项/去掉特效开关/宏观合并/我的 OTA 开关 关+开 两态)
100 lines
3.4 KiB
React
100 lines
3.4 KiB
React
import { useCallback, useEffect, useRef, useState } from 'react'
|
|
import { useNavigate } from 'react-router-dom'
|
|
import { Card, DotLoading, Empty } from 'antd-mobile'
|
|
import { api } from '../../api/client.js'
|
|
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
|
import { fmtDate } from '../../utils/format.js'
|
|
|
|
// 新闻 (V0.2 从「首页」并入「宏观」Tab)
|
|
// - 数据: mx_finance_search_news 每日 3 点拉取国内外经济政治新闻, 按时间倒序
|
|
// - 无限滚动: 触底自动加载下一页
|
|
// - 详情: /macro/news/:id (挂在宏观 Tab 下, 保持底部 Tab 高亮)
|
|
export default function NewsView() {
|
|
const [items, setItems] = useState([])
|
|
const [loading, setLoading] = useState(false)
|
|
const [done, setDone] = useState(false)
|
|
const cursorRef = useRef(null)
|
|
const sentinelRef = useRef(null)
|
|
const inFlightRef = useRef(false)
|
|
const navigate = useNavigate()
|
|
|
|
const fetchPage = useCallback(async () => {
|
|
if (inFlightRef.current || done) return
|
|
inFlightRef.current = true
|
|
setLoading(true)
|
|
try {
|
|
const url = '/news?limit=10' + (cursorRef.current ? '&cursor=' + encodeURIComponent(cursorRef.current) : '')
|
|
const data = await api(url)
|
|
setItems((prev) => prev.concat(data.items || []))
|
|
cursorRef.current = data.nextCursor
|
|
if (!data.nextCursor) setDone(true)
|
|
} catch (e) {
|
|
console.error('news load error', e)
|
|
setDone(true)
|
|
} finally {
|
|
inFlightRef.current = false
|
|
setLoading(false)
|
|
}
|
|
}, [done])
|
|
|
|
useEffect(() => { fetchPage() }, [])
|
|
// 后台回前台: 重置游标重拉第一页, 新数据到了再更新视图
|
|
const reload = useCallback(async () => {
|
|
if (inFlightRef.current) return
|
|
inFlightRef.current = true
|
|
setLoading(true)
|
|
try {
|
|
const data = await api('/news?limit=10')
|
|
setItems(data.items || [])
|
|
cursorRef.current = data.nextCursor
|
|
setDone(!data.nextCursor)
|
|
} catch (e) {
|
|
console.error('news reload error', e)
|
|
setDone(true)
|
|
} finally {
|
|
inFlightRef.current = false
|
|
setLoading(false)
|
|
}
|
|
}, [])
|
|
useRefreshOnVisible(reload)
|
|
useEffect(() => {
|
|
if (done || items.length === 0) return
|
|
const el = sentinelRef.current
|
|
if (!el) return
|
|
const io = new IntersectionObserver((entries) => {
|
|
if (entries[0].isIntersecting) fetchPage()
|
|
}, { rootMargin: '200px' })
|
|
io.observe(el)
|
|
return () => io.disconnect()
|
|
}, [items.length, done, fetchPage])
|
|
|
|
if (items.length === 0 && !loading) {
|
|
return (
|
|
<section className="home-section">
|
|
<Empty description="暂无新闻" />
|
|
</section>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<section className="home-section">
|
|
<div className="section-list">
|
|
{items.map((n) => (
|
|
<Card key={n.id} className="news-card" onClick={() => navigate('/macro/news/' + n.id)}>
|
|
<div className="news-title">{n.title}</div>
|
|
{n.summary && <div className="news-summary">{n.summary}</div>}
|
|
<div className="news-meta">
|
|
<span className="news-source">{n.source || '未知来源'}</span>
|
|
<span className="news-time">{fmtDate(n.publishedAt)}</span>
|
|
<span className="news-rank">#{n.impactRank}</span>
|
|
</div>
|
|
</Card>
|
|
))}
|
|
<div ref={sentinelRef} className="scroll-sentinel">
|
|
{loading ? <DotLoading /> : (done ? '— 已加载全部 —' : '')}
|
|
</div>
|
|
</div>
|
|
</section>
|
|
)
|
|
}
|