Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-01 10:20:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/14159

Browse source
This commit is contained in:
Vanessa 2025-03-19 19:44:17 +08:00
parent 1cd7febe63
commit 4d6c9ea446
6 changed files with 39 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/mobile/index.ts
View file

@ -28,7 +28,7 @@ import {isNotEditBlock} from "../protyle/wysiwyg/getBlock";
import {updateCardHV} from "../card/util";
import {mobileKeydown} from "./util/keydown";
import {correctHotkey} from "../boot/globalEvent/commonHotkey";
import {IOSPurchase} from "../util/iOSPurchase";
import {processIOSPurchaseResponse} from "../util/iOSPurchase";
class App {
public plugins: import("../plugin").Plugin[] = [];
@ -163,7 +163,7 @@ window.reconnectWebSocket = () => {
window.siyuan.mobile.popEditor.protyle.ws.send("ping", {});
};
window.goBack = goBack;
window.IOSPurchase = IOSPurchase;
window.processIOSPurchaseResponse = processIOSPurchaseResponse;
window.showKeyboardToolbar = (height) => {
document.getElementById("keyboardToolbar").setAttribute("data-keyboardheight", (height ? height : window.outerHeight / 2 - 42).toString());
showKeyboardToolbar();

28
app/src/mobile/settings/account.ts
View file

@ -10,7 +10,7 @@ import {getCloudURL, getIndexURL} from "../../config/util/about";
import {Dialog} from "../../dialog";
import {hideElements} from "../../protyle/ui/hideElements";
import {Constants} from "../../constants";
import {genUUID} from "../../util/genID";
import {iOSPurchase} from "../../util/iOSPurchase";
export const showAccountInfo = () => {
const isIOS = isInIOS();
@ -129,31 +129,7 @@ ${renewHTML}`;
}
while (target && !target.isSameNode(modelMainElement)) {
if (target.getAttribute("data-action") === "iOSPay") {
if (window.siyuan.user) {
fetchPost("/api/setting/getCloudUser", {
token: window.siyuan.user.userToken,
}, response => {
if (window.siyuan.user.userSiYuanOneTimePayStatus !== response.data.userSiYuanOneTimePayStatus ||
window.siyuan.user.userSiYuanProExpireTime !== response.data.userSiYuanProExpireTime ||
window.siyuan.user.userSiYuanSubscriptionPlan !== response.data.userSiYuanSubscriptionPlan ||
window.siyuan.user.userSiYuanSubscriptionType !== response.data.userSiYuanSubscriptionType ||
window.siyuan.user.userSiYuanSubscriptionStatus !== response.data.userSiYuanSubscriptionStatus) {
showMessage(window.siyuan.languages["_kernel"][19]);
return;
}
window.siyuan.user = response.data;
const productType = target.getAttribute("data-type");
let productID;
if (window.siyuan.config.cloudRegion === 0) {
productID = productType === "function" ? "0" : "1";
} else {
productID = productType === "function" ? "2" : "3";
}
window.webkit.messageHandlers.purchase.postMessage(`${productID} ${genUUID().substring(0, 19)}${window.siyuan.config.cloudRegion}00${window.siyuan.user.userId.substring(0, 1)}-${window.siyuan.user.userId.substring(1)}`);
});
} else {
showMessage(window.siyuan.languages.needLogin);
}
iOSPurchase(target.getAttribute("data-type"));
event.preventDefault();
event.stopPropagation();
break;