5 Commits
Author SHA1 Message Date
zhangyi 7093d3e4e5 update:替换网络图片 2026-09-22 10:00:26 +08:00
zhangyi e98e5129d2 update:优化特效 2026-09-22 09:37:37 +08:00
zhangyi 01e8f6c6da update:优化ota状态共享 2026-09-21 16:22:05 +08:00
zhangyi 4bd7599cc0 update:新增ota 2026-09-21 14:56:43 +08:00
zhangyi b060d8f987 update:提交我的设备改版 2026-09-17 18:23:41 +08:00
128 changed files with 2307 additions and 1294 deletions
+22 -12
View File
@@ -8,9 +8,6 @@
} from "@dcloudio/uni-app";
import websocket from "@/websocket";
import matchWebsocket from "@/matchWebsocket";
import {
getDeviceBatteryAPI
} from "@/apis";
import {
MESSAGETYPES
} from "@/constants";
@@ -27,8 +24,9 @@
} = storeToRefs(store);
const {
updateUser,
updateOnline,
updateDeviceBattery,
updateDeviceStatus,
setDeviceOnline,
clearDeviceStatus,
showDeviceChargingDialog,
clearSessionState,
clearDevice
@@ -70,14 +68,19 @@
});
}
async function emitUpdateOnline() {
const data = await getDeviceBatteryAPI();
function emitUpdateOnline(nextOnline) {
const wasOnline = Boolean(online.value);
const nextOnline = Boolean(data.online);
updateOnline(nextOnline);
updateDeviceBattery(nextOnline ? data?.battery ?? data?.power : null);
if (!device.value.deviceId || wasOnline === nextOnline) return;
audioManager.play(nextOnline ? "设备已连接" : "设备连接已断开");
setDeviceOnline(nextOnline === true);
if (!device.value.deviceId || wasOnline === (nextOnline === true)) return;
audioManager.play(nextOnline === true ? "设备已连接" : "设备连接已断开");
}
function onDeviceStatusPush(status) {
updateDeviceStatus(status);
}
function onShootSocketDisconnected() {
clearDeviceStatus();
}
function onDeviceBindInvalid() {
@@ -113,6 +116,10 @@
}
function onShootWsMsg(content) {
if (content?.event === "/addons/shoot/battery") {
onDeviceStatusPush(content.data);
return;
}
if(content.type === 'shoot-trigger'){
onDeviceShoot()
}
@@ -124,6 +131,7 @@
void audioManager.warmButton();
uni.$on("update-user", emitUpdateUser);
uni.$on("update-online", emitUpdateOnline);
uni.$on("shoot-socket-disconnected", onShootSocketDisconnected);
uni.$on("session-kicked-out", onSessionKickedOut);
uni.$on("device-bind-invalid", onDeviceBindInvalid);
uni.$on("device-charging", onDeviceCharging);
@@ -150,6 +158,7 @@
onHide(() => {
uni.$off("update-user", emitUpdateUser);
uni.$off("update-online", emitUpdateOnline);
uni.$off("shoot-socket-disconnected", onShootSocketDisconnected);
uni.$off("session-kicked-out", onSessionKickedOut);
uni.$off("device-bind-invalid", onDeviceBindInvalid);
uni.$off("device-charging", onDeviceCharging);
@@ -159,6 +168,7 @@
matchWebsocket.closeMatchWebSocket({
reason: "app-hide"
});
clearDeviceStatus();
websocket.closeWebSocket();
});
</script>
+26 -13
View File
@@ -28,7 +28,8 @@ try {
const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot");
const API_ROOT_URL = BASE_URL.replace(/\/api\/shoot$/, "");
// 统一处理业务接口请求,包含登录态、业务错误和特定接口空响应兼容。
function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0]) {
function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0], options = {}) {
const {timeout = 10000, showErrorToast = true} = options;
const token = uni.getStorageSync(
`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
);
@@ -40,8 +41,16 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
method,
header,
data,
timeout: 10000,
timeout,
success: (res) => {
if (
url === "/user/hardwareBox/connectWifi" &&
res.statusCode === 200 &&
typeof res.data?.success === "boolean"
) {
resolve(res.data);
return;
}
const acceptsEmptyResponse = [
"/user/hardwareBox/connectWifi",
"/user/device/unbindByQrcodeId",
@@ -111,10 +120,12 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
icon: "none",
});
}
if (showErrorToast) {
uni.showToast({
title: message,
icon: "none",
});
}
reject(error);
return;
}
@@ -122,7 +133,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
}
},
fail: (err) => {
handleRequestError(err, url);
if (showErrorToast) handleRequestError(err, url);
reject(err);
},
});
@@ -285,6 +296,10 @@ export const getDeviceDetailAPI = (deviceId) => {
return request("GET", `/user/device/getDetail?deviceId=${encodeURIComponent(deviceId)}`);
};
export const updateDeviceAliasAPI = (deviceId, alias) => {
return request("POST", "/user/device/updateAlias", {deviceId, alias});
};
export const createPractiseAPI = (arrows, time, target) => {
return request("POST", "/user/practice/create", {
shootNumber: arrows,
@@ -565,13 +580,16 @@ export const laserCloseAPI = async () => {
return request("POST", "/user/device/closeAim");
};
export const getDeviceBatteryAPI = async () => {
return request("GET", "/user/device/battery");
};
// 设备连接指定 WiFi,只下发 WiFi 凭证,不触发 OTA 升级。
export const connectDeviceWifiAPI = async (ssid, password) => {
return request("POST", "/user/hardwareBox/connectWifi", {ssid, password});
return request(
"POST",
"/user/hardwareBox/connectWifi",
{ssid, password},
BASE_URL,
[0],
{timeout: 20000, showErrorToast: false}
);
};
// 获取硬件盒子版本信息,用于判断当前设备是否需要 OTA 升级。
@@ -584,11 +602,6 @@ export const sendHardwareBoxUpdateAPI = async (data) => {
return request("POST", "/user/hardwareBox/sendUpdate", data);
};
// 根据任务 ID 获取硬件盒子 OTA 更新状态。
export const getHardwareBoxTaskStatusAPI = async (taskId) => {
return request("GET", `/user/hardwareBox/taskStatus?taskId=${taskId}`);
};
export const addNoteAPI = async (id, remark) => {
return request("POST", "/user/score/sheet/remark", {id, remark});
};
+10 -13
View File
@@ -451,7 +451,7 @@ export const generateShareImage = async (canvasId, data) => {
hasPoint ? 756 : 402
);
renderText(ctx, "扫码打卡", 13, "#FFA118", 142, hasPoint ? 777 : 422);
const pointImg = await loadCanvasImage(canvas, "../static/point.png");
const pointImg = await loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/point.png");
ctx.drawImage(pointImg, 120, hasPoint ? 765 : 410, 18, 14);
// 2D 即时绘制,无需 ctx.draw()
} catch (e) {
@@ -635,7 +635,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
);
} else {
ctx.drawImage(
"/static/score-bg.png",
"https://static.shelingxingqiu.com/shootmini/static/score-bg.png",
16 + (i % 9) * 30,
290 + Math.ceil((i + 1) / 9) * 30,
27,
@@ -657,7 +657,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
ctx.drawImage(bgImg, 24 + rowIndex * 42, i > 5 ? 362 : 320, 38, 38);
} else {
ctx.drawImage(
"/static/score-bg.png",
"https://static.shelingxingqiu.com/shootmini/static/score-bg.png",
24 + rowIndex * 42,
i > 5 ? 362 : 320,
38,
@@ -708,10 +708,7 @@ export async function sharePractiseData(canvasId, type, user, data) {
// 头像与段位框属于装饰图片,缺失时使用兜底或跳过,避免阻断分享。
const loadProfileImage = async (src, fallbackSrc = "", label = "") => {
const normalizedSrc =
typeof src === "string" && src.startsWith("../static/")
? src.slice(2)
: src;
const normalizedSrc = typeof src === "string" ? src : "";
if (normalizedSrc) {
try {
const path = await loadImage(normalizedSrc);
@@ -725,20 +722,20 @@ export async function sharePractiseData(canvasId, type, user, data) {
const avatarImgPromise = loadProfileImage(
user?.avatar,
"/static/user-icon.png",
"https://static.shelingxingqiu.com/shootmini/static/user-icon.png",
"avatar"
);
const lvlImgPromise = loadProfileImage(user?.lvlImage, "", "level");
let titleImageSrc = "/static/first-try-title.png";
let titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/first-try-title.png";
if (type == 2) {
titleImageSrc = "/static/practise-one-title.png";
titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/practise-one-title.png";
} else if (type == 3) {
titleImageSrc = "/static/practise-two-title.png";
titleImageSrc = "https://static.shelingxingqiu.com/shootmini/static/practise-two-title.png";
}
const titleImgPromise = loadCanvasImage(canvas, titleImageSrc);
const scoreBgImgPromise = loadCanvasImage(canvas, "/static/score-bg.png");
const qrCodeImgPromise = loadCanvasImage(canvas, "/static/qr-code.png");
const scoreBgImgPromise = loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
const qrCodeImgPromise = loadCanvasImage(canvas, "https://static.shelingxingqiu.com/shootmini/static/qr-code.png");
const [avatarImg, lvlImg, titleImg, scoreBgImg, qrCodeImg] =
await Promise.all([
+1 -1
View File
@@ -85,7 +85,7 @@ const props = defineProps({
<image
class="bg-image"
v-if="type === 12"
src="../static/device-assets/my-device-unbound-background.png"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/my-device-unbound-background.png"
mode="widthFix"
/>
<image
+1 -1
View File
@@ -1,6 +1,6 @@
<script setup>
const tabs = [
{ image: "../static/tab-vip.png" },
{ image: "https://static.shelingxingqiu.com/shootmini/static/tab-vip.png" },
{ image: "https://static.shelingxingqiu.com/shootmini/static/tab-point-book.png" },
{ image: "https://static.shelingxingqiu.com/shootmini/static/tab-mall.png" },
];
+4 -4
View File
@@ -77,25 +77,25 @@ watch(
/>
<image
v-if="rank === 1"
src="../static/champ1.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix"
class="avatar-rank"
/>
<image
v-if="rank === 2"
src="../static/champ2.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix"
class="avatar-rank"
/>
<image
v-if="rank === 3"
src="../static/champ3.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix"
class="avatar-rank"
/>
<view v-if="rank > 3" class="rank-view">{{ rank }}</view>
<image
:src="src || '../static/user-icon.png'"
:src="src || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
:mode="imageMode"
:style="avatarImageStyle"
class="avatar-image"
+1 -1
View File
@@ -104,7 +104,7 @@ onBeforeUnmount(() => {
<block v-else-if="game.roomID">
<text>返回房间</text>
</block>
<image src="../static/back.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view>
</template>
+2 -2
View File
@@ -72,7 +72,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</view>
<image
v-if="winner === 1"
src="../static/winner-badge.png"
src="https://static.shelingxingqiu.com/shootmini/static/winner-badge.png"
mode="widthFix"
class="left-winner-badge"
/>
@@ -100,7 +100,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</view>
<image
v-if="winner === 2"
src="../static/winner-badge.png"
src="https://static.shelingxingqiu.com/shootmini/static/winner-badge.png"
mode="widthFix"
class="right-winner-badge"
/>
+1 -1
View File
@@ -58,7 +58,7 @@ const props = defineProps({
</view>
</view>
<view @click="onClose">
<image src="../static/close-white.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</view>
</view>
<view :style="{ width: '100%', marginBottom: '20px' }">
+6 -35
View File
@@ -1,44 +1,15 @@
<script setup>
import { ref, onMounted, onBeforeUnmount } from "vue";
import { getDeviceBatteryAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const power = ref(0);
const timer = ref(null);
let disposed = false;
let requestInFlight = false;
const refreshPower = async () => {
if (disposed || requestInFlight) return;
requestInFlight = true;
try {
const data = await getDeviceBatteryAPI();
if (!disposed) power.value = data.battery;
} catch (_) {
// 电量轮询失败时等待下一轮,避免产生未处理的 Promise 拒绝。
} finally {
requestInFlight = false;
}
};
onMounted(async () => {
await refreshPower();
if (disposed) return;
timer.value = setInterval(() => {
void refreshPower();
}, 1000 * 10);
});
onBeforeUnmount(() => {
disposed = true;
clearInterval(timer.value);
timer.value = null;
});
const store = useStore();
const { deviceBattery: power } = storeToRefs(store);
</script>
<template>
<view class="container">
<image src="../static/b-power.png" mode="widthFix" />
<view>电量{{ power || 1 }}%</view>
<image src="https://static.shelingxingqiu.com/shootmini/static/b-power.png" mode="widthFix" />
<view>{{ power === null ? "电量--" : `电量${power}%` }}</view>
</view>
</template>
+3 -3
View File
@@ -527,7 +527,7 @@ onBeforeUnmount(() => {
<view :class="['target', { 'target--shake': targetShaking }]">
<view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
<view :style="{ background: circleColor }">
<image src="../static/dot-circle.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/dot-circle.png" mode="widthFix" />
</view>
</view>
<view v-if="stop" class="stop-sign">中场休息</view>
@@ -565,7 +565,7 @@ onBeforeUnmount(() => {
<image
v-if="pMode && isSvip && bow.ring > 0 && !shouldHideRedHit(index)"
class="svip-hit-bg"
src="../static/vip/svip-xuan.png"
src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(bow)"
mode="aspectFit"
/>
@@ -585,7 +585,7 @@ onBeforeUnmount(() => {
<image
v-if="pMode && isSvip && bow.ring > 0 && !shouldHideBlueHit(index)"
class="svip-hit-bg"
src="../static/vip/svip-xuan.png"
src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(bow)"
mode="aspectFit"
/>
+3 -3
View File
@@ -266,16 +266,16 @@ onBeforeUnmount(() => {
@touchstart.stop="confirmAdd"
:style="{ ...getNewPos() }"
>
<image src="../static/arrow-edit-save.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-save.png" mode="widthFix" />
</view>
<view class="edit-btn delete-btn" @touchstart.stop="deleteArrow">
<image src="../static/arrow-edit-delete.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-delete.png" mode="widthFix" />
</view>
<view
class="edit-btn drag-btn"
@touchstart.stop="startDrag($event)"
>
<image src="../static/arrow-edit-move.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/arrow-edit-move.png" mode="widthFix" />
</view>
</view>
</view>
+4 -4
View File
@@ -29,14 +29,14 @@ const props = defineProps({
font-size: 24rpx;
}
.normal {
background-image: url("../static/bubble-tip.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip.png");
width: 157rpx;
height: 105rpx;
padding-top: 10px;
padding-left: 30rpx;
}
.normal2 {
background-image: url("../static/bubble-tip4.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip4.png");
width: 190rpx;
height: 105rpx;
padding-top: 10px;
@@ -46,14 +46,14 @@ const props = defineProps({
z-index: 1;
}
.long {
background-image: url("../static/bubble-tip2.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip2.png");
width: 370rpx;
height: 70rpx;
top: -50%;
left: 49%;
}
.short {
background-image: url("../static/bubble-tip3.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip3.png");
width: 300rpx;
height: 70rpx;
top: -50%;
+399
View File
@@ -0,0 +1,399 @@
<script setup>
import { computed } from "vue";
const props = defineProps({
variant: {
type: String,
default: "home",
validator: (value) => ["home", "detail"].includes(value),
},
});
// 固定粒子分布营造随机感,避免每次进入页面时因运行时随机数产生位置跳变。
const sparkSeeds = [
[1, "dot", 18, 98, -28, 5, 5, 2.3, 0.4],
[2, "streak", 23, 90, -38, 4, 18, 2, 1.1, true],
[3, "dot", 28, 112, -17, 6, 6, 2.8, 1.9, true],
[4, "dot", 32, 104, -12, 12, 12, 2.6, 0.7, true, true],
[5, "dot", 36, 88, -24, 4, 4, 1.8, 1.4],
[6, "streak", 40, 116, -8, 4, 20, 2.4, 2.2, true],
[7, "dot", 44, 96, -16, 7, 7, 2.1, 0.2],
[8, "dot", 48, 120, -4, 5, 5, 2.9, 1.3, true],
[9, "dot", 51, 110, 3, 14, 14, 3, 2.7, true, true],
[10, "streak", 54, 92, 8, 4, 22, 1.9, 0.8],
[11, "dot", 58, 105, 14, 6, 6, 2.5, 1.6, true],
[12, "dot", 62, 86, 21, 4, 4, 2, 0.5],
[13, "dot", 66, 114, 10, 7, 7, 2.7, 2.1, true],
[14, "streak", 70, 96, 28, 4, 18, 2.2, 1],
[15, "dot", 74, 108, 20, 11, 11, 2.8, 2.4, true, true],
[16, "dot", 80, 90, 35, 5, 5, 2.3, 0.3, true],
[17, "dot", 21, 118, -8, 4, 4, 2.6, 1.7],
[18, "streak", 27, 84, -31, 3, 16, 1.8, 0.6, true],
[19, "dot", 34, 122, -3, 6, 6, 2.9, 2.3, true],
[20, "dot", 42, 102, 5, 5, 5, 2.2, 0.9],
[21, "dot", 47, 88, -10, 13, 13, 2.7, 1.5, true, true],
[22, "streak", 56, 120, 16, 4, 21, 2.5, 2.6, true],
[23, "dot", 64, 100, 24, 7, 7, 2.4, 0.1],
[24, "dot", 72, 84, 38, 5, 5, 2, 1.2, true],
[25, "dot", 82, 116, 12, 4, 4, 2.8, 2],
[26, "dot", 68, 124, 7, 10, 10, 3.1, 2.9, true, true],
[27, "streak", 77, 98, 33, 4, 19, 2.1, 0.7, true],
[28, "dot", 29, 94, -20, 7, 7, 2.5, 1.4],
[29, "dot", 53, 126, 0, 5, 5, 2.3, 2.2, true],
[30, "dot", 60, 108, 18, 6, 6, 2.6, 0.4],
];
const deviceSparks = computed(() => {
const isDetail = props.variant === "detail";
const sizeScale = isDetail ? 1.25 : 1;
const bottomOffset = isDetail ? 120 : 0;
return sparkSeeds.map(([
id,
type,
left,
bottom,
angle,
width,
height,
duration,
delay,
long = false,
large = false,
]) => ({
id,
type,
long,
large,
trackStyle: {
left: `${left}%`,
bottom: `${bottom + bottomOffset}rpx`,
transform: `rotate(${angle}deg)`,
},
sparkStyle: {
width: `${width * sizeScale}rpx`,
height: `${height * sizeScale}rpx`,
marginLeft: `${-(width * sizeScale) / 2}rpx`,
animationDuration: `${duration}s`,
animationDelay: `-${delay}s`,
},
}));
});
</script>
<template>
<view
class="device-online-effects"
:class="`device-online-effects--${variant}`"
>
<view class="device-online-rays-stage">
<view class="device-online-rays-orbit">
<view class="device-online-ray device-online-ray--1" />
<view class="device-online-ray device-online-ray--2" />
<view class="device-online-ray device-online-ray--3" />
<view class="device-online-ray device-online-ray--4" />
<view class="device-online-ray device-online-ray--5" />
<view class="device-online-ray device-online-ray--6" />
<view class="device-online-ray device-online-ray--7" />
</view>
</view>
<view class="device-online-particles">
<view
v-for="spark in deviceSparks"
:key="spark.id"
class="device-online-spark-track"
:style="spark.trackStyle"
>
<view
class="device-online-spark"
:class="[
`device-online-spark--${spark.type}`,
{
'device-online-spark--long': spark.long,
'device-online-spark--large': spark.large,
}
]"
:style="spark.sparkStyle"
/>
</view>
</view>
</view>
</template>
<style scoped lang="scss">
.device-online-effects {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 3;
overflow: hidden;
pointer-events: none;
}
/* 光束沿底座椭圆轨迹扫动,用位移、明暗和横向缩放表达前后纵深。 */
.device-online-rays-stage {
position: absolute;
left: 0;
bottom: 112rpx;
width: 100%;
height: 140rpx;
overflow: hidden;
transform-origin: 50% 100%;
}
.device-online-rays-orbit {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
transform-origin: 50% 100%;
animation: device-rays-rotate 6s ease-in-out infinite;
}
.device-online-ray {
position: absolute;
bottom: 0;
left: 50%;
width: 48rpx;
height: 132rpx;
margin-left: -24rpx;
transform-origin: 50% 100%;
border-radius: 50% 50% 12% 12%;
background: linear-gradient(
180deg,
rgba(255, 255, 244, 0) 0%,
rgba(255, 254, 239, 0.1) 36%,
rgba(255, 248, 215, 0.22) 72%,
rgba(255, 232, 151, 0.36) 100%
);
}
.device-online-ray--1 {
opacity: 0.55;
transform: rotate(-55deg);
}
.device-online-ray--2 {
width: 68rpx;
margin-left: -34rpx;
opacity: 0.72;
transform: rotate(-36deg);
}
.device-online-ray--3 {
width: 42rpx;
margin-left: -21rpx;
opacity: 0.6;
transform: rotate(-18deg);
}
.device-online-ray--4 {
width: 76rpx;
margin-left: -38rpx;
opacity: 0.82;
}
.device-online-ray--5 {
width: 46rpx;
margin-left: -23rpx;
opacity: 0.64;
transform: rotate(19deg);
}
.device-online-ray--6 {
width: 64rpx;
margin-left: -32rpx;
opacity: 0.7;
transform: rotate(38deg);
}
.device-online-ray--7 {
width: 44rpx;
margin-left: -22rpx;
opacity: 0.56;
transform: rotate(56deg);
}
.device-online-particles {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
.device-online-spark-track {
position: absolute;
width: 0;
height: 0;
transform-origin: center bottom;
}
.device-online-spark {
position: absolute;
bottom: 0;
left: 0;
background: #fff6bd;
box-shadow: 0 0 6rpx rgba(255, 225, 112, 0.65);
animation: device-spark-rise 2.4s linear infinite;
}
.device-online-spark--dot {
border-radius: 50%;
}
.device-online-spark--streak {
border-radius: 50%;
background: linear-gradient(
180deg,
rgba(255, 255, 235, 0) 0%,
rgba(255, 250, 205, 0.75) 45%,
#ffe379 100%
);
}
.device-online-spark--long {
animation-name: device-spark-rise-long;
}
.device-online-spark--large {
background: #fffbdc;
box-shadow:
0 0 10rpx rgba(255, 243, 174, 0.95),
0 0 20rpx rgba(255, 207, 74, 0.72);
}
.device-online-effects--detail .device-online-rays-stage {
bottom: 215rpx;
height: 190rpx;
transform: scaleX(1.35);
}
.device-online-effects--detail .device-online-ray {
height: 180rpx;
}
.device-online-effects--detail .device-online-rays-orbit {
animation-name: device-rays-rotate-detail;
}
.device-online-effects--detail .device-online-spark {
animation-name: device-spark-rise-detail;
}
.device-online-effects--detail .device-online-spark--long {
animation-name: device-spark-rise-detail-long;
}
@keyframes device-spark-rise {
0% {
opacity: 0;
transform: translateY(8rpx) scale(0.45);
}
16% {
opacity: 1;
}
72% {
opacity: 0.62;
}
100% {
opacity: 0;
transform: translateY(-148rpx) scale(1);
}
}
@keyframes device-spark-rise-long {
0% {
opacity: 0;
transform: translateY(8rpx) scale(0.4);
}
16% {
opacity: 1;
}
72% {
opacity: 0.55;
}
100% {
opacity: 0;
transform: translateY(-176rpx) scale(1);
}
}
@keyframes device-spark-rise-detail {
0% {
opacity: 0;
transform: translateY(12rpx) scale(0.45);
}
16% {
opacity: 1;
}
72% {
opacity: 0.62;
}
100% {
opacity: 0;
transform: translateY(-225rpx) scale(1);
}
}
@keyframes device-spark-rise-detail-long {
0% {
opacity: 0;
transform: translateY(12rpx) scale(0.4);
}
16% {
opacity: 1;
}
72% {
opacity: 0.55;
}
100% {
opacity: 0;
transform: translateY(-270rpx) scale(1);
}
}
@keyframes device-rays-rotate {
0%,
100% {
opacity: 0.48;
transform: translate(-42rpx, 4rpx) skewX(-8deg) scaleX(0.82);
}
25% {
opacity: 0.88;
transform: translate(0, 0) skewX(0deg) scaleX(1.05);
}
50% {
opacity: 0.48;
transform: translate(42rpx, 4rpx) skewX(8deg) scaleX(0.82);
}
75% {
opacity: 0.24;
transform: translate(0, 10rpx) skewX(0deg) scaleX(0.68);
}
}
@keyframes device-rays-rotate-detail {
0%,
100% {
opacity: 0.48;
transform: translate(-62rpx, 6rpx) skewX(-8deg) scaleX(0.82);
}
25% {
opacity: 0.88;
transform: translate(0, 0) skewX(0deg) scaleX(1.05);
}
50% {
opacity: 0.48;
transform: translate(62rpx, 6rpx) skewX(8deg) scaleX(0.82);
}
75% {
opacity: 0.24;
transform: translate(0, 14rpx) skewX(0deg) scaleX(0.68);
}
}
</style>
+1 -1
View File
@@ -203,7 +203,7 @@ onMounted(async () => {
<button hover-class="none">
<image
v-if="!noArrow"
src="../static/arrow-grey.png"
src="https://static.shelingxingqiu.com/shootmini/static/arrow-grey.png"
mode="widthFix"
:style="{ transform: expand ? 'rotateX(180deg)' : 'rotateX(0deg)' }"
/>
+2 -2
View File
@@ -10,8 +10,8 @@ defineProps({
},
});
const bubbleTypes = [
"../static/long-bubble.png",
"../static/long-bubble-middle.png",
"https://static.shelingxingqiu.com/shootmini/static/long-bubble.png",
"https://static.shelingxingqiu.com/shootmini/static/long-bubble-middle.png",
"https://static.shelingxingqiu.com/shootmini/static/long-bubble-tall.png",
];
</script>
+5 -5
View File
@@ -115,10 +115,10 @@ onBeforeUnmount(() => {
<template>
<view class="container">
<view class="back-btn" @click="onClick">
<image v-if="whiteBackArrow" src="../static/back.png" mode="widthFix" />
<image v-if="whiteBackArrow" src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
<image
v-if="!whiteBackArrow"
src="../static/back-black.png"
src="https://static.shelingxingqiu.com/shootmini/static/back-black.png"
mode="widthFix"
/>
</view>
@@ -156,12 +156,12 @@ onBeforeUnmount(() => {
<text v-else class="truncate">{{ user.nickName }}</text>
<image
v-if="heat"
:src="`../static/hot${heat}.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/hot${heat}.png`"
mode="widthFix"
/>
</block>
<block v-else>
<image src="../static/user-icon.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/user-icon.png" mode="widthFix" />
<text>新来的弓箭手你好呀~</text>
</block>
</view>
@@ -229,7 +229,7 @@ onBeforeUnmount(() => {
:style="battleRoomBtnStyle"
>
<text class="battle-room-number__text">房号: {{ game.roomNumber }}</text>
<image src="../static/share2.png" mode="widthFix" class="battle-room-number__icon" />
<image src="https://static.shelingxingqiu.com/shootmini/static/share2.png" mode="widthFix" class="battle-room-number__icon" />
</button>
</view>
</template>
+1 -1
View File
@@ -146,7 +146,7 @@ onBeforeUnmount(() => {
<text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text>
<text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text>
<button v-if="!!tips" hover-class="none" @click="updateSound">
<image :src="`../static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" />
<image :src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" />
</button>
</view>
</template>
+37
View File
@@ -1,4 +1,6 @@
<script setup>
import IconButton from "./IconButton.vue";
const props = defineProps({
show: {
type: Boolean,
@@ -28,6 +30,14 @@ const props = defineProps({
type: Boolean,
default: true,
},
confirmDisabled: {
type: Boolean,
default: false,
},
showClose: {
type: Boolean,
default: false,
},
onCancel: {
type: Function,
default: null,
@@ -36,6 +46,10 @@ const props = defineProps({
type: Function,
default: null,
},
onClose: {
type: Function,
default: null,
},
});
const handleCancel = () => {
@@ -43,8 +57,13 @@ const handleCancel = () => {
};
const handleConfirm = () => {
if (props.confirmDisabled) return;
props.onConfirm?.();
};
const handleClose = () => {
props.onClose?.();
};
</script>
<template>
@@ -89,6 +108,7 @@ const handleConfirm = () => {
<view
v-if="showConfirm"
class="dialog-button confirm"
:class="{ disabled: confirmDisabled }"
@click="handleConfirm"
>
<text>{{ confirmText }}</text>
@@ -96,6 +116,13 @@ const handleConfirm = () => {
</view>
</view>
<view v-if="showClose" class="dialog-close">
<IconButton
src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
:width="30"
:onClick="handleClose"
/>
</view>
</view>
</view>
</template>
@@ -108,6 +135,7 @@ const handleConfirm = () => {
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.62);
flex-direction: column;
justify-content: center;
align-items: center;
z-index: 999;
@@ -116,6 +144,7 @@ const handleConfirm = () => {
.modal-wrap {
position: relative;
display: flex;
flex-direction: column;
width: 549rpx;
min-height: 318rpx;;
padding-top: 168rpx;
@@ -222,6 +251,14 @@ const handleConfirm = () => {
background-color: #ffda3f;
}
.dialog-button.confirm.disabled {
opacity: 0.62;
}
.dialog-close {
margin-top: 28rpx;
}
@keyframes rotateLight {
from {
transform: translateX(-50%) rotate(0deg);
+53 -24
View File
@@ -1,10 +1,11 @@
<script setup>
import { computed } from "vue";
import { getDeviceBatteryAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const OTA_MIN_BATTERY = 50;
const OTA_LOW_BATTERY_TEXT = "电量不足 50%,暂不支持 OTA 升级";
const OTA_OFFLINE_TEXT = "请先开启智能弓";
const store = useStore();
const { deviceStatus } = storeToRefs(store);
const props = defineProps({
visible: {
@@ -23,6 +24,10 @@ const props = defineProps({
type: Number,
default: 40,
},
phase: {
type: String,
default: "",
},
// 副标题:如“新版本将优化智能弓体验”
description: {
type: String,
@@ -47,30 +52,24 @@ const isSuccess = computed(() => props.state === "update_success");
const isFailure = computed(() => props.state === "update_failure");
// Clamp progress to keep the progress bar width within its container.
const progressValue = computed(() => Math.min(100, Math.max(0, Number(props.progress) || 0)));
const progressPhaseText = computed(() => {
const phaseText = {
started: "正在准备固件更新",
downloading: "正在下载固件",
installing: "正在安装固件",
};
return phaseText[props.phase] || "正在进行固件更新";
});
// 点击立即更新前先校验设备在线状态,再校验设备电量
const handleUpdateClick = async () => {
try {
const deviceStatus = await getDeviceBatteryAPI();
if (deviceStatus?.online !== true) {
// 点击立即更新前先校验设备在线状态。
const handleUpdateClick = () => {
if (deviceStatus.value?.online !== true) {
uni.showToast({
title: OTA_OFFLINE_TEXT,
icon: "none",
});
return;
}
if (Number(deviceStatus?.battery) <= OTA_MIN_BATTERY) {
uni.showToast({
title: OTA_LOW_BATTERY_TEXT,
icon: "none",
});
return;
}
} catch (err) {
emit("update");
return;
}
emit("update");
};
</script>
@@ -140,10 +139,10 @@ const handleUpdateClick = async () => {
<!-- 更新成功图片左边距 34rpx文案左边距 44rpx按钮浮动底部居中 -->
<block v-else-if="isSuccess">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
<text class="dialog-desc">请关机并重启智能弓</text>
<text class="dialog-desc">固件更新已完成</text>
<view class="btn-group-result">
<view class="primary-btn" @click="emit('done')">
<text class="primary-btn-text">完成</text>
<text class="primary-btn-text">关闭</text>
</view>
</view>
</block>
@@ -152,9 +151,14 @@ const handleUpdateClick = async () => {
<block v-else-if="isProgress">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
<view class="progress-wrap">
<view class="progress-meta">
<text class="progress-phase">{{ progressPhaseText }}</text>
<text class="progress-value">{{ Math.floor(progressValue) }}%</text>
</view>
<view class="progress-track">
<view class="progress-fill" :style="{ width: `${progressValue}%` }"></view>
</view>
<text class="progress-warning">请勿离开当前页面</text>
</view>
</block>
@@ -181,7 +185,7 @@ const handleUpdateClick = async () => {
class="ota-close-below"
@click="emit('close')"
>
<image src="../static/sicon/close.png" mode="aspectFit" style="width: 56rpx; height: 56rpx;" />
<image src="https://static.shelingxingqiu.com/shootmini/static/sicon/close.png" mode="aspectFit" style="width: 56rpx; height: 56rpx;" />
</view>
</view>
</template>
@@ -404,9 +408,26 @@ const handleUpdateClick = async () => {
}
.progress-wrap {
width: 394rpx;
margin-top: 40rpx;
margin-top: 28rpx;
margin-left: 44rpx;
}
.progress-meta {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 16rpx;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.progress-phase {
flex: 1;
}
.progress-value {
flex-shrink: 0;
margin-left: 16rpx;
color: #fed847;
}
.progress-track {
width: 100%;
height: 18rpx;
@@ -419,6 +440,14 @@ const handleUpdateClick = async () => {
background-color: #FED847;
border-radius: 999rpx;
}
.progress-warning {
display: block;
margin-top: 16rpx;
color: rgba(255, 255, 255, 0.88);
font-size: 22rpx;
line-height: 32rpx;
text-align: center;
}
/* 关闭按钮(位于弹窗下方) */
.ota-close-below {
+2 -2
View File
@@ -40,10 +40,10 @@ const getMemberNicknameClass = (player = {}) => [
opacity:
(scores[0] || []).length + (scores[1] || []).length === 12 ? 1 : 0,
}"
src="../static/checked-green.png"
src="https://static.shelingxingqiu.com/shootmini/static/checked-green.png"
mode="widthFix"
/>
<image :src="player.avatar || '../static/user-icon.png'" mode="widthFix" />
<image :src="player.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<view
v-if="isMember(player)"
:class="['player-score-name', ...getMemberNicknameClass(player)]"
+4 -4
View File
@@ -30,25 +30,25 @@ const rowCount = new Array(6).fill(0);
<view>
<image
v-if="rank === 1"
src="../static/champ1.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix"
class="avatar-rank"
/>
<image
v-if="rank === 2"
src="../static/champ2.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix"
class="avatar-rank"
/>
<image
v-if="rank === 3"
src="../static/champ3.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix"
class="avatar-rank"
/>
<view v-if="rank > 3" class="rank-view">{{ rank }}</view>
<image
:src="avatar || '../static/user-icon.png'"
:src="avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix"
:style="{ borderColor: topThreeColors[rank - 1] || '#fff' }"
/>
+4 -4
View File
@@ -38,7 +38,7 @@ const seats = new Array(props.total).fill(1);
<image src="https://static.shelingxingqiu.com/shootmini/static/player-bg.png" mode="widthFix" />
<view v-if="players[index] && players[index].name" class="avatar">
<Avatar
:src="players[index].avatar || '../static/user-icon.png'"
:src="players[index].avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
:size="40"
/>
<text
@@ -47,7 +47,7 @@ const seats = new Array(props.total).fill(1);
>
</view>
<view v-else class="player-unknow">
<image src="../static/question-mark.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view>
<view
v-if="players[index] && players[index].name && isMember(players[index])"
@@ -72,7 +72,7 @@ const seats = new Array(props.total).fill(1);
</text>
<view v-if="index === 0" class="founder">管理员</view>
<!-- <image
:src="`../static/player-${index + 1}.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/player-${index + 1}.png`"
mode="widthFix"
class="player-bg"
/> -->
@@ -83,7 +83,7 @@ const seats = new Array(props.total).fill(1);
class="remove-player"
@click="() => removePlayer(players[index])"
>
<image src="../static/close-white.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button>
</view>
</view>
+5 -5
View File
@@ -55,12 +55,12 @@ const onClick = async () => {
<template>
<view class="rank-item" :style="{ borderWidth: borderWidth + 'rpx' }">
<image v-if="data.rank === 1" src="../static/point-no1.png" />
<image v-else-if="data.rank === 2" src="../static/point-no2.png" />
<image v-else-if="data.rank === 3" src="../static/point-no3.png" />
<image v-if="data.rank === 1" src="https://static.shelingxingqiu.com/shootmini/static/point-no1.png" />
<image v-else-if="data.rank === 2" src="https://static.shelingxingqiu.com/shootmini/static/point-no2.png" />
<image v-else-if="data.rank === 3" src="https://static.shelingxingqiu.com/shootmini/static/point-no3.png" />
<text v-else>{{ data.rank || "" }}</text>
<view>
<Avatar :src="data.avatar || '../static/user-icon.png'" :size="36" />
<Avatar :src="data.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" :size="36" />
<view>
<view v-if="isMember(data)" :class="getMemberNicknameClass(data)">
<text class="member-nickname__text">{{ data.name }}</text>
@@ -87,7 +87,7 @@ const onClick = async () => {
<button hover-class="none" @click="onClick">
<text>{{ likeCount }}</text>
<image
:src="`../static/like-${like ? 'on' : 'off'}.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/like-${like ? 'on' : 'off'}.png`"
mode="widthFix"
/>
</button>
+1 -1
View File
@@ -113,7 +113,7 @@ onMounted(async () => {
@click="checked = !checked"
:style="{ marginBottom: !checked ? '20rpx' : '0' }"
>
<image v-if="checked" src="../static/checked.png" mode="widthFix" />
<image v-if="checked" src="https://static.shelingxingqiu.com/shootmini/static/checked.png" mode="widthFix" />
<view v-else></view>
<text>我想给建议(选填</text>
</view>
+1 -1
View File
@@ -69,7 +69,7 @@ const onBtnClick = debounce(async () => {
<slot />
</block>
<block v-else>
<image src="../static/btn-loading.png" mode="widthFix" class="loading" />
<image src="https://static.shelingxingqiu.com/shootmini/static/btn-loading.png" mode="widthFix" class="loading" />
</block>
</button>
</template>
+1 -1
View File
@@ -60,7 +60,7 @@ watch(
mode="widthFix"
/>
<view class="close-btn" @click="onClose" v-if="!noBg">
<image src="../static/close-yellow.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-yellow.png" mode="widthFix" />
</view>
<slot></slot>
</view>
+2 -2
View File
@@ -71,7 +71,7 @@ watch(
margin: 100 / (total * 2) + 'px',
}"
>
<image src="../static/score-bg.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/score-bg.png" mode="widthFix" />
<text
:style="{ fontWeight: arrows[index] !== undefined ? 'bold' : 'normal' }"
>{{
@@ -93,7 +93,7 @@ watch(
padding: 1vw 0;
}
.score-item {
/* background-image: url("../static/score-bg.png");
/* background-image: url("https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
background-size: cover;
background-repeat: no-repeat;
background-position: center; */
+3 -3
View File
@@ -100,7 +100,7 @@ const openCoachComment = () => {
<button @click="() => (showBowData = true)">
<text>查看靶纸</text>
<image
src="../static/enter-arrow-blue.png"
src="https://static.shelingxingqiu.com/shootmini/static/enter-arrow-blue.png"
mode="widthFix"
:style="{ width: '20px' }"
/>
@@ -116,13 +116,13 @@ const openCoachComment = () => {
<block v-if="validArrows === total">
<IconButton
name="分享"
src="../static/share.png"
src="https://static.shelingxingqiu.com/shootmini/static/share.png"
:onClick="onClickShare"
/>
<IconButton
v-if="isMember"
name="教练点评"
src="../static/review.png"
src="https://static.shelingxingqiu.com/shootmini/static/review.png"
:onClick="openCoachComment"
/>
</block>
+1 -1
View File
@@ -49,7 +49,7 @@ const getContentHeight = () => {
</view>
<IconButton
v-if="!!onClose"
src="../static/close-gold-outline.png"
src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
:width="30"
:onClick="onClose"
/>
+1 -1
View File
@@ -25,7 +25,7 @@ const props = defineProps({
</view>
<IconButton
v-if="!!onClose"
src="../static/close-white-outline.png"
src="https://static.shelingxingqiu.com/shootmini/static/close-white-outline.png"
:width="30"
:onClick="onClose"
/>
+1 -1
View File
@@ -207,7 +207,7 @@ onBeforeUnmount(() => {
<text>{{ tipContent }}</text>
<button hover-class="none" @click="updateSound">
<image
:src="`../static/sound${sound ? '' : '-off'}-yellow.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`"
mode="widthFix"
/>
</button>
+5 -8
View File
@@ -12,12 +12,11 @@ import {
getHomeData,
getPhoneNumberAPI,
getPhoneNumberAPIv2,
getDeviceBatteryAPI,
} from "@/apis";
import useStore from "@/store";
const store = useStore();
const { updateUser, updateDevice, updateOnline, clearDevice } = store;
const { updateUser, updateDevice, clearDevice } = store;
const props = defineProps({
show: {
@@ -125,8 +124,6 @@ async function doLogin() {
devices.bindings[0].deviceId,
devices.bindings[0].deviceName
);
const data = await getDeviceBatteryAPI();
updateOnline(data.online);
} else {
clearDevice();
}
@@ -181,7 +178,7 @@ onShow(() => {
<text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
>点击获取</text
>
<image src="../static/enter.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</button>
</view>
<view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }">
@@ -196,7 +193,7 @@ onShow(() => {
<text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
>点击获取</text
>
<image src="../static/enter.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</button>
</view>
<view
@@ -220,7 +217,7 @@ onShow(() => {
</block>
<block v-else>
<image
src="../static/btn-loading.png"
src="https://static.shelingxingqiu.com/shootmini/static/btn-loading.png"
mode="widthFix"
class="loading"
/>
@@ -231,7 +228,7 @@ onShow(() => {
v-if="!agree"
:style="{ borderColor: noBg ? '#E3E3E3' : '#fff' }"
/>
<image v-if="agree" src="../static/checked.png" mode="widthFix" />
<image v-if="agree" src="https://static.shelingxingqiu.com/shootmini/static/checked.png" mode="widthFix" />
<view>
<text>已同意并阅读</text>
<view
+1 -1
View File
@@ -81,7 +81,7 @@ const handleConfirm = () => {
<view class="header-title-line-right"></view>
</view>
<view class="close-btn" @click="onClose">
<image src="../static/close-yellow.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-yellow.png" mode="widthFix" />
</view>
</view>
<view class="target-options">
+2 -2
View File
@@ -65,7 +65,7 @@ watch(
<template>
<view class="container">
<image
:src="isRed ? '../static/flag-red.png' : '../static/flag-blue.png'"
:src="isRed ? 'https://static.shelingxingqiu.com/shootmini/static/flag-red.png' : 'https://static.shelingxingqiu.com/shootmini/static/flag-blue.png'"
class="flag"
:style="{
[isRed ? 'left' : 'right']: '10rpx',
@@ -86,7 +86,7 @@ watch(
[isRed ? 'left' : 'right']: getPos(item.id) + 'rpx',
}"
>
<image :src="item.avatar || '../static/user-icon.png'" mode="widthFix" />
<image :src="item.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<text
v-if="isFirst(item.id)"
:style="{ backgroundColor: isRed ? '#ff6060' : '#5fadff' }"
+4 -4
View File
@@ -95,7 +95,7 @@ watch(
</view>
<!-- <image
class="user-name-image"
src="../static/vip1.png"
src="https://static.shelingxingqiu.com/shootmini/static/vip1.png"
mode="widthFix"
/> -->
</view>
@@ -117,7 +117,7 @@ watch(
<view v-if="showRank === true" class="rank-info" @click="toRankListPage">
<image
class="rank-info-image"
src="../static/global-rank.png"
src="https://static.shelingxingqiu.com/shootmini/static/global-rank.png"
mode="widthFix"
/>
<block v-if="user.ranking > 0 && rankData.rank.length">
@@ -136,12 +136,12 @@ watch(
</block>
<block v-else>
<view class="signin" @click="onSignin">
<image src="../static/user-icon.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/user-icon.png" mode="widthFix" />
<view>
<text>新来的弓箭手你好呀~</text>
<view>
<text>登录</text>
<image src="../static/enter-arrow-blue.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/enter-arrow-blue.png" mode="widthFix" />
</view>
</view>
</view>
+1 -1
View File
@@ -25,7 +25,7 @@ defineProps({
<view>
<slot></slot>
<view v-if="onClick !== null">
<image src="../static/enter.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/enter.png" mode="widthFix" />
</view>
</view>
</view>
+2 -2
View File
@@ -52,7 +52,7 @@ onBeforeUnmount(() => {
<template>
<view class="content" :style="{ display: show ? 'flex' : 'none' }">
<view v-if="showRank" class="up-rank">
<image :src="user.avatar || '../static/user-icon.png'" mode="widthFix" />
<image :src="user.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<image :src="nextRankImage" mode="widthFix" />
<image class="bg-effect" src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
<image
@@ -75,7 +75,7 @@ onBeforeUnmount(() => {
/>
</view>
<view class="text-content">
<image src="../static/update-text-bg.png" />
<image src="https://static.shelingxingqiu.com/shootmini/static/update-text-bg.png" />
<text>恭喜你升级到</text>
<text>{{ showRank ? nextRankTitle : `射灵${lvl}` }}</text>
<text>!</text>
+227
View File
@@ -0,0 +1,227 @@
import { computed, ref } from "vue";
import { sendHardwareBoxUpdateAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const OTA_PROGRESS_EVENT = "/addons/shoot/otaProgress";
const OTA_RESULT_EVENT = "/addons/shoot/otaResult";
const UPDATE_TIMEOUT = 10 * 60 * 1000;
const phaseTextMap = {
started: "正在准备固件更新",
downloading: "正在下载固件",
installing: "正在安装固件",
};
// OTA 状态由首页、WiFi 设置页和我的设备页共享,页面切换后仍可继续接收进度。
const updating = ref(false);
const progress = ref(0);
const phase = ref("started");
const resultVisible = ref(false);
const resultStatus = ref("");
const resultReason = ref("");
let deviceRef = null;
let updateRunId = 0;
let targetVersion = "";
let lastFinishedVersion = "";
let timeoutTimer = null;
let successCallback = null;
let socketListening = false;
const phaseText = computed(
() => phaseTextMap[phase.value] || "正在进行固件更新"
);
const resultTitle = computed(() =>
resultStatus.value === "success" ? "固件更新完成" : "固件更新失败"
);
const resultContent = computed(() => {
if (resultStatus.value === "success") return "固件更新已完成";
return resultReason.value || "更新失败,请检查设备及网络后重试";
});
const clearTimers = () => {
clearTimeout(timeoutTimer);
timeoutTimer = null;
};
const resetActiveUpdate = () => {
clearTimers();
successCallback = null;
};
const finishUpdate = (status, reason = "", runId = updateRunId) => {
if (runId !== updateRunId || !updating.value) return;
const onSuccess = successCallback;
resetActiveUpdate();
updating.value = false;
resultStatus.value = status;
resultReason.value = reason;
lastFinishedVersion = targetVersion;
if (status === "success") {
progress.value = 100;
phase.value = "installing";
onSuccess?.();
}
resultVisible.value = true;
};
const isCurrentDeviceMessage = (data) => {
const messageDeviceId = String(data?.deviceId || "");
const currentDeviceId = String(deviceRef?.value?.deviceId || "");
return !messageDeviceId || !currentDeviceId || messageDeviceId === currentDeviceId;
};
const isCurrentVersionMessage = (data) => {
const messageVersion = String(data?.versionNumber || "");
return !messageVersion || !targetVersion || messageVersion === targetVersion;
};
// 页面切换导致弹窗关闭后,使用下一条进度消息恢复当前 OTA 会话。
const recoverUpdateFromMessage = (data) => {
updateRunId += 1;
const runId = updateRunId;
targetVersion = String(data?.versionNumber || "");
lastFinishedVersion = "";
successCallback = null;
resultVisible.value = false;
resultStatus.value = "";
resultReason.value = "";
progress.value = 0;
phase.value = "started";
updating.value = true;
clearTimers();
timeoutTimer = setTimeout(() => {
finishUpdate("failed", "固件更新超时,请稍后重试", runId);
}, UPDATE_TIMEOUT);
};
function handleSocketMessage(message) {
if (Number(message?.code ?? 0) !== 0) return;
if (![OTA_PROGRESS_EVENT, OTA_RESULT_EVENT].includes(message?.event)) return;
if (!isCurrentDeviceMessage(message.data)) return;
const messageVersion = String(message.data?.versionNumber || "");
if (message.event === OTA_PROGRESS_EVENT) {
if (!updating.value) {
if (
lastFinishedVersion &&
(!messageVersion || messageVersion === lastFinishedVersion)
) {
return;
}
recoverUpdateFromMessage(message.data);
} else if (!isCurrentVersionMessage(message.data)) {
return;
}
const nextProgress = Math.min(
100,
Math.max(0, Number(message.data?.progress) || 0)
);
progress.value = Math.max(progress.value, nextProgress);
if (phaseTextMap[message.data?.phase]) {
phase.value = message.data.phase;
}
return;
}
if (!updating.value) {
if (
lastFinishedVersion &&
(!messageVersion || messageVersion === lastFinishedVersion)
) {
return;
}
recoverUpdateFromMessage(message.data);
} else if (!isCurrentVersionMessage(message.data)) {
return;
}
if (message.data?.status === "success") {
finishUpdate("success");
} else if (message.data?.status === "failed") {
finishUpdate("failed", message.data?.reason || "");
}
}
const startSocketListening = () => {
if (socketListening) return;
uni.$on("socket-inbox", handleSocketMessage);
socketListening = true;
};
export const useOtaUpdate = () => {
const store = useStore();
const { device } = storeToRefs(store);
deviceRef = device;
startSocketListening();
const startUpdate = async ({
versionNumber,
resourceUrl,
wifiSsid = "",
wifiPassword = "",
onSuccess,
}) => {
if (updating.value) return false;
updateRunId += 1;
const runId = updateRunId;
targetVersion = String(versionNumber || "");
lastFinishedVersion = "";
successCallback = onSuccess || null;
resultVisible.value = false;
resultStatus.value = "";
resultReason.value = "";
progress.value = 0;
phase.value = "started";
updating.value = true;
clearTimers();
timeoutTimer = setTimeout(() => {
finishUpdate("failed", "固件更新超时,请稍后重试", runId);
}, UPDATE_TIMEOUT);
try {
const updateResult = await sendHardwareBoxUpdateAPI({
versionNumber: targetVersion,
wifiSsid,
wifiPassword,
resourceUrl,
});
if (runId !== updateRunId || !updating.value) return false;
if (!updateResult?.taskId) {
finishUpdate("failed", "固件更新任务创建失败,请稍后重试", runId);
return false;
}
return true;
} catch (error) {
if (runId === updateRunId) {
finishUpdate(
"failed",
error?.message || "固件更新请求失败,请稍后重试",
runId
);
}
return false;
}
};
const closeResult = () => {
resultVisible.value = false;
};
return {
updating,
progress,
phase,
phaseText,
resultVisible,
resultStatus,
resultTitle,
resultContent,
startUpdate,
closeResult,
};
};
+3
View File
@@ -147,6 +147,9 @@
{
"path": "my-device"
},
{
"path": "device-qrcode"
},
{
"path": "device-bind-success"
},
+7 -7
View File
@@ -156,7 +156,7 @@ const checkBowData = () => {
<view class="battle-winner">
<image src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
<image
:src="ifWin ? '../static/you-win.png' : '../static/you-lost.png'"
:src="ifWin ? 'https://static.shelingxingqiu.com/shootmini/static/you-win.png' : 'https://static.shelingxingqiu.com/shootmini/static/you-lost.png'"
mode="widthFix"
class="scale-in"
/>
@@ -193,37 +193,37 @@ const checkBowData = () => {
<image
v-if="player.rank === 1"
class="player-bg"
src="../static/melee-player-bg1.png"
src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg1.png"
mode="aspectFill"
/>
<image
v-if="player.rank === 2"
class="player-bg"
src="../static/melee-player-bg2.png"
src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg2.png"
mode="aspectFill"
/>
<image
v-if="player.rank === 3"
class="player-bg"
src="../static/melee-player-bg3.png"
src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg3.png"
mode="aspectFill"
/>
<image
v-if="player.rank === 1"
class="player-crown"
src="../static/champ1.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix"
/>
<image
v-if="player.rank === 2"
class="player-crown"
src="../static/champ2.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix"
/>
<image
v-if="player.rank === 3"
class="player-crown"
src="../static/champ3.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix"
/>
<view v-if="player.rank > 3" class="view-crown">{{
+8 -8
View File
@@ -587,7 +587,7 @@ onBeforeUnmount(() => {
<text v-else class="room-player-name">{{ owner.name }}</text>
</view>
<view v-else class="no-player" :style="{ transform: 'translateY(-60px)' }">
<image src="../static/question-mark.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view>
<image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" />
<view v-if="opponent.id" class="player" :style="{ transform: 'translateY(60px)' }">
@@ -607,11 +607,11 @@ onBeforeUnmount(() => {
<text v-else class="room-player-name">{{ opponent.name }}</text>
<button v-if="owner.id === user.id" hover-class="none" class="remove-player"
@click="() => removePlayer(opponent)">
<image src="../static/close-white.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button>
</view>
<view class="no-player" v-else>
<image src="../static/question-mark.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view>
</view>
</view>
@@ -627,7 +627,7 @@ onBeforeUnmount(() => {
<!-- 仅房主可见踢人按钮且不能踢自己 -->
<button v-if="owner.id !== item.id && item.id && owner.id === user.id" hover-class="none" class="remove-player"
@click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }">
<image src="../static/close-white.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</button>
</view>
</view>
@@ -636,7 +636,7 @@ onBeforeUnmount(() => {
<view>
<view v-for="(item, index) in redTeam" :key="index" class="choose-side-left-item">
<button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
<image src="../static/close-grey.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-grey.png" mode="widthFix" />
</button>
<view
v-if="item.id && isMember(item)"
@@ -653,7 +653,7 @@ onBeforeUnmount(() => {
<text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
</view>
<button v-else hover-class="none" @click="chooseTeam(2)">
<image src="../static/add-grey.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/add-grey.png" mode="widthFix" />
</button>
</view>
</view>
@@ -664,7 +664,7 @@ onBeforeUnmount(() => {
<text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
</view>
<button v-else hover-class="none" @click="chooseTeam(1)">
<image src="../static/add-grey.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/add-grey.png" mode="widthFix" />
</button>
<view
v-if="item.id && isMember(item)"
@@ -677,7 +677,7 @@ onBeforeUnmount(() => {
</view>
<text v-else class="truncate">{{ item.name || "我要加入" }}</text>
<button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
<image src="../static/close-grey.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-grey.png" mode="widthFix" />
</button>
</view>
</view>
@@ -6,7 +6,6 @@ export function useDeviceBinding({
binding,
updateDevice,
deviceDetails,
refreshDeviceStatus,
}) {
const showBindFailurePage = () => {
uni.hideToast();
@@ -63,7 +62,6 @@ export function useDeviceBinding({
const applyBoundDevice = () => {
updateDevice(deviceId, deviceName);
deviceDetails.value = result || {};
void refreshDeviceStatus();
};
uni.navigateTo({
url: `/pages/device/device-bind-success?deviceId=${encodeURIComponent(deviceId)}`,
+104 -26
View File
@@ -1,38 +1,64 @@
import { computed, ref } from "vue";
import { getDeviceBatteryAPI, getMyDevicesAPI, unbindDeviceAPI } from "@/apis";
import {
getDeviceDetailAPI,
getMyDevicesAPI,
unbindDeviceAPI,
} from "@/apis";
export const DEVICE_NAME_STORAGE_KEY = "device_name_overrides";
export function useDeviceStatus({
user,
device,
deviceStatus,
online,
updateDevice,
updateOnline,
clearDevice,
unbindDialogVisible,
}) {
const deviceStatus = ref({});
const deviceDetails = ref({});
let deviceDetailRequestVersion = 0;
const isDeviceOnline = computed(
() => deviceStatus.value.online === true || online.value === true
);
const statusText = computed(() => (isDeviceOnline.value ? "已连接" : "未连接"));
const isDeviceCharging = computed(
() => isDeviceOnline.value && deviceStatus.value.charging === true
);
const statusText = computed(() => {
if (!isDeviceOnline.value) return "未连接";
return isDeviceCharging.value ? "已连接(充电中)" : "已连接";
});
const statusClass = computed(() =>
isDeviceOnline.value ? "device-status--online" : "device-status--offline"
);
const battery = computed(() => {
const value = Number(
deviceStatus.value.battery ?? deviceStatus.value.power ?? 0
);
return Number.isFinite(value) && value > 0 ? Math.min(100, value) : 0;
const rawValue = deviceStatus.value.battery ?? deviceStatus.value.power;
if (rawValue === null || rawValue === undefined || rawValue === "") return null;
const value = Number(rawValue);
return Number.isFinite(value) ? Math.min(100, Math.max(0, value)) : null;
});
const batteryText = computed(() =>
battery.value ? `${battery.value}%` : "暂无数据"
battery.value === null ? "暂无数据" : `${battery.value}%`
);
const onlineDurationText = computed(() => {
const rawDuration = deviceStatus.value.onlineDuration;
if (rawDuration == null || String(rawDuration).trim() === "") return "--";
const seconds = Number(rawDuration);
if (!Number.isFinite(seconds) || seconds < 0) return "--";
// WS 推送秒数,页面按完整分钟展示累计使用时间。
const totalMinutes = Math.floor(seconds / 60);
const hours = Math.floor(totalMinutes / 60);
const minutes = totalMinutes % 60;
return hours > 0 ? `${hours}小时${minutes}分钟` : `${minutes}分钟`;
});
const networkType = computed(() =>
String(deviceStatus.value.netType ?? "").trim().toLowerCase()
);
const networkText = computed(() => {
const netType = String(deviceStatus.value.netType || "").toLowerCase();
const netType = networkType.value;
if (netType === "wifi") return "WiFi";
if (netType === "4g") return "4G";
return isDeviceOnline.value ? "在线" : "未连接";
@@ -55,15 +81,37 @@ export function useDeviceStatus({
return value && typeof value === "object" ? value : {};
};
const refreshDeviceStatus = async () => {
if (!device.value.deviceId) return;
const refreshDeviceDetails = async () => {
const deviceId = device.value.deviceId;
if (!deviceId) return;
const requestVersion = ++deviceDetailRequestVersion;
try {
const result = await getDeviceBatteryAPI();
deviceStatus.value = result || {};
updateOnline(result?.online === true);
const detailResponse = await getDeviceDetailAPI(deviceId);
const detail = detailResponse?.detail || detailResponse?.data?.detail;
if (
!detail ||
typeof detail !== "object" ||
requestVersion !== deviceDetailRequestVersion ||
device.value.deviceId !== deviceId
) {
return;
}
deviceDetails.value = {
...deviceDetails.value,
...detail,
deviceModelName: detail.deviceModelName ?? "",
bindTime: String(
detail.bindTime ?? deviceDetails.value.bindTime ?? ""
).trim(),
qrCodeUrl: String(
detail.qrCodeUrl ?? deviceDetails.value.qrCodeUrl ?? ""
).trim(),
};
} catch (error) {
deviceStatus.value = {};
console.log("获取设备状态失败", error);
// 实时刷新失败时保留当前页面数据,等待下次通知或页面重新显示。
console.log("刷新设备详情失败", error);
}
};
@@ -74,19 +122,46 @@ export function useDeviceStatus({
if (Array.isArray(devices?.bindings) && devices.bindings.length > 0) {
const currentDevice = devices.bindings[0];
const nameOverrides = getDeviceNameOverrides();
deviceDetails.value = currentDevice;
// 二维码和绑定时间仅取详情接口,绑定列表不能作为这两项的回退数据。
let latestDevice = {
...currentDevice,
deviceModelName: "",
bindTime: "",
qrCodeUrl: "",
};
try {
const detailResponse = await getDeviceDetailAPI(currentDevice.deviceId);
const detail = detailResponse?.detail || detailResponse?.data?.detail;
if (detail && typeof detail === "object") {
latestDevice = {
...currentDevice,
...detail,
deviceModelName: detail.deviceModelName ?? "",
bindTime: String(detail.bindTime ?? "").trim(),
qrCodeUrl: String(detail.qrCodeUrl ?? "").trim(),
deviceName:
detail.deviceAlias || detail.deviceName || currentDevice.deviceName,
};
}
} catch (error) {
// 详情接口失败时保留绑定关系,二维码和绑定时间仍保持为空。
console.log("获取设备详情失败", error);
}
deviceDetails.value = latestDevice;
updateDevice(
currentDevice.deviceId,
nameOverrides[currentDevice.deviceId] ||
currentDevice.deviceName ||
currentDevice.name ||
latestDevice.deviceId,
nameOverrides[latestDevice.deviceId] ||
latestDevice.deviceAlias ||
latestDevice.deviceName ||
latestDevice.name ||
"我的智能弓"
);
await refreshDeviceStatus();
return;
}
clearDevice();
deviceStatus.value = {};
deviceDetailRequestVersion += 1;
deviceDetails.value = {};
} catch (error) {
console.log("同步设备绑定失败", error);
@@ -99,7 +174,7 @@ export function useDeviceStatus({
await unbindDeviceAPI(device.value.deviceId);
uni.setStorageSync("calibration", false);
clearDevice();
deviceStatus.value = {};
deviceDetailRequestVersion += 1;
deviceDetails.value = {};
unbindDialogVisible.value = false;
uni.showToast({ title: "解绑成功", icon: "success" });
@@ -117,10 +192,13 @@ export function useDeviceStatus({
deviceDetails,
deviceRows,
getDeviceNameOverrides,
isDeviceCharging,
isDeviceOnline,
maskedDeviceId,
networkText,
refreshDeviceStatus,
networkType,
onlineDurationText,
refreshDeviceDetails,
statusClass,
statusText,
syncDeviceBinding,
+1 -1
View File
@@ -41,7 +41,7 @@ const retryScan = () => {
<view class="bind-failure-hero-shadow"></view>
<image
class="bind-failure-hero"
src="../../static/device-assets/device-bind-failure-hero.png"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-failure-hero.png"
mode="aspectFit"
/>
</view>
+5 -5
View File
@@ -11,8 +11,8 @@ const bindResult = ref({
const bindSuccessHero = computed(() =>
bindResult.value.isFirstBind
? "../../static/device-assets/device-bind-success-hero-first.png"
: "../../static/device-assets/device-bind-success-hero-nonfirst.png"
? "https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-hero-first.png"
: "https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-hero-nonfirst.png"
);
const bindRewardExpireDate = computed(() => bindResult.value.expireDate);
@@ -93,19 +93,19 @@ onLoad((options = {}) => {
>
<image
class="bind-success-confetti"
src="../../static/device-assets/device-bind-success-confetti.png"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-confetti.png"
mode="aspectFit"
/>
<image class="bind-success-hero" :src="bindSuccessHero" mode="aspectFit" />
<image
class="bind-success-title-image"
src="../../static/device-assets/device-bind-success-title.png"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-title.png"
mode="aspectFit"
/>
<view v-if="bindResult.isFirstBind" class="bind-reward-card">
<image
class="bind-reward-gift"
src="../../static/device-assets/device-bind-success-reward-gift.png"
src="https://static.shelingxingqiu.com/shootmini/static/device-assets/device-bind-success-reward-gift.png"
mode="aspectFit"
/>
<text class="bind-reward-text">
+1 -1
View File
@@ -38,7 +38,7 @@ const onScrollView = (e) => {
mode="widthFix"
/>
<navigator open-type="navigateBack">
<image class="header-back" src="../../static/back.png" mode="widthFix" />
<image class="header-back" src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</navigator>
<text
:style="{ opacity: addBg ? 1 : 0, color: '#fff', fontWeight: 'bold' }"
+192
View File
@@ -0,0 +1,192 @@
<script setup>
import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import { getDeviceDetailAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const store = useStore();
const { device } = storeToRefs(store);
const deviceId = ref("");
const qrImageUrl = ref("");
const qrSaved = ref(false);
const loading = ref(true);
const loadQrCode = async () => {
if (!deviceId.value) {
loading.value = false;
return;
}
try {
const response = await getDeviceDetailAPI(deviceId.value);
const detail = response?.detail || response?.data?.detail;
qrImageUrl.value = String(detail?.qrCodeUrl ?? "").trim();
} catch (error) {
console.error("获取设备二维码失败", error);
qrImageUrl.value = "";
} finally {
loading.value = false;
}
};
const saveQrCode = async () => {
if (!qrImageUrl.value) return;
let filePath = qrImageUrl.value;
try {
if (/^https?:\/\//.test(filePath)) {
filePath = await new Promise((resolve, reject) => {
uni.downloadFile({
url: filePath,
success: (result) =>
result.statusCode === 200
? resolve(result.tempFilePath)
: reject(new Error("二维码下载失败")),
fail: reject,
});
});
}
await new Promise((resolve, reject) => {
uni.saveImageToPhotosAlbum({ success: resolve, fail: reject, filePath });
});
qrSaved.value = true;
uni.showToast({ title: "已保存至相册", icon: "success" });
} catch (error) {
uni.showToast({ title: "请长按二维码保存", icon: "none" });
}
};
onLoad((options = {}) => {
try {
deviceId.value = decodeURIComponent(options.deviceId || "") || device.value.deviceId || "";
} catch (error) {
deviceId.value = device.value.deviceId || "";
}
void loadQrCode();
});
</script>
<template>
<Container :bgType="12" :scroll="false">
<view class="qr-page">
<view class="qr-corner qr-corner--top"></view>
<view class="qr-corner qr-corner--bottom"></view>
<view class="qr-canvas">
<text v-if="loading" class="qr-empty">二维码加载中...</text>
<template v-else-if="qrImageUrl">
<image class="qr-image" :src="qrImageUrl" mode="aspectFit" show-menu-by-longpress />
<text v-if="qrSaved" class="qr-device-id">设备ID{{ deviceId }}</text>
<view v-else class="qr-save-button" @click="saveQrCode">
<text>保存至相册</text>
</view>
<text class="qr-description">
该二维码为当前绑定弓箭的二维码你可以截图保存到相册以便当二维码丢失或不在身边时可以扫描二维码进行设备绑定
</text>
<text class="qr-note">解除绑定后将无法查看该二维码</text>
</template>
<text v-else class="qr-empty">暂无设备二维码</text>
</view>
</view>
</Container>
</template>
<style scoped>
.qr-page {
position: relative;
width: 100%;
height: 100%;
min-height: 0;
box-sizing: border-box;
overflow: hidden;
background: transparent;
}
.qr-corner {
position: absolute;
width: 300rpx;
height: 300rpx;
background: #ffeb00;
}
.qr-corner--top {
top: -220rpx;
right: -170rpx;
transform: rotate(42deg);
}
.qr-corner--bottom {
bottom: -220rpx;
left: -170rpx;
transform: rotate(42deg);
}
.qr-canvas {
position: relative;
z-index: 1;
display: flex;
width: 100%;
height: 100%;
min-height: 0;
box-sizing: border-box;
flex-direction: column;
align-items: center;
padding: 260rpx 62rpx 70rpx;
}
.qr-image {
width: 432rpx;
height: 432rpx;
box-sizing: border-box;
background: #ffffff;
}
.qr-save-button {
display: flex;
width: 360rpx;
height: 72rpx;
align-items: center;
justify-content: center;
margin-top: 34rpx;
border: 1rpx solid #e8c840;
border-radius: 36rpx;
color: #ffe846;
font-size: 26rpx;
}
.qr-device-id,
.qr-empty {
color: rgba(255, 255, 255, 0.72);
font-size: 26rpx;
line-height: 40rpx;
text-align: center;
}
.qr-device-id {
margin-top: 24rpx;
}
.qr-empty {
margin-top: 140rpx;
}
.qr-description,
.qr-note {
width: 100%;
color: rgba(255, 255, 255, 0.6);
font-size: 22rpx;
line-height: 36rpx;
text-align: center;
}
.qr-description {
margin-top: 42rpx;
}
.qr-note {
margin-top: 12rpx;
color: rgba(255, 232, 70, 0.7);
}
</style>
File diff suppressed because it is too large Load Diff
+129 -312
View File
@@ -3,22 +3,19 @@ import { ref, computed, onMounted, onUnmounted } from "vue";
import { onLoad, onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import ScreenHint from "@/components/ScreenHint.vue";
import ModalDialog from "@/components/ModalDialog.vue";
import OtaModal from "@/components/OtaModal.vue";
import {
connectDeviceWifiAPI,
getDeviceBatteryAPI,
getHardwareBoxTaskStatusAPI,
getHardwareBoxVersionAPI,
sendHardwareBoxUpdateAPI,
} from "@/apis";
import { useOtaUpdate } from "@/composables/useOtaUpdate";
const STATES = {
SCANNING: "SCANNING",
LIST: "LIST",
CONNECTING: "CONNECTING",
CONNECTED: "CONNECTED",
UPDATING: "UPDATING",
DONE: "DONE",
FAILED: "FAILED",
};
const isIOS = uni.getDeviceInfo().osName === "ios";
@@ -38,27 +35,37 @@ const keyboardHeight = ref(0);
const showPassword = ref(false);
// 刷新防抖标志:扫描进行中为 true,禁止重复点击;扫描结束(成功/失败)后重置为 false。
const isRefreshing = ref(false);
const isStartingUpdate = ref(false);
const fromFirmwareUpdate = ref(false);
const routeOtaInfo = ref({
versionNumber: "",
resourceUrl: "",
});
const progress = ref(0);
let progressTimer = null;
let timeoutTimer = null;
let statusTimer = null;
let wifiConnectTimer = null;
const countdownVisible = ref(false);
const countdownSeconds = ref(3);
const firmwareMessageVisible = ref(false);
const firmwareMessage = ref("");
let countdownTimer = null;
let wifiConnectRequestId = 0;
let wifiConnectPollCount = 0;
const WIFI_CONNECT_POLL_INTERVAL = 2000;
const WIFI_CONNECT_MAX_POLL_COUNT = 30;
const WIFI_CONNECT_FAILED_TEXT = "连接失败,请检查WiFi密码或WiFi状态";
const OTA_MIN_BATTERY = 50;
const OTA_LOW_BATTERY_TEXT = "电量不足 50%,暂不支持 OTA 升级";
// 控制授权拒绝弹窗显示/隐藏
const wifiAuthDeniedVisible = ref(false);
const {
updating: otaUpdating,
progress: otaProgress,
phase: otaPhase,
resultVisible: otaResultVisible,
resultStatus: otaResultStatus,
resultTitle: otaResultTitle,
resultContent: otaResultContent,
startUpdate: startOtaUpdate,
closeResult: closeOtaResult,
} = useOtaUpdate();
const countdownButtonText = computed(
() => `${Math.max(1, countdownSeconds.value)}秒后开始`
);
// 判断 WiFi 列表失败是否由用户拒绝授权引起(兼容 errno:103 及各平台 errMsg 变体)。
const isWifiPermissionDenied = (err) => {
if (err?.errno === 103) return true;
@@ -207,7 +214,7 @@ const startScanning = () => {
// 选择列表中的 WiFi,并打开密码输入弹窗。
const selectWifi = (wifi) => {
cancelWifiConnectPolling();
cancelWifiConnectWaiting();
connectingWifi.value = wifi;
connectInput.value = { ssid: wifi.SSID, password: "" };
connectMode.value = wifi.secure ? "secure" : "open";
@@ -217,7 +224,7 @@ const selectWifi = (wifi) => {
// 选择手动输入 WiFi,并打开手动输入弹窗。
const selectOther = () => {
cancelWifiConnectPolling();
cancelWifiConnectWaiting();
connectingWifi.value = null;
connectInput.value = { ssid: "", password: "" };
connectMode.value = "manual";
@@ -225,9 +232,9 @@ const selectOther = () => {
currentState.value = STATES.CONNECTING;
};
// 关闭连接弹窗,并停止当前 WiFi 连接轮询
// 关闭连接弹窗,并停止等待当前 WiFi 连接结果
const closeConnectSheet = () => {
cancelWifiConnectPolling();
cancelWifiConnectWaiting();
connectError.value = "";
currentState.value = connectedWifi.value ? STATES.CONNECTED : STATES.LIST;
};
@@ -257,89 +264,30 @@ const wifiListScrollHeight = computed(() => {
return `${Math.min(itemCount * 92, maxHeight)}rpx`;
});
// 清理 WiFi 连接轮询定时器
const clearWifiConnectTimer = () => {
clearTimeout(wifiConnectTimer);
wifiConnectTimer = null;
wifiConnectPollCount = 0;
};
// 取消当前 WiFi 连接轮询,并恢复弹窗提交状态。
const cancelWifiConnectPolling = () => {
// 取消当前 WiFi 连接请求的页面等待状态,并忽略可能迟到的响应
const cancelWifiConnectWaiting = () => {
wifiConnectRequestId += 1;
clearWifiConnectTimer();
connectStatusText.value = "";
isSubmittingWifi.value = false;
uni.hideLoading();
};
// 判断设备电量接口返回的 online/netType 字段,确定设备是否已通过 WiFi 在线
// 返回值含义:true → WiFi 在线成功;"net_fail" → 设备走 4g 失败;false → 未就绪,需继续轮询。
const isDeviceConnectedByWifi = (deviceStatus) => {
// online 不为 true → 设备不在线,需继续轮询
if (deviceStatus?.online !== true) return false;
const netType = String(deviceStatus?.netType || "").toLowerCase();
// online:true + netType:4g → 设备已切 4gWiFi 连接失败
if (netType === "4g") return "net_fail";
// online:true + netType:wifi → WiFi 连接成功
// online:true + netType:"" → 设备在线但 netType 暂未上报,继续轮询等待
return netType === "wifi";
// 把接口失败和传输异常转换为连接弹窗内的用户提示
const getWifiConnectErrorText = (error) => {
const message = error?.message || "";
if (message.includes("请先开启智能弓")) return "请先开启智能弓";
if (message.includes("超时") || error?.errMsg?.includes("timeout")) {
return "等待设备响应超时,请重试";
}
if (error?.errMsg) return "网络异常,请检查网络后重试";
return message || WIFI_CONNECT_FAILED_TEXT;
};
// 轮询设备电量接口,等待设备切到 WiFi 在线;netType:4g 快速失败,超时 30 次后放弃
const waitForDeviceWifiConnected = (requestId) => {
return new Promise((resolve) => {
const poll = async () => {
if (requestId !== wifiConnectRequestId) {
resolve(false);
return;
}
wifiConnectPollCount += 1;
try {
const deviceStatus = await getDeviceBatteryAPI();
if (requestId !== wifiConnectRequestId) {
resolve(false);
return;
}
const connResult = isDeviceConnectedByWifi(deviceStatus);
// online:true + netType:wifi → 成功
if (connResult === true) {
resolve(true);
return;
}
// online:true + netType:4g → 立即失败(设备已切 4g,WiFi 连不上)
if (connResult === "net_fail") {
resolve(false);
return;
}
// online:false + netType:"" → 继续轮询
// online:true + netType:"" → 忽略,继续轮询(netType 暂未上报)
} catch (err) {
if (requestId !== wifiConnectRequestId) {
resolve(false);
return;
}
}
if (wifiConnectPollCount >= WIFI_CONNECT_MAX_POLL_COUNT) {
resolve(false);
return;
}
wifiConnectTimer = setTimeout(poll, WIFI_CONNECT_POLL_INTERVAL);
};
poll();
});
};
// 提交 WiFi 配置给游戏设备,并轮询确认设备真实连上 WiFi 后再展示成功。
// 提交 WiFi 配置,并以接口返回的设备最终连接结果更新页面
const submitDeviceWifiConfig = async ({ ssid, password }) => {
if (isSubmittingWifi.value) return;
wifiConnectRequestId += 1;
const requestId = wifiConnectRequestId;
clearWifiConnectTimer();
isSubmittingWifi.value = true;
connectStatusText.value = "WiFi连接中...";
uni.showLoading({
@@ -347,10 +295,9 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
mask: true,
});
try {
await connectDeviceWifiAPI(ssid, password);
const isConnected = await waitForDeviceWifiConnected(requestId);
const connectResult = await connectDeviceWifiAPI(ssid, password);
if (requestId !== wifiConnectRequestId) return;
if (!isConnected) {
if (connectResult?.success !== true) {
connectError.value = WIFI_CONNECT_FAILED_TEXT;
return;
}
@@ -362,14 +309,15 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
};
connectError.value = "";
currentState.value = STATES.CONNECTED;
if (fromFirmwareUpdate.value) {
openFirmwareCountdown();
}
} catch (err) {
if (requestId === wifiConnectRequestId) {
connectError.value =
err?.code === -1 && err?.message ? err.message : WIFI_CONNECT_FAILED_TEXT;
connectError.value = getWifiConnectErrorText(err);
}
} finally {
if (requestId === wifiConnectRequestId) {
clearWifiConnectTimer();
connectStatusText.value = "";
isSubmittingWifi.value = false;
uni.hideLoading();
@@ -387,81 +335,7 @@ const joinNetwork = () => {
submitDeviceWifiConfig({ ssid, password });
};
// 清理 OTA 更新相关定时器,避免页面退出或状态结束后继续执行
const clearUpdateTimers = () => {
clearInterval(progressTimer);
clearTimeout(timeoutTimer);
clearTimeout(statusTimer);
progressTimer = null;
timeoutTimer = null;
statusTimer = null;
};
// 启动本地进度条动画,真实完成状态以后端任务轮询结果为准。
const startProgressAnimation = () => {
clearInterval(progressTimer);
progressTimer = setInterval(() => {
if (progress.value >= 90) {
clearInterval(progressTimer);
return;
}
const increment = Math.max(0.5, 2 - progress.value / 60);
progress.value = Math.min(90, progress.value + increment);
}, 500);
};
// 将 OTA 更新流程标记为失败并切换到失败页面。
const failUpdate = () => {
clearUpdateTimers();
isStartingUpdate.value = false;
currentState.value = STATES.FAILED;
};
// 将 OTA 更新流程标记为成功,进度补到 100% 后进入完成页面。
const completeUpdate = () => {
clearUpdateTimers();
isStartingUpdate.value = false;
progress.value = 100;
setTimeout(() => {
currentState.value = STATES.DONE;
}, 300);
};
// 轮询 OTA 更新任务状态,状态为处理中则继续轮询,成功或失败则结束流程。
const pollUpdateTaskStatus = (taskId) => {
clearTimeout(statusTimer);
statusTimer = setTimeout(async () => {
try {
const taskStatus = await getHardwareBoxTaskStatusAPI(taskId);
const status = Number(taskStatus?.status);
if (status === 2) {
completeUpdate();
return;
}
if (status === 3) {
failUpdate();
return;
}
if (status === 0 || status === 1) {
pollUpdateTaskStatus(taskId);
return;
}
failUpdate();
} catch (err) {
failUpdate();
}
}, 3000);
};
// 判断设备是否满足 OTA 更新条件,不满足时返回精确提示文案。
const getUpdateDisabledReason = (deviceStatus) => {
if (deviceStatus?.online !== true) return "请先开启智能弓";
if (Number(deviceStatus?.battery) <= OTA_MIN_BATTERY) return OTA_LOW_BATTERY_TEXT;
if (String(deviceStatus?.netType || "").toLowerCase() !== "wifi") return "设备当前未连接 WiFi,请先连接 WiFi 后再更新";
return "";
};
// 获取 OTA 更新版本信息,优先使用首页跳转传入的数据,没有传参时再请求后端版本接口。
// 获取 OTA 更新版本信息,正常使用入口传参,缺失时再请求后端兜底
const getOtaVersionInfo = async () => {
if (routeOtaInfo.value.versionNumber && routeOtaInfo.value.resourceUrl) {
return {
@@ -473,101 +347,43 @@ const getOtaVersionInfo = async () => {
return getHardwareBoxVersionAPI();
};
// 点击开始更新时先判断设备状态和版本信息,满足条件才发送 OTA 指令并开始轮询任务状态。
const startUpdate = async () => {
if (isStartingUpdate.value) return;
if (!connectedWifi.value) return;
isStartingUpdate.value = true;
const startFirmwareUpdate = async () => {
if (!fromFirmwareUpdate.value || !connectedWifi.value || otaUpdating.value) return;
try {
const deviceStatus = await getDeviceBatteryAPI();
const disabledReason = getUpdateDisabledReason(deviceStatus);
if (disabledReason) {
isStartingUpdate.value = false;
uni.showToast({
title: disabledReason,
icon: "none",
});
return;
}
let versionInfo;
try {
versionInfo = await getOtaVersionInfo();
} catch (err) {
isStartingUpdate.value = false;
uni.showToast({
title: "获取更新版本失败,请重试",
icon: "none",
});
return;
}
const versionInfo = await getOtaVersionInfo();
if (!versionInfo?.needUpdate) {
isStartingUpdate.value = false;
uni.showToast({
title: "当前已是最新版本",
icon: "none",
});
firmwareMessage.value = "当前已是最新版本";
firmwareMessageVisible.value = true;
return;
}
currentState.value = STATES.UPDATING;
progress.value = 0;
startProgressAnimation();
timeoutTimer = setTimeout(() => {
if (currentState.value === STATES.UPDATING) {
failUpdate();
}
}, 5 * 60 * 1000);
const updateResult = await sendHardwareBoxUpdateAPI({
await startOtaUpdate({
versionNumber: versionInfo.versionNumber,
wifiSsid: connectedWifi.value.SSID,
wifiPassword: connectedWifi.value.password || "",
resourceUrl: versionInfo.resourceUrl,
});
if (!updateResult?.taskId) {
failUpdate();
return;
}
pollUpdateTaskStatus(updateResult.taskId);
} catch (err) {
failUpdate();
} catch (error) {
firmwareMessage.value = "获取更新版本失败,请重试";
firmwareMessageVisible.value = true;
}
};
// WebSocket 成功回调保留兜底能力,触发后直接按更新完成处理。
const handleWsDone = () => {
completeUpdate();
const clearFirmwareCountdown = () => {
clearInterval(countdownTimer);
countdownTimer = null;
};
// WebSocket 失败回调保留兜底能力,触发后直接按更新失败处理。
const handleWsFail = () => {
failUpdate();
};
// 处理更新完成返回,兼容首页 OTA 弹窗入口和设备页普通入口。
const handleDone = () => {
const pages = getCurrentPages();
const prevPage = pages[pages.length - 2];
const prevVm = prevPage?.$vm;
if (prevVm && "otaState" in prevVm && "otaVisible" in prevVm) {
prevVm.otaState = "update_success";
prevVm.otaVisible = true;
}
uni.navigateBack({ delta: 1 });
};
const handleRetry = () => {
if (connectedWifi.value) {
currentState.value = STATES.CONNECTED;
} else {
startScanning();
}
const openFirmwareCountdown = () => {
clearFirmwareCountdown();
countdownSeconds.value = 3;
countdownVisible.value = true;
countdownTimer = setInterval(() => {
countdownSeconds.value -= 1;
if (countdownSeconds.value > 0) return;
clearFirmwareCountdown();
countdownVisible.value = false;
void startFirmwareUpdate();
}, 1000);
};
// 监听系统输入法高度,用于让底部弹窗避开键盘遮挡。
@@ -585,8 +401,9 @@ const togglePasswordVisibility = () => {
});
};
// 页面加载时接收首页传入的 OTA 版本号和固件地址
// 页面加载时识别普通 WiFi 入口和固件更新入口
onLoad((options = {}) => {
fromFirmwareUpdate.value = options.source === "firmware-update";
routeOtaInfo.value = {
versionNumber: decodeURIComponent(options.versionNumber || ""),
resourceUrl: decodeURIComponent(options.resourceUrl || ""),
@@ -612,8 +429,8 @@ onUnmounted(() => {
if (typeof uni.offKeyboardHeightChange === "function") {
uni.offKeyboardHeightChange(handleKeyboardHeightChange);
}
cancelWifiConnectPolling();
clearUpdateTimers();
cancelWifiConnectWaiting();
clearFirmwareCountdown();
wx.offGetWifiList && wx.offGetWifiList();
});
</script>
@@ -650,16 +467,16 @@ onUnmounted(() => {
</view>
<view v-if="currentState === 'CONNECTED'" class="wifi-list-card connected-wifi-card">
<view class="wifi-item connected-wifi-item">
<image class="check-icon" src="../../static/sicon/check.png" mode="aspectFit" />
<image class="check-icon" src="https://static.shelingxingqiu.com/shootmini/static/sicon/check.png" mode="aspectFit" />
<text class="wifi-ssid connected-wifi-ssid">{{ connectedWifi?.SSID }}</text>
<view class="wifi-icons connected-wifi-icons">
<image
v-if="connectedWifi?.secure"
class="security-icon"
src="../../static/sicon/pwd.png"
src="https://static.shelingxingqiu.com/shootmini/static/sicon/pwd.png"
mode="aspectFit"
/>
<image class="signal-icon" src="../../static/sicon/wifi.png" mode="aspectFit" />
<image class="signal-icon" src="https://static.shelingxingqiu.com/shootmini/static/sicon/wifi.png" mode="aspectFit" />
</view>
</view>
</view>
@@ -668,7 +485,7 @@ onUnmounted(() => {
<view class="section-label-row">
<text class="section-label">网络</text>
<image
src="../../static/sicon/refresh.png"
src="https://static.shelingxingqiu.com/shootmini/static/sicon/refresh.png"
mode="aspectFit"
:style="{ width: '34rpx', height: '34rpx', marginLeft: '8rpx', opacity: isRefreshing ? 0.3 : 0.7 }"
@click="startScanning"
@@ -699,10 +516,10 @@ onUnmounted(() => {
<image
v-if="wifi.secure"
class="security-icon"
src="../../static/sicon/pwd.png"
src="https://static.shelingxingqiu.com/shootmini/static/sicon/pwd.png"
mode="aspectFit"
/>
<image class="signal-icon" src="../../static/sicon/wifi.png" mode="aspectFit" />
<image class="signal-icon" src="https://static.shelingxingqiu.com/shootmini/static/sicon/wifi.png" mode="aspectFit" />
</view>
</view>
<view class="wifi-item" @click="selectOther">
@@ -711,46 +528,6 @@ onUnmounted(() => {
</block>
</scroll-view>
<!-- CONNECTED开始更新按钮 -->
<view v-if="currentState === 'CONNECTED'" class="bottom-btn-area connected-bottom-btn-area">
<view class="primary-btn update-btn" @click="startUpdate">
<text class="primary-btn-text">开始更新</text>
</view>
</view>
</view>
<!-- UPDATING -->
<view v-else-if="currentState === 'UPDATING'" class="center-page">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/target-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
<text class="page-title" style="margin-top: 24rpx;">更新中,请稍等片刻...</text>
<view class="progress-wrap">
<view class="progress-track">
<view class="progress-fill" :style="{ width: progress + '%' }"></view>
</view>
<text class="progress-pct">{{ Math.floor(progress) }}%</text>
</view>
</view>
<!-- DONE -->
<view v-else-if="currentState === 'DONE'" class="center-page">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/check-char.png" mode="aspectFit" style="width: 194rpx; height: 166rpx;" />
<text class="page-title" style="margin-top: 24rpx;">更新完成</text>
<text class="page-desc-white">请关机并重启智能弓</text>
<view class="primary-btn done-btn" style="margin-top:20px" @click="handleDone">
<text class="primary-btn-text">完成</text>
</view>
</view>
<!-- FAILED -->
<view v-else-if="currentState === 'FAILED'" class="center-page">
<image src="https://static.shelingxingqiu.com/shootmini/static/ota/close-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
<text class="page-title fail-title" style="margin-top: 24rpx;">更新失败</text>
<text class="page-desc-white">请确保</text>
<text class="page-desc-white">1智能弓已开启</text>
<text class="page-desc-white">2网路连接稳定</text>
<view class="primary-btn done-btn" style="margin-top: 40rpx;" @click="handleRetry">
<text class="primary-btn-text">重试</text>
</view>
</view>
<!-- CONNECTING 底部弹窗 -->
@@ -763,7 +540,7 @@ onUnmounted(() => {
<block v-if="connectMode === 'secure'">
<view class="sheet-header">
<view class="sheet-nav-btn" @click="closeConnectSheet">
<image src="../../static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
<image src="https://static.shelingxingqiu.com/shootmini/static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
</view>
<text class="sheet-title">加入"{{ connectInput.ssid }}"</text>
<view
@@ -771,7 +548,7 @@ onUnmounted(() => {
:class="{ 'nav-disabled': joinDisabled }"
@click="joinNetwork"
>
<image src="../../static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
<image src="https://static.shelingxingqiu.com/shootmini/static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
</view>
</view>
<view class="input-row-card">
@@ -789,7 +566,7 @@ onUnmounted(() => {
<!-- 密码显示/隐藏切换按钮 -->
<view class="pwd-eye-btn" @click="togglePasswordVisibility">
<image
:src="showPassword ? '../../static/sicon/eye-on.png' : '../../static/sicon/eye-off.png'"
:src="showPassword ? 'https://static.shelingxingqiu.com/shootmini/static/sicon/eye-on.png' : 'https://static.shelingxingqiu.com/shootmini/static/sicon/eye-off.png'"
mode="aspectFit"
style="width: 40rpx; height: 40rpx;"
/>
@@ -803,11 +580,11 @@ onUnmounted(() => {
<block v-else-if="connectMode === 'open'">
<view class="sheet-header">
<view class="sheet-nav-btn" @click="closeConnectSheet">
<image src="../../static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
<image src="https://static.shelingxingqiu.com/shootmini/static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
</view>
<text class="sheet-title">加入"{{ connectInput.ssid }}"</text>
<view class="sheet-nav-btn" @click="joinNetwork">
<image src="../../static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
<image src="https://static.shelingxingqiu.com/shootmini/static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
</view>
</view>
<text v-if="connectStatusText" class="connect-status">{{ connectStatusText }}</text>
@@ -819,7 +596,7 @@ onUnmounted(() => {
<block v-else-if="connectMode === 'manual'">
<view class="sheet-header">
<view class="sheet-nav-btn" @click="closeConnectSheet">
<image src="../../static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
<image src="https://static.shelingxingqiu.com/shootmini/static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
</view>
<text class="sheet-title">加入无线网络</text>
<view
@@ -827,7 +604,7 @@ onUnmounted(() => {
:class="{ 'nav-disabled': joinDisabled }"
@click="joinNetwork"
>
<image src="../../static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
<image src="https://static.shelingxingqiu.com/shootmini/static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
</view>
</view>
<view class="input-row-card">
@@ -854,7 +631,7 @@ onUnmounted(() => {
<!-- 密码显示/隐藏切换按钮 -->
<view class="pwd-eye-btn" @click="togglePasswordVisibility">
<image
:src="showPassword ? '../../static/sicon/eye-on.png' : '../../static/sicon/eye-off.png'"
:src="showPassword ? 'https://static.shelingxingqiu.com/shootmini/static/sicon/eye-on.png' : 'https://static.shelingxingqiu.com/shootmini/static/sicon/eye-off.png'"
mode="aspectFit"
style="width: 40rpx; height: 40rpx;"
/>
@@ -883,6 +660,46 @@ onUnmounted(() => {
</view>
</view>
</ScreenHint>
<ModalDialog
:show="countdownVisible"
title="WiFi连接成功"
content="3秒后将自动开始更新"
:confirmText="countdownButtonText"
:showCancel="false"
:confirmDisabled="true"
></ModalDialog>
<OtaModal
:visible="otaUpdating"
state="update_progress"
:progress="otaProgress"
:phase="otaPhase"
/>
<OtaModal
:visible="otaResultVisible && otaResultStatus === 'success'"
state="update_success"
@done="closeOtaResult"
/>
<ModalDialog
:show="otaResultVisible && otaResultStatus === 'failed'"
:title="otaResultTitle"
:content="otaResultContent"
confirmText="关闭"
:showCancel="false"
:onConfirm="closeOtaResult"
></ModalDialog>
<ModalDialog
:show="firmwareMessageVisible"
title="固件更新"
:content="firmwareMessage"
confirmText="关闭"
:showCancel="false"
:onConfirm="() => (firmwareMessageVisible = false)"
></ModalDialog>
</Container>
</template>
+2 -2
View File
@@ -168,7 +168,7 @@ const meleeRankList = computed(() => {
*/
function getMeleeRankBgSrc(rank) {
const names = ["one", "two", "three"];
return `../static/friend-battle-result/rank-${names[rank - 1]}.svg`;
return `https://static.shelingxingqiu.com/shootmini/static/friend-battle-result/rank-${names[rank - 1]}.svg`;
}
/**
@@ -485,7 +485,7 @@ function goBack() {
<image
v-if="item.rank <= 3"
class="rank-badge-img"
:src="`../static/champ${item.rank}.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/champ${item.rank}.png`"
mode="aspectFit"
/>
<view v-else class="rank-badge-default">
+5 -5
View File
@@ -190,10 +190,10 @@ onLoad(async (options) => {
<view>
<view class="stars">
<block v-for="i in 5" :key="i">
<image v-if="data.totalWinningRate >= i * 0.2" src="../static/star-full.png" mode="widthFix" />
<image v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1" src="../static/star-half.png"
<image v-if="data.totalWinningRate >= i * 0.2" src="https://static.shelingxingqiu.com/shootmini/static/star-full.png" mode="widthFix" />
<image v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1" src="https://static.shelingxingqiu.com/shootmini/static/star-half.png"
mode="widthFix" />
<image v-else src="../static/star-empty.png" mode="widthFix" />
<image v-else src="https://static.shelingxingqiu.com/shootmini/static/star-empty.png" mode="widthFix" />
</block>
</view>
<text>挑战难度</text>
@@ -201,7 +201,7 @@ onLoad(async (options) => {
</view>
</view>
<view class="founded-room">
<image src="../static/founded-room.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/founded-room.png" mode="widthFix" />
<view>
<input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
<view @click="$clickSound(() => enterRoom(roomNumber))">进入房间</view>
@@ -214,7 +214,7 @@ onLoad(async (options) => {
<image :src="user.avatar" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" />
<view>
<image src="../static/question-mark.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/question-mark.png" mode="widthFix" />
</view>
</view>
<view>
+214 -318
View File
@@ -1,26 +1,26 @@
<script setup>
import {computed, onMounted, onUnmounted, ref, watch} from "vue";
import {onHide, onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
import {computed, onMounted, ref, watch} from "vue";
import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import AppFooter from "@/components/AppFooter.vue";
import UserHeader from "@/components/UserHeader.vue";
import Signin from "@/components/Signin.vue";
import BubbleTip from "@/components/BubbleTip.vue";
import DeviceOnlineEffects from "@/components/DeviceOnlineEffects.vue";
import ModalDialog from "@/components/ModalDialog.vue";
import OtaModal from "@/components/OtaModal.vue";
import {
checkUserBindAPI,
getAppConfig,
getDeviceBatteryAPI,
getHardwareBoxTaskStatusAPI,
getHardwareBoxVersionAPI,
getHomeData,
getMyDevicesAPI,
getScoreRankList,
sendHardwareBoxUpdateAPI,
silentLoginAPI,
} from "@/apis";
import {topThreeColors} from "@/constants";
import {useOtaUpdate} from "@/composables/useOtaUpdate";
import useStore from "@/store";
import {storeToRefs} from "pinia";
@@ -33,120 +33,37 @@ const {
clearDevice,
getLvlName,
getLvlNameByScore,
updateOnline,
updateDeviceBattery,
} = store;
const {user, device, online, deviceBattery, game} = storeToRefs(store);
const {user, device, deviceStatus, online, deviceBattery, game} = storeToRefs(store);
const showModal = ref(false);
const showGuide = ref(false);
const scoreRankList = ref([]);
const HOME_DEVICE_STATUS_POLL_INTERVAL = 10000;
let isHomePageVisible = false;
let homeDeviceStatusTimer = null;
let isHomeDeviceStatusRequesting = false;
// 设备状态接口可能返回布尔值、数字或字符串,统一成 true / false / null。
// null 表示接口没有给出可判断的状态,调用方应保留已有状态。
const normalizeDeviceOnline = (value) => {
if (typeof value === "boolean") return value;
if (typeof value === "number") return value === 1;
const normalized = String(value ?? "").trim().toLowerCase();
if (["true", "1", "online", "connected"].includes(normalized)) return true;
if (["false", "0", "offline", "disconnected"].includes(normalized)) return false;
return null;
};
// 将设备状态接口响应统一同步到首页 Store,离线时清空无效电量。
const applyHomeDeviceStatus = (data) => {
const normalizedOnline = normalizeDeviceOnline(data?.online);
if (normalizedOnline !== null) {
updateOnline(normalizedOnline);
}
if (normalizedOnline === false) {
updateDeviceBattery(null);
return;
}
const battery = data?.battery ?? data?.power;
if (battery !== undefined && battery !== null) {
updateDeviceBattery(battery);
}
};
// 刷新首页设备在线状态和电量;上一轮未结束时跳过,避免请求堆积。
const refreshHomeDeviceStatus = async () => {
if (
!isHomePageVisible ||
!user.value?.id ||
!device.value?.deviceId ||
isHomeDeviceStatusRequesting
) {
return;
}
isHomeDeviceStatusRequesting = true;
try {
const data = await getDeviceBatteryAPI();
if (isHomePageVisible) {
applyHomeDeviceStatus(data);
}
} catch (error) {
// 请求失败时保留上一次有效状态,等待下一轮自动恢复。
console.log("刷新首页设备状态失败", error);
} finally {
isHomeDeviceStatusRequesting = false;
}
};
const stopHomeDeviceStatusPolling = () => {
clearInterval(homeDeviceStatusTimer);
homeDeviceStatusTimer = null;
};
// 首页可见且用户已绑定设备时,每 10 秒刷新一次设备状态。
const startHomeDeviceStatusPolling = () => {
stopHomeDeviceStatusPolling();
if (!isHomePageVisible || !user.value?.id || !device.value?.deviceId) return;
homeDeviceStatusTimer = setInterval(() => {
void refreshHomeDeviceStatus();
}, HOME_DEVICE_STATUS_POLL_INTERVAL);
};
// 首页停留期间登录或绑定状态变化时,及时启停设备状态轮询。
watch(
[() => user.value?.id, () => device.value?.deviceId],
() => {
if (isHomePageVisible) {
startHomeDeviceStatusPolling();
}
}
);
const DEVICE_STATUS_STALE_TIME = 6000;
// 首页设备卡片按“未绑定 / 已绑定未连接 / 已绑定已连接”三态展示。
const deviceCardState = computed(() => {
// 未登录时始终展示绑定入口,避免本地残留设备状态误显示为已绑定。
if (!user.value?.id || !device.value?.deviceId) return "unbound";
return normalizeDeviceOnline(online.value) === true ? "online" : "offline";
return online.value === true ? "online" : "offline";
});
const deviceCardAssets = {
unbound: {
bow: "../static/home-device/device-bow--unbound.png",
background: "../static/home-device/device-card-bg--unbound.png",
actionBackground: "../static/home-device/device-action-bg--bind.png",
bow: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-bow--unbound.png",
background: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-card-bg--unbound.png",
actionBackground: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-action-bg--bind.png",
},
offline: {
bow: "../static/home-device/device-bow--offline.png",
background: "../static/home-device/device-card-bg--bound.png",
actionBackground: "../static/home-device/device-action-bg--device.png",
bow: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-bow--offline.png",
background: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-card-bg--bound.png",
actionBackground: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-action-bg--device.png",
},
online: {
bow: "../static/home-device/device-bow--online.png",
background: "../static/home-device/device-card-bg--bound.png",
actionBackground: "../static/home-device/device-action-bg--device.png",
bow: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-bow--online.png",
platform: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-platform-glow--online.png",
background: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-card-bg--bound.png",
actionBackground: "https://static.shelingxingqiu.com/shootmini/static/home-device/device-action-bg--device.png",
},
};
@@ -154,8 +71,7 @@ const deviceCardAsset = computed(() => deviceCardAssets[deviceCardState.value]);
// OTA 相关
const otaVisible = ref(false);
const otaState = ref("new_version");
const otaProgress = ref(0);
const wifiRequiredVisible = ref(false);
const otaInfo = ref({
versionNumber: "",
versionInfo: "",
@@ -166,51 +82,16 @@ const otaInfo = ref({
const isStartingOta = ref(false);
let isCheckingOta = false;
let otaCheckQueuedForOnline = false;
let otaProgressTimer = null;
let otaStatusTimer = null;
let otaTimeoutTimer = null;
let otaResultTimer = null;
let otaStatusPollCount = 0;
let otaUpdateRunId = 0;
// 首页 OTA 轮询采用请求次数和总时长双重兜底,避免更新中状态长期卡住。
const OTA_TASK_STATUS_POLL_INTERVAL = 2000;
const OTA_TASK_STATUS_MAX_POLL_COUNT = 15;
const OTA_TASK_STATUS_TIMEOUT = 30000;
// 清理首页 OTA 更新定时器,避免弹窗关闭或页面卸载后继续轮询。
const clearOtaUpdateTimers = () => {
clearInterval(otaProgressTimer);
clearTimeout(otaStatusTimer);
clearTimeout(otaTimeoutTimer);
clearTimeout(otaResultTimer);
otaProgressTimer = null;
otaStatusTimer = null;
otaTimeoutTimer = null;
otaResultTimer = null;
otaStatusPollCount = 0;
};
// 使当前 OTA 运行失效,确保旧请求返回后不会继续轮询或覆盖新状态。
const invalidateOtaUpdateRun = () => {
otaUpdateRunId += 1;
clearOtaUpdateTimers();
};
const isOtaUpdateRunActive = (runId) =>
runId === otaUpdateRunId && otaState.value === "update_progress";
// 启动首页 OTA 本地进度动画,最终成功失败以后端任务状态为准。
const startOtaProgressAnimation = () => {
clearInterval(otaProgressTimer);
otaProgressTimer = setInterval(() => {
if (otaProgress.value >= 90) {
clearInterval(otaProgressTimer);
return;
}
const increment = Math.max(0.5, 2 - otaProgress.value / 60);
otaProgress.value = Math.min(90, otaProgress.value + increment);
}, 500);
};
const {
updating: otaUpdating,
progress: otaProgress,
phase: otaPhase,
resultVisible: otaResultVisible,
resultStatus: otaResultStatus,
startUpdate: startOtaUpdate,
closeResult: closeOtaResult,
} = useOtaUpdate();
// 获取并保存后端返回的 OTA 版本信息,供弹窗展示和更新接口使用。
const applyOtaVersionInfo = (versionInfo) => {
@@ -226,17 +107,21 @@ const applyOtaVersionInfo = (versionInfo) => {
// 检查当前设备盒子是否存在可升级版本。
const checkOtaUpdate = async () => {
if (isCheckingOta || otaVisible.value) return;
if (
isCheckingOta ||
otaVisible.value ||
otaUpdating.value ||
otaResultVisible.value
) return;
isCheckingOta = true;
try {
let deviceStatus;
try {
deviceStatus = await getDeviceBatteryAPI();
} catch (err) {
return;
}
if (normalizeDeviceOnline(deviceStatus?.online) !== true || otaVisible.value) return;
if (
online.value !== true ||
otaVisible.value ||
otaUpdating.value ||
otaResultVisible.value
) return;
let versionInfo;
try {
@@ -244,20 +129,24 @@ const checkOtaUpdate = async () => {
} catch (err) {
return;
}
if (otaVisible.value) return;
if (otaVisible.value || otaUpdating.value || otaResultVisible.value) return;
applyOtaVersionInfo(versionInfo);
if (!otaInfo.value.needUpdate) return;
const dismissedAt = uni.getStorageSync("ota_dismissed_at");
const now = Date.now();
if (!otaInfo.value.forceUpdate && dismissedAt && now - dismissedAt < 24 * 60 * 60 * 1000) return;
otaState.value = "new_version";
otaVisible.value = true;
} finally {
isCheckingOta = false;
const shouldRecheckForOnline = otaCheckQueuedForOnline;
otaCheckQueuedForOnline = false;
if (shouldRecheckForOnline && !otaVisible.value) {
if (
shouldRecheckForOnline &&
!otaVisible.value &&
!otaUpdating.value &&
!otaResultVisible.value
) {
void checkOtaUpdate();
}
}
@@ -265,7 +154,13 @@ const checkOtaUpdate = async () => {
// 设备由 WS 通知上线时补查 OTA;已显示任何 OTA 弹窗时保留当前流程和结果。
watch(online, (nextOnline, previousOnline) => {
if (previousOnline !== false || nextOnline !== true || otaVisible.value) return;
if (
previousOnline !== false ||
nextOnline !== true ||
otaVisible.value ||
otaUpdating.value ||
otaResultVisible.value
) return;
if (isCheckingOta) {
otaCheckQueuedForOnline = true;
return;
@@ -273,10 +168,18 @@ watch(online, (nextOnline, previousOnline) => {
void checkOtaUpdate();
});
// 任一页面发起或恢复 OTA 后,关闭首页的版本发现弹窗,避免两层弹窗重叠。
watch([otaUpdating, otaResultVisible], ([updating, resultVisible]) => {
if (!updating && !resultVisible) return;
otaVisible.value = false;
isStartingOta.value = false;
});
// 拼接 OTA WiFi 页参数,让未连 WiFi 的设备继续使用同一份版本信息。
const getOtaWifiUrl = () => {
const { versionNumber, resourceUrl } = otaInfo.value;
const query = [
"source=firmware-update",
`versionNumber=${encodeURIComponent(versionNumber)}`,
`resourceUrl=${encodeURIComponent(resourceUrl)}`,
].join("&");
@@ -290,117 +193,26 @@ const handleOtaDismiss = () => {
otaVisible.value = false;
};
// 将首页 OTA 直连更新流程标记为失败
const failHomeOtaUpdate = (runId) => {
if (!isOtaUpdateRunActive(runId)) return;
invalidateOtaUpdateRun();
isStartingOta.value = false;
otaState.value = "update_failure";
otaVisible.value = true;
};
// 将首页 OTA 直连更新流程标记为成功。
const completeHomeOtaUpdate = (runId) => {
if (!isOtaUpdateRunActive(runId)) return;
invalidateOtaUpdateRun();
isStartingOta.value = false;
otaInfo.value = {...otaInfo.value, needUpdate: false};
otaProgress.value = 100;
const completedRunId = otaUpdateRunId;
otaResultTimer = setTimeout(() => {
otaResultTimer = null;
if (completedRunId !== otaUpdateRunId) return;
otaState.value = "update_success";
otaVisible.value = true;
}, 300);
};
// 轮询首页直接发起的 OTA 更新任务状态。
const pollHomeOtaTaskStatus = async (taskId, runId) => {
if (!isOtaUpdateRunActive(runId)) return;
otaStatusPollCount += 1;
try {
const taskStatus = await getHardwareBoxTaskStatusAPI(taskId);
if (!isOtaUpdateRunActive(runId)) return;
const status = Number(taskStatus?.status);
if (status === 2) {
completeHomeOtaUpdate(runId);
return;
}
if (status === 3) {
failHomeOtaUpdate(runId);
return;
}
if (status === 0 || status === 1) {
if (otaStatusPollCount >= OTA_TASK_STATUS_MAX_POLL_COUNT) {
failHomeOtaUpdate(runId);
return;
}
otaStatusTimer = setTimeout(() => {
otaStatusTimer = null;
if (!isOtaUpdateRunActive(runId)) return;
void pollHomeOtaTaskStatus(taskId, runId);
}, OTA_TASK_STATUS_POLL_INTERVAL);
return;
}
failHomeOtaUpdate(runId);
} catch (err) {
if (!isOtaUpdateRunActive(runId)) return;
failHomeOtaUpdate(runId);
}
};
// 设备盒子已连 WiFi 时,从首页直接传空 WiFi 信息发起 OTA 更新。
// 设备盒子已连 WiFi 时,通过共享 OTA 状态发起更新
const startHomeOtaUpdate = async () => {
invalidateOtaUpdateRun();
const runId = otaUpdateRunId;
otaState.value = "update_progress";
otaVisible.value = true;
otaProgress.value = 0;
startOtaProgressAnimation();
otaTimeoutTimer = setTimeout(() => {
if (!isOtaUpdateRunActive(runId)) return;
failHomeOtaUpdate(runId);
}, OTA_TASK_STATUS_TIMEOUT);
try {
const updateResult = await sendHardwareBoxUpdateAPI({
otaVisible.value = false;
await startOtaUpdate({
versionNumber: otaInfo.value.versionNumber,
wifiSsid: "",
wifiPassword: "",
resourceUrl: otaInfo.value.resourceUrl,
onSuccess: () => {
otaInfo.value = {...otaInfo.value, needUpdate: false};
},
});
if (!isOtaUpdateRunActive(runId)) return;
if (!updateResult?.taskId) {
failHomeOtaUpdate(runId);
return;
}
void pollHomeOtaTaskStatus(updateResult.taskId, runId);
} catch (err) {
if (!isOtaUpdateRunActive(runId)) return;
failHomeOtaUpdate(runId);
}
isStartingOta.value = false;
};
// 点击立即更新时先判断设备是否在线并已通过 WiFi 联网,联网则首页直接更新,否则跳转 WiFi 页面
// 点击立即更新时先判断设备是否在线并已通过 WiFi 联网,联网时先展示连接引导
const handleOtaUpdate = async () => {
if (isStartingOta.value) return;
isStartingOta.value = true;
let deviceStatus;
try {
deviceStatus = await getDeviceBatteryAPI();
} catch (err) {
isStartingOta.value = false;
uni.showToast({
title: "获取设备状态失败,请重试",
icon: "none",
});
return;
}
const currentDeviceStatus = deviceStatus.value;
if (normalizeDeviceOnline(deviceStatus?.online) !== true) {
if (currentDeviceStatus?.online !== true) {
isStartingOta.value = false;
uni.showToast({
title: "请先开启智能弓",
@@ -409,25 +221,53 @@ const handleOtaUpdate = async () => {
return;
}
if (String(deviceStatus?.netType || "").toLowerCase() === "wifi") {
if (
Date.now() - Number(currentDeviceStatus?.receivedAt || 0) >
DEVICE_STATUS_STALE_TIME
) {
isStartingOta.value = false;
uni.showToast({
title: "设备状态同步中,请稍后重试",
icon: "none",
});
return;
}
if (String(currentDeviceStatus?.netType || "").toLowerCase() === "wifi") {
startHomeOtaUpdate();
return;
}
isStartingOta.value = false;
otaVisible.value = false;
wifiRequiredVisible.value = true;
};
// 从首页固件更新提示进入 WiFi 配置页,并继续沿用当前版本信息。
const goWifiForOtaUpdate = () => {
wifiRequiredVisible.value = false;
uni.navigateTo({ url: getOtaWifiUrl() });
};
// 处理 OTA 更新成功后的完成按钮,关闭结果弹窗。
// 处理 OTA 更新成功后的完成按钮,关闭共享结果弹窗。
const handleOtaDone = () => {
otaVisible.value = false;
closeOtaResult();
};
// 处理 OTA 更新失败后的重试按钮,重新走立即更新判断流程
const handleOtaRetry = () => {
invalidateOtaUpdateRun();
handleOtaUpdate();
// 处理共享 OTA 更新失败后的重试,先刷新版本参数再重新判断网络状态
const handleOtaRetry = async () => {
closeOtaResult();
try {
const versionInfo = await getHardwareBoxVersionAPI();
applyOtaVersionInfo(versionInfo);
if (!otaInfo.value.needUpdate) return;
await handleOtaUpdate();
} catch (error) {
uni.showToast({
title: "获取更新版本失败,请重试",
icon: "none",
});
}
};
// 提取积分榜接口返回的榜单数组,兼容数组和对象两种返回格式。
@@ -489,37 +329,19 @@ const syncHomeDevice = async () => {
return;
}
const previousDeviceId = String(device.value?.deviceId || "");
const deviceId = String(currentDevice.deviceId || "");
updateDevice(
deviceId,
currentDevice.deviceName || currentDevice.name || ""
);
// 切换到新设备时先以离线态初始化,避免沿用上一台设备的在线状态。
if (previousDeviceId !== deviceId) {
updateOnline(false);
updateDeviceBattery(null);
}
await refreshHomeDeviceStatus();
};
onShow(async (options) => {
isHomePageVisible = true;
startHomeDeviceStatusPolling();
onShow(async () => {
const env = uni.getAccountInfoSync().miniProgram.envVersion;
const token = uni.getStorageSync(`${env}_token`);
// 检查是否从 OTA 更新页面返回
if (options && options.updateResult) {
otaState.value = options.updateResult;
if (options.updateResult === "update_success") {
otaInfo.value = {...otaInfo.value, needUpdate: false};
}
otaVisible.value = true;
} else if (token || user.value.id) {
if (token || user.value.id) {
await checkOtaUpdate();
}
@@ -538,8 +360,6 @@ onShow(async (options) => {
// devices.bindings[0].deviceId,
// devices.bindings[0].deviceName
// );
// const data = await getDeviceBatteryAPI();
// updateOnline(data.online);
// }
// } else {
// showModal.value = true;
@@ -579,13 +399,6 @@ onShow(async (options) => {
}
}
// 登录态或绑定设备可能在本次 onShow 中发生变化,按最新状态重建轮询。
startHomeDeviceStatusPolling();
});
onHide(() => {
isHomePageVisible = false;
stopHomeDeviceStatusPolling();
});
onMounted(async () => {
@@ -594,12 +407,6 @@ onMounted(async () => {
console.log("全局配置:", config);
});
onUnmounted(() => {
isHomePageVisible = false;
stopHomeDeviceStatusPolling();
invalidateOtaUpdateRun();
});
onShareAppMessage(() => {
return {
title: "智能真弓:实时捕捉+毫秒级同步,弓箭选手全球竞技!", // 分享卡片的标题
@@ -620,20 +427,42 @@ onShareTimeline(() => {
<template>
<Container :isHome="true" :showBackToGame="true">
<!-- OTA 升级弹窗使用 visible 控制显隐description 为副标题changelog 为详细说明 -->
<!-- 首页版本发现弹窗仅负责触发更新执行状态由三个页面共享 -->
<OtaModal
:visible="otaVisible"
:state="otaState"
:visible="otaVisible && !otaUpdating && !otaResultVisible"
state="new_version"
:version="otaInfo.versionNumber"
:progress="otaProgress"
:description="''"
:changelog="otaInfo.versionInfo"
:forceUpdate="otaInfo.forceUpdate"
@update="handleOtaUpdate"
@skip="handleOtaDismiss"
@close="handleOtaDismiss"
/>
<OtaModal
:visible="otaUpdating"
state="update_progress"
:progress="otaProgress"
:phase="otaPhase"
/>
<OtaModal
:visible="otaResultVisible && otaResultStatus === 'success'"
state="update_success"
@done="handleOtaDone"
/>
<OtaModal
:visible="otaResultVisible && otaResultStatus === 'failed'"
state="update_failure"
@retry="handleOtaRetry"
@close="closeOtaResult"
/>
<ModalDialog
:show="wifiRequiredVisible"
title="固件更新"
content="请在WiFi网络下更新"
confirmText="连接WiFi"
:showCancel="false"
:onConfirm="goWifiForOtaUpdate"
/>
<view class="container">
<view class="top-theme">
@@ -656,6 +485,27 @@ onShareTimeline(() => {
mode="scaleToFill"
/>
<image
v-if="deviceCardState === 'online'"
class="device-visual-platform-glow"
:src="deviceCardAsset.platform"
mode="scaleToFill"
/>
<DeviceOnlineEffects
v-if="deviceCardState === 'online'"
variant="home"
/>
<view
v-if="deviceCardState === 'online'"
class="device-visual-float-group"
>
<image
class="device-visual-bow device-visual-bow--online"
:src="deviceCardAsset.bow"
mode="scaleToFill"
/>
</view>
<image
v-else
class="device-visual-bow"
:src="deviceCardAsset.bow"
mode="scaleToFill"
@@ -667,7 +517,7 @@ onShareTimeline(() => {
>
<image
class="device-status-icon"
src="../static/home-device/device-state-dot--offline.png"
src="https://static.shelingxingqiu.com/shootmini/static/home-device/device-state-dot--offline.png"
mode="scaleToFill"
/>
<text>未连接</text>
@@ -680,20 +530,20 @@ onShareTimeline(() => {
<image
v-if="otaInfo.needUpdate"
class="device-status-refresh"
src="../static/home-device/device-state-refresh.png"
src="https://static.shelingxingqiu.com/shootmini/static/home-device/device-state-refresh.png"
mode="scaleToFill"
/>
<view class="device-battery-value">
<image
class="device-battery-frame"
src="../static/home-device/device-state-battery.png"
src="https://static.shelingxingqiu.com/shootmini/static/home-device/device-state-battery.png"
mode="scaleToFill"
/>
<text class="device-battery-text">{{ deviceBattery === null ? "--" : deviceBattery }}</text>
</view>
<image
class="device-status-icon device-status-icon--online"
src="../static/home-device/device-state-dot--online.png"
src="https://static.shelingxingqiu.com/shootmini/static/home-device/device-state-dot--online.png"
mode="scaleToFill"
/>
</view>
@@ -710,7 +560,7 @@ onShareTimeline(() => {
<image
v-if="deviceCardState === 'unbound'"
class="device-action-bind-icon"
src="../static/home-device/device-action-bind-icon.png"
src="https://static.shelingxingqiu.com/shootmini/static/home-device/device-action-bind-icon.png"
mode="scaleToFill"
/>
<text
@@ -768,15 +618,15 @@ onShareTimeline(() => {
: '#000',
}"
>
<image v-if="i === 1" src="../static/champ1.png"/>
<image v-if="i === 2" src="../static/champ2.png"/>
<image v-if="i === 3" src="../static/champ3.png"/>
<image v-if="i === 1" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"/>
<image v-if="i === 2" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"/>
<image v-if="i === 3" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"/>
<view v-if="i > 3">{{ i }}</view>
<image
:src="
scoreRankList[i - 1]
? (scoreRankList[i - 1].avatar || '../static/user-icon.png')
: '../static/user-icon-dark.png'
? (scoreRankList[i - 1].avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png')
: 'https://static.shelingxingqiu.com/shootmini/static/user-icon-dark.png'
"
mode="aspectFill"
/>
@@ -858,6 +708,8 @@ onShareTimeline(() => {
}
.device-visual-background,
.device-visual-platform-glow,
.device-visual-float-group,
.device-visual-bow {
display: flex;
position: absolute;
@@ -869,6 +721,26 @@ onShareTimeline(() => {
left: 0;
width: 100%;
height: 100%;
z-index: 0;
}
.device-visual-platform-glow {
left: 0;
bottom: 0;
z-index: 2;
width: 100%;
height: 100%;
transform-origin: center bottom;
animation: device-platform-glow 3.6s ease-in-out -1.1s infinite;
}
.device-visual-float-group {
top: 0;
left: 0;
z-index: 5;
width: 100%;
height: 388rpx;
animation: device-bow-float 3s ease-in-out infinite;
}
.device-visual-bow {
@@ -878,6 +750,30 @@ onShareTimeline(() => {
height: 388rpx;
}
.device-visual-bow--online {
z-index: 1;
}
@keyframes device-bow-float {
0%,
100% {
transform: translateY(0);
}
50% {
transform: translateY(-20rpx);
}
}
@keyframes device-platform-glow {
0%,
100% {
opacity: 0.92;
}
50% {
opacity: 1;
}
}
.device-status-badge,
.device-action-badge {
display: flex;
@@ -888,7 +784,7 @@ onShareTimeline(() => {
position: absolute;
top: 10rpx;
right: 14rpx;
z-index: 2;
z-index: 6;
height: 34rpx;
color: #ffffff;
font-family: Inter-Regular, sans-serif;
@@ -960,7 +856,7 @@ onShareTimeline(() => {
position: absolute;
bottom: 28rpx;
left: 50%;
z-index: 2;
z-index: 6;
width: 218rpx;
height: 56rpx;
justify-content: center;
+3 -3
View File
@@ -132,7 +132,7 @@ const checkBowData = (selected) => {
<text>大乱斗</text>
<view @click="checkBowData">
<text>查看靶纸</text>
<image src="../static/back.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view>
</view>
<PlayerScore2
@@ -155,7 +155,7 @@ const checkBowData = (selected) => {
<text>{{ round.ifGold ? "决金箭" : `${index + 1}` }}</text>
<view @click="() => checkBowData(index)">
<text>查看靶纸</text>
<image src="../static/back.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view>
</view>
<view
@@ -171,7 +171,7 @@ const checkBowData = (selected) => {
borderColor: '#64BAFF',
transform: `translateX(-${index * 15}px)`,
}"
:src="p.avatar || '../static/user-icon.png'"
:src="p.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
:key="index"
mode="widthFix"
/>
+2 -2
View File
@@ -81,7 +81,7 @@ onLoad(async (options) => {
>
<image
v-if="player.userId === currentUser.userId"
src="../static/player-bg2.png"
src="https://static.shelingxingqiu.com/shootmini/static/player-bg2.png"
:style="{
width: `${Math.max(100 / players.length, 18)}vw`,
}"
@@ -203,7 +203,7 @@ onLoad(async (options) => {
flex-wrap: wrap;
}
.score-item {
background-image: url("../static/score-bg.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
background-size: cover;
background-repeat: no-repeat;
background-position: center;
+18 -18
View File
@@ -31,15 +31,15 @@ const memberTypes = [
themeClass: "vip-page--normal",
heroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-title.png",
activeHeroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-title2.png",
orderIcon: "../../static/vip/vip-order.png",
heroBadge: "../../static/vip/normal-hero-badge.png",
orderIcon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-order.png",
heroBadge: "https://static.shelingxingqiu.com/shootmini/static/vip/normal-hero-badge.png",
buttonClass: "activate-btn--normal",
benefits: [
{ label: "黄金昵称", icon: "../../static/vip/vip-badge.png" },
{ label: "教练点评", icon: "../../static/vip/vip-comment.png" },
{ label: "专享VIP客服", icon: "../../static/vip/vip-service.png" },
{ label: "排位赛\n每日+20次", icon: "../../static/vip/vip-rank.png" },
{ label: "约战\n每日+20次", icon: "../../static/vip/vip-battle.png" },
{ label: "黄金昵称", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-badge.png" },
{ label: "教练点评", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-comment.png" },
{ label: "专享VIP客服", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-service.png" },
{ label: "排位赛\n每日+20次", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-rank.png" },
{ label: "约战\n每日+20次", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/vip-battle.png" },
],
},
{
@@ -52,18 +52,18 @@ const memberTypes = [
themeClass: "vip-page--super",
heroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-title.png",
activeHeroCard: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-title2.png",
orderIcon: "../../static/vip/svip-order.png",
heroBadge: "../../static/vip/super-hero-badge.png",
orderIcon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-order.png",
heroBadge: "https://static.shelingxingqiu.com/shootmini/static/vip/super-hero-badge.png",
buttonClass: "activate-btn--super",
benefits: [
{ label: "专属落点标识", icon: "../../static/vip/svip-point.png" },
{ label: "专属命中效果", icon: "../../static/vip/svip-hit.png" },
{ label: "专属射箭效果", icon: "../../static/vip/svip-arrow.png" },
{ label: "炫彩昵称", icon: "../../static/vip/svip-badge.png" },
{ label: "教练点评", icon: "../../static/vip/svip-comment.png" },
{ label: "约战无限制", icon: "../../static/vip/svip-battle.png" },
{ label: "排位赛无限制", icon: "../../static/vip/svip-rank.png" },
{ label: "专享SVIP客服", icon: "../../static/vip/svip-service.png" },
{ label: "专属落点标识", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-point.png" },
{ label: "专属命中效果", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-hit.png" },
{ label: "专属射箭效果", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-arrow.png" },
{ label: "炫彩昵称", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-badge.png" },
{ label: "教练点评", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-comment.png" },
{ label: "约战无限制", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-battle.png" },
{ label: "排位赛无限制", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-rank.png" },
{ label: "专享SVIP客服", icon: "https://static.shelingxingqiu.com/shootmini/static/vip/svip-service.png" },
],
},
];
@@ -446,7 +446,7 @@ onShow(loadVipConfig);
<text>套餐说明</text>
<image
class="package-header__icon"
src="../../static/enter.png"
src="https://static.shelingxingqiu.com/shootmini/static/enter.png"
mode="aspectFit"
/>
</view>
+1 -1
View File
@@ -31,7 +31,7 @@ import Container from "@/components/Container.vue";
<view class="table-wrap">
<view class="intro-toast">
<image class="intro-toast__bg" src="../../static/vip/intro-toast.png" mode="scaleToFill" />
<image class="intro-toast__bg" src="https://static.shelingxingqiu.com/shootmini/static/vip/intro-toast.png" mode="scaleToFill" />
<text class="intro-toast__text">初次绑定设备赠送6个月</text>
</view>
<view class="benefit-table">
+3 -3
View File
@@ -116,7 +116,7 @@ onLoad((options) => {
<view class="contest-header">
<text>{{ getName(item) }}</text>
<text>{{ item.createTime }}</text>
<image src="../static/back.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view>
<BattleHeader
:players="item.teams[0] ? item.teams[0].players : []"
@@ -139,7 +139,7 @@ onLoad((options) => {
<view class="contest-header">
<text>{{ getName(item) }}</text>
<text>{{ item.createTime }}</text>
<image src="../static/back.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view>
<BattleHeader
:players="item.teams[0] ? item.teams[0].players : []"
@@ -164,7 +164,7 @@ onLoad((options) => {
>{{ item.trainingTypeText }}
{{ formatPractiseTime(item.createTime) }}</text
>
<image src="../static/back.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view>
</ScrollList>
</swiper-item>
+2 -2
View File
@@ -130,7 +130,7 @@ onLoad((options) => {
<view v-else-if="status === 'login'" class="state login-state">
<image
class="login-icon"
src="../static/org-bind/login-icon.png"
src="https://static.shelingxingqiu.com/shootmini/static/org-bind/login-icon.png"
mode="aspectFit"
/>
<text class="login-title">{{
@@ -151,7 +151,7 @@ onLoad((options) => {
/>
<image
class="success-badge"
src="../static/org-bind/green-gou.png"
src="https://static.shelingxingqiu.com/shootmini/static/org-bind/green-gou.png"
mode="aspectFit"
/>
</view>
+3 -3
View File
@@ -115,7 +115,7 @@ const targetTypeName = computed(() => {
/>
<view class="header">
<image
:src="record.user.avatar || '../static/user-icon.png'"
:src="record.user.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix"
class="avatar"
/>
@@ -136,7 +136,7 @@ const targetTypeName = computed(() => {
>
<text>落点稳定性</text>
<image
src="../static/s-question-mark.png"
src="https://static.shelingxingqiu.com/shootmini/static/s-question-mark.png"
mode="widthFix"
class="question-mark"
/>
@@ -165,7 +165,7 @@ const targetTypeName = computed(() => {
<text>落点分布</text>
<!-- <button hover-class="none" @click="() => openTip(2)">
<image
src="../static/s-question-mark.png"
src="https://static.shelingxingqiu.com/shootmini/static/s-question-mark.png"
mode="widthFix"
class="question-mark"
/>
+3 -3
View File
@@ -203,7 +203,7 @@ onShareTimeline(async () => {
>
<text>落点稳定性</text>
<image
src="../static/s-question-mark.png"
src="https://static.shelingxingqiu.com/shootmini/static/s-question-mark.png"
mode="widthFix"
class="question-mark"
/>
@@ -232,7 +232,7 @@ onShareTimeline(async () => {
v-if="user.id === record.user.id"
>
<image
:src="`../static/${notes ? 'has' : 'add'}-note.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/${notes ? 'has' : 'add'}-note.png`"
mode="widthFix"
/>
<text>{{ notes ? "我的备注" : "添加备注" }}</text>
@@ -243,7 +243,7 @@ onShareTimeline(async () => {
<text>落点分布</text>
<!-- <button hover-class="none" @click="() => openTip(2)">
<image
src="../static/s-question-mark.png"
src="https://static.shelingxingqiu.com/shootmini/static/s-question-mark.png"
mode="widthFix"
class="question-mark"
/>
+1 -1
View File
@@ -146,7 +146,7 @@ onLoad((options) => {
<text> {{ currentGroup }} </text>
</view>
<view @click="deleteArrow">
<image src="../static/delete.png" />
<image src="https://static.shelingxingqiu.com/shootmini/static/delete.png" />
<text>删除</text>
</view>
</view>
+8 -8
View File
@@ -97,19 +97,19 @@ onShow(() => {
<text :style="{ color: bowType.name ? '#000' : '#999' }">{{
bowType.name || "请选择"
}}</text>
<image src="../static/arrow-grey.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/arrow-grey.png" mode="widthFix" />
</view>
<view @click="() => openSelector(1)">
<text :style="{ color: distance ? '#000' : '#999' }">{{
distance ? distance + " 米" : "请选择"
}}</text>
<image src="../static/arrow-grey.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/arrow-grey.png" mode="widthFix" />
</view>
<view @click="() => openSelector(2)">
<text :style="{ color: bowtargetType.name ? '#000' : '#999' }">{{
bowtargetType.name || "请选择"
}}</text>
<image src="../static/arrow-grey.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/arrow-grey.png" mode="widthFix" />
</view>
</view>
<view class="point-records">
@@ -121,7 +121,7 @@ onShow(() => {
<view class="swipe-right" @click="onRemoveDraft">
<image
class="swipe-icon"
src="../static/delete-white.png"
src="https://static.shelingxingqiu.com/shootmini/static/delete-white.png"
mode="widthFix"
/>
</view>
@@ -131,11 +131,11 @@ onShow(() => {
<text>{{ pointDraft.distance }}</text>
<text>{{ pointDraft.bowtargetType.name }}</text>
<view>
<image src="../static/draft-icon.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/draft-icon.png" mode="widthFix" />
<text>本地草稿</text>
<view>
<text>计分待完成</text>
<image src="../static/back.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view>
</view>
</view>
@@ -148,7 +148,7 @@ onShow(() => {
<view class="swipe-right" @click="onRemoveRecord(item)">
<image
class="swipe-icon"
src="../static/delete-white.png"
src="https://static.shelingxingqiu.com/shootmini/static/delete-white.png"
mode="widthFix"
/>
</view>
@@ -172,7 +172,7 @@ onShow(() => {
>
<view class="selector">
<button hover-class="none" @click="() => (showModal = false)">
<image src="../static/close-grey.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-grey.png" mode="widthFix" />
</button>
<EditOption
v-show="selectorIndex === 0"
+1 -1
View File
@@ -78,7 +78,7 @@ onMounted(async () => {
@click="shareImage"
v-if="user.id"
>
<image src="../static/share-icon.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/share-icon.png" mode="widthFix" />
</button>
<canvas
class="share-canvas"
+13 -13
View File
@@ -215,12 +215,12 @@ onShareTimeline(() => {
<view class="container">
<view class="daily-signin">
<view>
<image src="../static/week-check.png" />
<image src="https://static.shelingxingqiu.com/shootmini/static/week-check.png" />
</view>
<view :class="data.weeksCheckIn[0] ? 'checked' : ''">
<image
v-if="data.weeksCheckIn[0]"
src="../static/checked-green2.png"
src="https://static.shelingxingqiu.com/shootmini/static/checked-green2.png"
mode="widthFix"
/>
<view v-else></view>
@@ -229,7 +229,7 @@ onShareTimeline(() => {
<view :class="data.weeksCheckIn[1] ? 'checked' : ''">
<image
v-if="data.weeksCheckIn[1]"
src="../static/checked-green2.png"
src="https://static.shelingxingqiu.com/shootmini/static/checked-green2.png"
mode="widthFix"
/>
<view v-else></view>
@@ -238,7 +238,7 @@ onShareTimeline(() => {
<view :class="data.weeksCheckIn[2] ? 'checked' : ''">
<image
v-if="data.weeksCheckIn[2]"
src="../static/checked-green2.png"
src="https://static.shelingxingqiu.com/shootmini/static/checked-green2.png"
mode="widthFix"
/>
<view v-else></view>
@@ -247,7 +247,7 @@ onShareTimeline(() => {
<view :class="data.weeksCheckIn[3] ? 'checked' : ''">
<image
v-if="data.weeksCheckIn[3]"
src="../static/checked-green2.png"
src="https://static.shelingxingqiu.com/shootmini/static/checked-green2.png"
mode="widthFix"
/>
<view v-else></view>
@@ -256,7 +256,7 @@ onShareTimeline(() => {
<view :class="data.weeksCheckIn[4] ? 'checked' : ''">
<image
v-if="data.weeksCheckIn[4]"
src="../static/checked-green2.png"
src="https://static.shelingxingqiu.com/shootmini/static/checked-green2.png"
mode="widthFix"
/>
<view v-else></view>
@@ -265,7 +265,7 @@ onShareTimeline(() => {
<view :class="data.weeksCheckIn[5] ? 'checked' : ''">
<image
v-if="data.weeksCheckIn[5]"
src="../static/checked-green2.png"
src="https://static.shelingxingqiu.com/shootmini/static/checked-green2.png"
mode="widthFix"
/>
<view v-else></view>
@@ -274,7 +274,7 @@ onShareTimeline(() => {
<view :class="data.weeksCheckIn[6] ? 'checked' : ''">
<image
v-if="data.weeksCheckIn[6]"
src="../static/checked-green2.png"
src="https://static.shelingxingqiu.com/shootmini/static/checked-green2.png"
mode="widthFix"
/>
<view v-else></view>
@@ -330,16 +330,16 @@ onShareTimeline(() => {
</view>
<view>
<button hover-class="none" @click="$clickSound(toRecordPage)" class="image-btn">
<image src="../static/record-btn.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/record-btn.png" mode="widthFix" />
</button>
<button hover-class="none" @click="$clickSound(startScoring)" class="image-btn">
<image src="../static/start-scoring.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/start-scoring.png" mode="widthFix" />
</button>
</view>
</view>
</view>
<view class="title" :style="{ marginBottom: 0 }">
<image src="../static/point-book-title1.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/point-book-title1.png" mode="widthFix" />
</view>
<image
src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrpyf4exh4rhd.png"
@@ -379,7 +379,7 @@ onShareTimeline(() => {
</view>
<RingBarChart :data="data.ringRate" v-if="user.id" />
<view class="title" v-if="user.id">
<image src="../static/point-book-title2.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/point-book-title2.png" mode="widthFix" />
</view>
<view class="top-list">
<view class="rank-title-bar">
@@ -397,7 +397,7 @@ onShareTimeline(() => {
:style="{ marginBottom: isIOS ? '10rpx' : 0 }"
>
<text>查看完整榜单</text>
<image src="../static/enter-arrow-blue.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/enter-arrow-blue.png" mode="widthFix" />
</view>
</view>
<Signin
+7 -7
View File
@@ -356,7 +356,7 @@ const measureTabsMetrics = () => {
mode="widthFix"
/>
<navigator open-type="navigateBack">
<image class="header-back" src="../static/back.png" mode="widthFix" />
<image class="header-back" src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</navigator>
<text :style="{ opacity: addBg ? 1 : 0 }">本赛季排行榜</text>
</view>
@@ -415,37 +415,37 @@ const measureTabsMetrics = () => {
<image
v-if="index === 0"
class="player-bg"
src="../static/melee-player-bg1.png"
src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg1.png"
mode="aspectFill"
/>
<image
v-if="index === 1"
class="player-bg"
src="../static/melee-player-bg2.png"
src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg2.png"
mode="aspectFill"
/>
<image
v-if="index === 2"
class="player-bg"
src="../static/melee-player-bg3.png"
src="https://static.shelingxingqiu.com/shootmini/static/melee-player-bg3.png"
mode="aspectFill"
/>
<image
v-if="index === 0"
class="player-crown"
src="../static/champ1.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix"
/>
<image
v-if="index === 1"
class="player-crown"
src="../static/champ2.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix"
/>
<image
v-if="index === 2"
class="player-crown"
src="../static/champ3.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix"
/>
<view v-if="index > 2" class="view-crown">
+21 -21
View File
@@ -331,27 +331,27 @@ onShow(async () => {
<image class="star" src="https://static.shelingxingqiu.com/shootmini/static/rank/star.png" mode="widthFix" />
</view>
<image
src="../static/rank/battle1v1.svg"
src="https://static.shelingxingqiu.com/shootmini/static/rank/battle1v1.svg"
mode="widthFix"
@click.stop="$clickSound(() => toMatchPage(1, 2))"
/>
<image
src="../static/rank/battle2v2.svg"
src="https://static.shelingxingqiu.com/shootmini/static/rank/battle2v2.svg"
mode="widthFix"
@click.stop="$clickSound(() => toMatchPage(2, 4))"
/>
<image
src="../static/rank/battle3v3.svg"
src="https://static.shelingxingqiu.com/shootmini/static/rank/battle3v3.svg"
mode="widthFix"
@click.stop="$clickSound(() => toMatchPage(3, 6))"
/>
<image
src="../static/rank/battle5.svg"
src="https://static.shelingxingqiu.com/shootmini/static/rank/battle5.svg"
mode="widthFix"
@click.stop="$clickSound(() => toMatchPage(4, 5))"
/>
<image
src="../static/rank/battle10.svg"
src="https://static.shelingxingqiu.com/shootmini/static/rank/battle10.svg"
mode="widthFix"
@click.stop="$clickSound(() => toMatchPage(5, 10))"
/>
@@ -390,7 +390,7 @@ onShow(async () => {
<image
class="triangle-icon"
v-show="seasonData.length > 1"
src="../static/rank/triangle.png"
src="https://static.shelingxingqiu.com/shootmini/static/rank/triangle.png"
mode="widthFix"
/>
<view class="season-list" v-if="showSeasonList">
@@ -410,7 +410,7 @@ onShow(async () => {
</text>
<image
v-if="item.seasonName === seasonName"
src="../static/rank/triangle.png"
src="https://static.shelingxingqiu.com/shootmini/static/rank/triangle.png"
mode="widthFix"
/>
</view>
@@ -437,7 +437,7 @@ onShow(async () => {
</text>
</view>
<view class="my-rank-score">
<image src="../static/rank/bubble-tip.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/rank/bubble-tip.png" mode="widthFix" />
<text>积分{{ seasonStats.score }}</text>
</view>
</view>
@@ -500,7 +500,7 @@ onShow(async () => {
查看我的比赛记录
<image
style="width: 30rpx; vertical-align: -2px"
src="../static/enter.png"
src="https://static.shelingxingqiu.com/shootmini/static/enter.png"
mode="widthFix"
/>
</view>
@@ -531,12 +531,12 @@ onShow(async () => {
:style="{ backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent' }"
class="rank-item"
>
<image v-if="index === 0" src="../static/champ1.png" mode="widthFix" />
<image v-if="index === 1" src="../static/champ2.png" mode="widthFix" />
<image v-if="index === 2" src="../static/champ3.png" mode="widthFix" />
<image v-if="index === 0" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png" mode="widthFix" />
<image v-if="index === 1" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png" mode="widthFix" />
<image v-if="index === 2" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png" mode="widthFix" />
<view v-if="index > 2">{{ index + 1 }}</view>
<image
:src="item.avatar || '../static/user-icon.png'"
:src="item.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix"
:style="{ borderColor: index < 3 ? topThreeColors[index] : '' }"
/>
@@ -560,12 +560,12 @@ onShow(async () => {
:style="{ backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent' }"
class="rank-item"
>
<image v-if="index === 0" src="../static/champ1.png" mode="widthFix" />
<image v-if="index === 1" src="../static/champ2.png" mode="widthFix" />
<image v-if="index === 2" src="../static/champ3.png" mode="widthFix" />
<image v-if="index === 0" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png" mode="widthFix" />
<image v-if="index === 1" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png" mode="widthFix" />
<image v-if="index === 2" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png" mode="widthFix" />
<view v-if="index > 2">{{ index + 1 }}</view>
<image
:src="item.avatar || '../static/user-icon.png'"
:src="item.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix"
:style="{ borderColor: index < 3 ? topThreeColors[index] : '' }"
/>
@@ -589,12 +589,12 @@ onShow(async () => {
:style="{ backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent' }"
class="rank-item"
>
<image v-if="index === 0" src="../static/champ1.png" mode="widthFix" />
<image v-if="index === 1" src="../static/champ2.png" mode="widthFix" />
<image v-if="index === 2" src="../static/champ3.png" mode="widthFix" />
<image v-if="index === 0" src="https://static.shelingxingqiu.com/shootmini/static/champ1.png" mode="widthFix" />
<image v-if="index === 1" src="https://static.shelingxingqiu.com/shootmini/static/champ2.png" mode="widthFix" />
<image v-if="index === 2" src="https://static.shelingxingqiu.com/shootmini/static/champ3.png" mode="widthFix" />
<view v-if="index > 2">{{ index + 1 }}</view>
<image
:src="item.avatar || '../static/user-icon.png'"
:src="item.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix"
:style="{ borderColor: index < 3 ? topThreeColors[index] : '' }"
/>
+4 -4
View File
@@ -59,25 +59,25 @@ watch(
/>
<image
v-if="rank === 1"
src="../../../static/champ1.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ1.png"
mode="widthFix"
class="avatar-rank"
/>
<image
v-if="rank === 2"
src="../../../static/champ2.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ2.png"
mode="widthFix"
class="avatar-rank"
/>
<image
v-if="rank === 3"
src="../../../static/champ3.png"
src="https://static.shelingxingqiu.com/shootmini/static/champ3.png"
mode="widthFix"
class="avatar-rank"
/>
<view v-if="rank > 3" class="rank-view">{{ rank }}</view>
<image
:src="src || '../../../static/user-icon.png'"
:src="src || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'"
mode="widthFix"
:style="{
width: size + 'px',
@@ -104,7 +104,7 @@ onBeforeUnmount(() => {
<block v-else-if="game.roomID">
<text>返回房间</text>
</block>
<image src="../../../static/back.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
</view>
</template>
@@ -72,7 +72,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</view>
<image
v-if="winner === 1"
src="../../../static/winner-badge.png"
src="https://static.shelingxingqiu.com/shootmini/static/winner-badge.png"
mode="widthFix"
class="left-winner-badge"
/>
@@ -100,7 +100,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
</view>
<image
v-if="winner === 2"
src="../../../static/winner-badge.png"
src="https://static.shelingxingqiu.com/shootmini/static/winner-badge.png"
mode="widthFix"
class="right-winner-badge"
/>
+6 -35
View File
@@ -1,44 +1,15 @@
<script setup>
import { ref, onMounted, onBeforeUnmount } from "vue";
import { getDeviceBatteryAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const power = ref(0);
const timer = ref(null);
let disposed = false;
let requestInFlight = false;
const refreshPower = async () => {
if (disposed || requestInFlight) return;
requestInFlight = true;
try {
const data = await getDeviceBatteryAPI();
if (!disposed) power.value = data.battery;
} catch (_) {
// Promise
} finally {
requestInFlight = false;
}
};
onMounted(async () => {
await refreshPower();
if (disposed) return;
timer.value = setInterval(() => {
void refreshPower();
}, 1000 * 10);
});
onBeforeUnmount(() => {
disposed = true;
clearInterval(timer.value);
timer.value = null;
});
const store = useStore();
const { deviceBattery: power } = storeToRefs(store);
</script>
<template>
<view class="container">
<image src="../../../static/b-power.png" mode="widthFix" />
<view>电量{{ power || 1 }}%</view>
<image src="https://static.shelingxingqiu.com/shootmini/static/b-power.png" mode="widthFix" />
<view>{{ power === null ? "电量--" : `电量${power}%` }}</view>
</view>
</template>
@@ -523,7 +523,7 @@ onBeforeUnmount(() => {
<view :class="['target', { 'target--shake': targetShaking }]">
<view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
<view :style="{ background: circleColor }">
<image src="../../../static/dot-circle.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/dot-circle.png" mode="widthFix" />
</view>
</view>
<view v-if="stop" class="stop-sign">中场休息</view>
@@ -568,7 +568,7 @@ onBeforeUnmount(() => {
!shouldHideRedHit(index)
"
class="svip-hit-bg"
src="../../../static/vip/svip-xuan.png"
src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(bow)"
mode="aspectFit"
/>
@@ -593,7 +593,7 @@ onBeforeUnmount(() => {
!shouldHideBlueHit(index)
"
class="svip-hit-bg"
src="../../../static/vip/svip-xuan.png"
src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(bow)"
mode="aspectFit"
/>
+2 -2
View File
@@ -10,8 +10,8 @@ defineProps({
},
});
const bubbleTypes = [
"../../../static/long-bubble.png",
"../../../static/long-bubble-middle.png",
"https://static.shelingxingqiu.com/shootmini/static/long-bubble.png",
"https://static.shelingxingqiu.com/shootmini/static/long-bubble-middle.png",
"https://static.shelingxingqiu.com/shootmini/static/long-bubble-tall.png",
];
</script>
+5 -5
View File
@@ -108,10 +108,10 @@ onBeforeUnmount(() => {
<template>
<view class="container">
<view class="back-btn" @click="onClick">
<image v-if="whiteBackArrow" src="../../../static/back.png" mode="widthFix" />
<image v-if="whiteBackArrow" src="https://static.shelingxingqiu.com/shootmini/static/back.png" mode="widthFix" />
<image
v-if="!whiteBackArrow"
src="../../../static/back-black.png"
src="https://static.shelingxingqiu.com/shootmini/static/back-black.png"
mode="widthFix"
/>
</view>
@@ -131,12 +131,12 @@ onBeforeUnmount(() => {
<text class="truncate">{{ user.nickName }}</text>
<image
v-if="heat"
:src="`../../../static/hot${heat}.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/hot${heat}.png`"
mode="widthFix"
/>
</block>
<block v-else>
<image src="../../../static/user-icon.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/user-icon.png" mode="widthFix" />
<text>新来的弓箭手你好呀~</text>
</block>
</view>
@@ -203,7 +203,7 @@ onBeforeUnmount(() => {
:style="battleRoomBtnStyle"
>
<text class="battle-room-number__text">房号: {{ game.roomNumber }}</text>
<image src="../../../static/share2.png" mode="widthFix" class="battle-room-number__icon" />
<image src="https://static.shelingxingqiu.com/shootmini/static/share2.png" mode="widthFix" class="battle-room-number__icon" />
</button>
</view>
</template>
@@ -56,7 +56,7 @@ onBeforeUnmount(() => {
<text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text>
<text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text>
<button v-if="!!tips" hover-class="none" @click="updateSound">
<image :src="`../../../static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" />
<image :src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" />
</button>
</view>
</template>
+1 -1
View File
@@ -69,7 +69,7 @@ const onBtnClick = debounce(async () => {
<slot />
</block>
<block v-else>
<image src="../../../static/btn-loading.png" mode="widthFix" class="loading" />
<image src="https://static.shelingxingqiu.com/shootmini/static/btn-loading.png" mode="widthFix" class="loading" />
</block>
</button>
</template>
+1 -1
View File
@@ -60,7 +60,7 @@ watch(
mode="widthFix"
/>
<view class="close-btn" @click="onClose" v-if="!noBg">
<image src="../../../static/close-yellow.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-yellow.png" mode="widthFix" />
</view>
<slot></slot>
</view>
@@ -49,7 +49,7 @@ const getContentHeight = () => {
</view>
<IconButton
v-if="!!onClose"
src="../../../static/close-gold-outline.png"
src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
:width="30"
:onClick="onClose"
/>
@@ -80,7 +80,7 @@ watch(
<template>
<view class="container">
<image
:src="isRed ? '../../../static/flag-red.png' : '../../../static/flag-blue.png'"
:src="isRed ? 'https://static.shelingxingqiu.com/shootmini/static/flag-red.png' : 'https://static.shelingxingqiu.com/shootmini/static/flag-blue.png'"
class="flag"
:style="{
[isRed ? 'left' : 'right']: '10rpx',
@@ -101,7 +101,7 @@ watch(
[isRed ? 'left' : 'right']: getPos(item.id) + 'rpx',
}"
>
<image :src="item.avatar || '../../../static/user-icon.png'" mode="widthFix" />
<image :src="item.avatar || 'https://static.shelingxingqiu.com/shootmini/static/user-icon.png'" mode="widthFix" />
<text
v-if="isFirst(item.id)"
:style="{ backgroundColor: isRed ? '#ff6060' : '#5fadff' }"
+1 -1
View File
@@ -151,7 +151,7 @@ const onClickTab = (index) => {
min-width: 26%;
}
.score-item {
background-image: url("../../static/score-bg.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
background-size: cover;
background-repeat: no-repeat;
background-position: center;
+1 -1
View File
@@ -141,7 +141,7 @@ const onClickTab = (index) => {
min-width: 26%;
}
.score-item {
background-image: url("../static/score-bg.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/score-bg.png");
background-size: cover;
background-repeat: no-repeat;
background-position: center;
+1 -1
View File
@@ -59,7 +59,7 @@ const props = defineProps({
</view>
</view>
<view @click="onClose">
<image src="/static/close-white.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/close-white.png" mode="widthFix" />
</view>
</view>
<view :style="{ width: '100%', marginBottom: '20px' }">
+1 -1
View File
@@ -604,7 +604,7 @@ onBeforeUnmount(() => {
!shouldHideLatestHit(entry.index)
"
class="svip-hit-bg"
src="../../../static/vip/svip-xuan.png"
src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-xuan.png"
:style="getSvipHitBgStyle(entry.shot)"
mode="aspectFit"
/>
+4 -4
View File
@@ -29,14 +29,14 @@ const props = defineProps({
font-size: 24rpx;
}
.normal {
background-image: url("../static/bubble-tip.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip.png");
width: 157rpx;
height: 105rpx;
padding-top: 10px;
padding-left: 30rpx;
}
.normal2 {
background-image: url("../static/bubble-tip4.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip4.png");
width: 190rpx;
height: 105rpx;
padding-top: 10px;
@@ -46,14 +46,14 @@ const props = defineProps({
z-index: 1;
}
.long {
background-image: url("../static/bubble-tip2.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip2.png");
width: 370rpx;
height: 70rpx;
top: -50%;
left: 49%;
}
.short {
background-image: url("../static/bubble-tip3.png");
background-image: url("https://static.shelingxingqiu.com/shootmini/static/bubble-tip3.png");
width: 300rpx;
height: 70rpx;
top: -50%;
+2 -2
View File
@@ -28,8 +28,8 @@ const props = defineProps({
});
const items = ref(new Array(props.total).fill(9));
const bgImages = [
"../static/complete-light1.png",
"../static/complete-light2.png",
"https://static.shelingxingqiu.com/shootmini/static/complete-light1.png",
"https://static.shelingxingqiu.com/shootmini/static/complete-light2.png",
];
const getDisplayText = (arrow) => {
if (!arrow) return "-";
@@ -239,7 +239,7 @@ const displayName = computed(() => {
});
const avatarSrc = computed(() => {
return user.value?.avatar || "/static/shooter2.png";
return user.value?.avatar || "https://static.shelingxingqiu.com/shootmini/static/shooter2.png";
});
watch(
@@ -638,7 +638,7 @@ onBeforeUnmount(() => {
<!-- <button class="progress-card__sound" hover-class="none" @click="updateSound">
<image
class="progress-card__sound-icon"
:src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`"
mode="aspectFit"
/>
</button> -->
@@ -162,7 +162,7 @@ onBeforeUnmount(() => {
</view>
</view>
<view v-if="isBattle" class="ready-timer">
<image src="../../../static/test-tip.png" mode="widthFix" />
<image src="https://static.shelingxingqiu.com/shootmini/static/test-tip.png" mode="widthFix" />
<view v-if="count >= 0">
<text>距离正式比赛还有</text>
<text>{{ count }}</text>
+1 -1
View File
@@ -1844,7 +1844,7 @@ onBeforeUnmount(() => {
<button class="sound-btn" hover-class="none" @click="updateSound">
<image
class="sound-icon"
:src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
:src="`https://static.shelingxingqiu.com/shootmini/static/sound${sound ? '' : '-off'}-yellow.png`"
mode="aspectFit"
/>
</button>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 519 B

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 KiB

After

Width:  |  Height:  |  Size: 162 KiB

Some files were not shown because too many files have changed in this diff Show More