fix: debug 分享卡片生成问题
This commit is contained in:
@@ -28,6 +28,17 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
|
||||
const [shareImageUrl, setShareImageUrl] = useState("");
|
||||
const { fetchUserInfo } = useUserActions();
|
||||
|
||||
async function ensureUserInfo() {
|
||||
if (userInfo?.avatar_url && userInfo?.nickname) {
|
||||
return userInfo;
|
||||
}
|
||||
const fetchedUserInfo = await fetchUserInfo();
|
||||
return {
|
||||
avatar_url: fetchedUserInfo?.avatar_url || userInfo?.avatar_url || "",
|
||||
nickname: fetchedUserInfo?.nickname || userInfo?.nickname || "",
|
||||
};
|
||||
}
|
||||
|
||||
const publishFlag = from === "publish";
|
||||
// const posterRef = useRef();
|
||||
const { max_participants, participant_count } = detail || {};
|
||||
@@ -86,10 +97,11 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
|
||||
const endTime = dayjs(end_time);
|
||||
const dayofWeek = DayOfWeekMap.get(startTime.day());
|
||||
const gameLength = `${endTime.diff(startTime, "hour")}小时`;
|
||||
console.log(userInfo, "userInfo");
|
||||
const currentUserInfo = await ensureUserInfo();
|
||||
try {
|
||||
const url = await generateShareImage({
|
||||
userAvatar: userInfo.avatar_url,
|
||||
userNickname: userInfo.nickname,
|
||||
userAvatar: currentUserInfo.avatar_url,
|
||||
userNickname: currentUserInfo.nickname,
|
||||
gameType: play_type,
|
||||
skillLevel: `NTRP ${genNTRPRequirementText(
|
||||
skill_level_min,
|
||||
@@ -100,11 +112,19 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
|
||||
venueName: location_name,
|
||||
venueImages: image_list ? image_list : [],
|
||||
});
|
||||
if (!url) {
|
||||
throw new Error("生成分享图片失败,URL 为空");
|
||||
}
|
||||
return url;
|
||||
} catch (e) {
|
||||
console.error("生成分享卡片失败", e);
|
||||
return `${OSS_BASE}/system/game_dou_di_tu.png`;
|
||||
}
|
||||
}
|
||||
|
||||
useShareAppMessage(async (res) => {
|
||||
await changeMessageType();
|
||||
await ensureUserInfo();
|
||||
const url = await generateShareImageUrl();
|
||||
// console.log(res, "res");
|
||||
return {
|
||||
@@ -128,8 +148,8 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
|
||||
} = detail || {};
|
||||
// 先等待静默登录完成
|
||||
await waitForAuthInit();
|
||||
const userInfo = await fetchUserInfo();
|
||||
const { avatar_url, nickname } = userInfo;
|
||||
const currentUserInfo = await ensureUserInfo();
|
||||
const { avatar_url, nickname } = currentUserInfo;
|
||||
const startTime = dayjs(start_time);
|
||||
const endTime = dayjs(end_time);
|
||||
const dayofWeek = DayOfWeekMap.get(startTime.day());
|
||||
|
||||
@@ -106,6 +106,12 @@ const drawLabel = (ctx: any, x: number, y: number, width: number, height: number
|
||||
ctx.restore()
|
||||
}
|
||||
|
||||
/** 给图片 URL 加随机参数,避免同一链接二次加载不触发 onload */
|
||||
function with_cache_bust(url: string): string {
|
||||
const sep = url.includes('?') ? '&' : '?';
|
||||
return `${url}${sep}_t=${Date.now()}_${Math.random().toString(36).slice(2)}`;
|
||||
}
|
||||
|
||||
// 工具函数 - OffscreenCanvas 下加载图片(使用 offscreen.createImage)
|
||||
const loadImage = (src: string): Promise<any> => {
|
||||
return new Promise((resolve, reject) => {
|
||||
@@ -117,7 +123,7 @@ const loadImage = (src: string): Promise<any> => {
|
||||
const img = off.createImage()
|
||||
img.onload = () => resolve(img)
|
||||
img.onerror = reject
|
||||
img.src = src
|
||||
img.src = with_cache_bust(src)
|
||||
} catch (e) {
|
||||
reject(e)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user