diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 1628be966..e3a018092 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1388,6 +1388,7 @@ "218": "Too many snapshots of the data repo have been detected, which slows down program startup and data sync. Please consider executing [Settings - About - Data repo purge]", "219": "The cloud storage service is unavailable, please try again later", "220": "Due to a defect in the previous version, the cloud data is corrupted. Please refer to the User Guide-FAQ-Lost Key steps to reset the local data repo and cloud directory", - "221": "The replacement operation is not supported after grouping by document. Please use ungrouping and then replace" + "221": "The replacement operation is not supported after grouping by document. Please use ungrouping and then replace", + "222": "Data sync is in progress, please wait until data sync is completed and try again" } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 697c7a8cc..296fc397c 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1388,6 +1388,7 @@ "218": "Se han detectado demasiadas instantáneas del repositorio de datos, lo que ralentiza el inicio del programa y la sincronización de datos. Considere ejecutar [Configuración - Acerca de - Purga del repositorio de datos]", "219": "El servicio de almacenamiento en la nube no está disponible, inténtalo de nuevo más tarde", "220": "Debido a un defecto en la versión anterior, los datos de la nube están dañados. Consulte los pasos de la User Guide-FAQ-Lost Key para restablecer el repositorio de datos local y el directorio de la nube", - "221": "La operación de reemplazo no es compatible después de agrupar por documento. Utilice desagrupar y luego reemplazar" + "221": "La operación de reemplazo no es compatible después de agrupar por documento. Utilice desagrupar y luego reemplazar", + "222": "La sincronización de datos está en curso. Espere hasta que se complete la sincronización de datos e inténtelo de nuevo" } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index e2e75d275..79560cebc 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1388,6 +1388,7 @@ "218": "Trop d'instantanés du référentiel de données ont été détectés, ce qui ralentit le démarrage du programme et la synchronisation des données. Veuillez envisager d'exécuter [Paramètres - À propos - Purge du référentiel de données]", "219": "Le service de stockage cloud n'est pas disponible, veuillez réessayer plus tard", "220": "En raison d'un défaut dans la version précédente, les données cloud sont corrompues. Veuillez vous référer aux étapes User Guide-FAQ-Lost Key pour réinitialiser le référentiel de données local et le répertoire cloud", - "221": "L'opération de remplacement n'est pas prise en charge après le regroupement par document. Veuillez utiliser le dissociation puis remplacer" + "221": "L'opération de remplacement n'est pas prise en charge après le regroupement par document. Veuillez utiliser le dissociation puis remplacer", + "222": "La synchronisation des données est en cours, veuillez attendre que la synchronisation des données soit terminée et réessayer" } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index d24e80774..7a15fc44e 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1388,6 +1388,7 @@ "218": "偵測到資料倉儲快照過多，降低了程式啟動和資料同步速度，請考慮執行 [設定 - 關於 - 資料倉儲清理]", "219": "雲端儲存服務不可用，請稍後再試", "220": "由於先前版本的缺陷導致了雲端資料損壞，請參考 用戶指南-常見問題-遺失密鑰 步驟來重置本地資料倉儲和雲端目錄", - "221": "按文檔分組後不支援替換操作，請使用取消分組後再進行替換" + "221": "按文檔分組後不支援替換操作，請使用取消分組後再進行替換", + "222": "資料同步中，請等待資料同步完成後再試" } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index a17963734..22922015c 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1388,6 +1388,7 @@ "218": "检测到数据仓库快照过多，降低了程序启动和数据同步速度，请考虑执行 [设置 - 关于 - 数据仓库清理]", "219": "云端存储服务不可用，请稍后再试", "220": "由于之前版本的缺陷导致了云端数据损坏，请参考 用户指南-常见问题-遗失密钥 步骤来重置本地数据仓库和云端目录", - "221": "按文档分组后不支持替换操作，请使用取消分组后再进行替换" + "221": "按文档分组后不支持替换操作，请使用取消分组后再进行替换", + "222": "数据同步中，请等待数据同步完成后再试" } } diff --git a/app/guide/20210808180117-6v0mkxr/.siyuan/sort.json b/app/guide/20210808180117-6v0mkxr/.siyuan/sort.json index d3ef0ea6e..5a889ce5c 100644 --- a/app/guide/20210808180117-6v0mkxr/.siyuan/sort.json +++ b/app/guide/20210808180117-6v0mkxr/.siyuan/sort.json @@ -1 +1 @@ -{"20200923234011-ieuun1p":1,"20200923234602-gy54e67":6,"20200923234731-h3zkwm2":2,"20200924093441-ft2rhps":1,"20200924095938-a9p5450":2,"20200924100110-vcg96wy":1,"20200924100635-ms0p9lb":6,"20200924100717-yzwzn64":20,"20200924100744-br924ar":9,"20200924100808-j9sddk9":2,"20200924100906-0u4zfq3":4,"20200924100950-9op5xi1":17,"20200924101106-19z4kaa":1,"20200924101200-gss5vee":4,"20200924101225-k254i8g":2,"20200924101256-f8b1sbi":3,"20201004194026-s8h2cog":18,"20201117112518-dott91x":6,"20201121224345-rc27qvo":7,"20201204184532-3qm9l8n":10,"20201210233038-3xr19g5":5,"20201222100222-q47d64s":2,"20201222100339-i5hzcph":1,"20201227201128-m1wrouw":19,"20201227201751-gv0fpx2":21,"20210110181011-fbhoesf":5,"20210117215840-jcl17fx":3,"20210127203829-qe2mzof":11,"20210331201142-4g923es":13,"20210505164949-c085p1d":3,"20210613191509-cbkxcbz":7,"20210615213222-vs5tzbd":14,"20210721112159-9p645xm":1,"20210721112206-mhr9wxi":2,"20210721160238-yvhbh0h":4,"20210808180303-6yi0dv5":1,"20210808180303-axh6q1d":4,"20210808180303-h361q1i":2,"20210808180303-l3qg72k":3,"20210808180303-xaduj2o":5,"20210824202056-udkf7wg":7,"20211010212318-3wx2kqb":12,"20220105101227-n5zpr1a":6,"20220628204454-hhxohv5":2,"20220708103401-mgydrfg":3,"20221016204105-qx2aq0g":3,"20221223221636-ms2b4w9":15,"20230104152135-1iei0xa":22,"20230106104821-9nfphwm":1,"20230304000547-ibldj1z":16,"20230405172236-pg3l9eu":5,"20230429115711-ejbts4s":4,"20230506205948-yah52eb":8,"20230802114825-2jkkct7":5,"20230805231614-vqn28eh":7,"20230805231816-h1z9mpc":2,"20230805232018-hgrq0ju":1,"20230805232134-3d6mx2k":2} \ No newline at end of file +{"20200923234011-ieuun1p":1,"20200923234602-gy54e67":7,"20200923234731-h3zkwm2":3,"20200924093441-ft2rhps":1,"20200924095938-a9p5450":2,"20200924100110-vcg96wy":1,"20200924100635-ms0p9lb":6,"20200924100717-yzwzn64":20,"20200924100744-br924ar":9,"20200924100808-j9sddk9":2,"20200924100906-0u4zfq3":4,"20200924100950-9op5xi1":17,"20200924101106-19z4kaa":1,"20200924101200-gss5vee":4,"20200924101225-k254i8g":2,"20200924101256-f8b1sbi":3,"20201004194026-s8h2cog":18,"20201117112518-dott91x":6,"20201121224345-rc27qvo":8,"20201204184532-3qm9l8n":10,"20201210233038-3xr19g5":5,"20201222100222-q47d64s":2,"20201222100339-i5hzcph":1,"20201227201128-m1wrouw":19,"20201227201751-gv0fpx2":21,"20210110181011-fbhoesf":5,"20210117215840-jcl17fx":4,"20210127203829-qe2mzof":11,"20210331201142-4g923es":13,"20210505164949-c085p1d":3,"20210613191509-cbkxcbz":7,"20210615213222-vs5tzbd":14,"20210721112159-9p645xm":1,"20210721112206-mhr9wxi":2,"20210721160238-yvhbh0h":4,"20210808180303-6yi0dv5":1,"20210808180303-axh6q1d":4,"20210808180303-h361q1i":2,"20210808180303-l3qg72k":3,"20210808180303-xaduj2o":5,"20210824202056-udkf7wg":7,"20211010212318-3wx2kqb":12,"20220105101227-n5zpr1a":6,"20220628204454-hhxohv5":2,"20220708103401-mgydrfg":3,"20221016204105-qx2aq0g":3,"20221223221636-ms2b4w9":15,"20230104152135-1iei0xa":22,"20230106104821-9nfphwm":1,"20230304000547-ibldj1z":16,"20230405172236-pg3l9eu":6,"20230429115711-ejbts4s":5,"20230506205948-yah52eb":8,"20230802114825-2jkkct7":5,"20230805231614-vqn28eh":7,"20230805231816-h1z9mpc":2,"20230805232018-hgrq0ju":1,"20230805232134-3d6mx2k":2,"20240113110040-7sgw8kl":2} \ No newline at end of file diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy index 0ce17ea24..530d9f423 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy @@ -7,7 +7,7 @@ "id": "20200924100950-9op5xi1", "title": "Shortcuts", "type": "doc", - "updated": "20240112150940" + "updated": "20240113110755" }, "Children": [ { @@ -2977,7 +2977,7 @@ "Properties": { "colgroup": "||", "id": "20240112150534-wiik5sl", - "updated": "20240112150940" + "updated": "20240113110755" }, "Children": [ { @@ -6839,6 +6839,51 @@ } ] }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Go to " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Settings - Shortcuts" + }, + { + "Type": "NodeText", + "Data": "​ to configure" + } + ] + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Switch read-only mode" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "-" + } + ] + }, { "Type": "NodeTableCell", "Data": "td", diff --git a/app/guide/20210808180117-6v0mkxr/20240113110040-7sgw8kl.sy b/app/guide/20210808180117-6v0mkxr/20240113110040-7sgw8kl.sy new file mode 100644 index 000000000..b8afaa589 --- /dev/null +++ b/app/guide/20210808180117-6v0mkxr/20240113110040-7sgw8kl.sy @@ -0,0 +1,520 @@ +{ + "ID": "20240113110040-7sgw8kl", + "Spec": "1", + "Type": "NodeDocument", + "Properties": { + "icon": "1f4f1", + "id": "20240113110040-7sgw8kl", + "title": "Mobile App", + "updated": "20240113110431" + }, + "Children": [ + { + "ID": "20240113110114-xav9o1n", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113110114-xav9o1n", + "updated": "20240113110114" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Overview" + } + ] + }, + { + "ID": "20240113110114-j6okyut", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-j6okyut", + "updated": "20240113110129" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "SiYuan provides Android and iOS apps, which are already available in some mobile app stores. Please search for " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SiYuan" + }, + { + "Type": "NodeText", + "Data": "​ in the app store." + } + ] + }, + { + "ID": "20240113110114-rugjxcf", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113110114-rugjxcf", + "updated": "20240113110114" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Installation and updates" + } + ] + }, + { + "ID": "20240113110114-aqce9bb", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-aqce9bb", + "updated": "20240113110114" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Currently available on the app store:" + } + ] + }, + { + "ID": "20240113110114-2r0390j", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20240113110114-2r0390j", + "updated": "20240113110151" + }, + "Children": [ + { + "ID": "20240113110114-vpn2w0q", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-vpn2w0q", + "updated": "20240113110114" + }, + "Children": [ + { + "ID": "20240113110114-xwxkfdw", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-xwxkfdw", + "updated": "20240113110136" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Mi" + } + ] + } + ] + }, + { + "ID": "20240113110114-o3ddwpp", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-o3ddwpp", + "updated": "20240113110114" + }, + "Children": [ + { + "ID": "20240113110114-aw8tod9", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-aw8tod9", + "updated": "20240113110114" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Huawei" + } + ] + } + ] + }, + { + "ID": "20240113110114-gpwaczm", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-gpwaczm", + "updated": "20240113110114" + }, + "Children": [ + { + "ID": "20240113110114-pnj3nky", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-pnj3nky", + "updated": "20240113110141" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "OPPO" + } + ] + } + ] + }, + { + "ID": "20240113110141-gyywbkd", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110141-gyywbkd", + "updated": "20240113110141" + }, + "Children": [ + { + "ID": "20240113110141-zlrxqnn", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110141-zlrxqnn", + "updated": "20240113110141" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "vivo" + } + ] + } + ] + }, + { + "ID": "20240113110114-s58cwy2", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-s58cwy2", + "updated": "20240113110144" + }, + "Children": [ + { + "ID": "20240113110114-cdqjctx", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-cdqjctx", + "updated": "20240113110144" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Apple" + } + ] + } + ] + }, + { + "ID": "20240113110114-v5x1rvc", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-v5x1rvc", + "updated": "20240113110151" + }, + "Children": [ + { + "ID": "20240113110114-in0jqwy", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-in0jqwy", + "updated": "20240113110151" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Kuan" + } + ] + } + ] + }, + { + "ID": "20240113110114-mhekema", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-mhekema", + "updated": "20240113110114" + }, + "Children": [ + { + "ID": "20240113110114-0ul416g", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-0ul416g", + "updated": "20240113110114" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Google Play" + } + ] + } + ] + } + ] + }, + { + "ID": "20240113110114-dixpfgf", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-dixpfgf", + "updated": "20240113110203" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "apk download: " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "a", + "TextMarkAHref": "https://b3log.org/siyuan/en/download.html", + "TextMarkTextContent": "https://b3log.org/siyuan/en/download.html" + } + ] + }, + { + "ID": "20240113110114-ekanw3f", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113110114-ekanw3f", + "updated": "20240113110213" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Use the marketplace" + } + ] + }, + { + "ID": "20240113110114-54bc1f8", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-54bc1f8", + "updated": "20240113110224" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Due to App Store review reasons, the marketplace cannot be provided directly on the App at present." + } + ] + }, + { + "ID": "20240113110114-5cymxj6", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-5cymxj6", + "updated": "20240113110322" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "To use the marketplace, enable " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "About" + }, + { + "Type": "NodeText", + "Data": "​ - " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Network serving" + }, + { + "Type": "NodeText", + "Data": "​ and access the configuration on your desktop browser." + } + ] + }, + { + "ID": "20240113110114-3h7r74i", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113110114-3h7r74i", + "updated": "20240113110333" + }, + "Children": [ + { + "Type": "NodeTextMark", + "TextMarkType": "tag", + "TextMarkTextContent": "Note" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "ID": "20240113110114-7cvpqyg", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20240113110114-7cvpqyg", + "updated": "20240113110431" + }, + "Children": [ + { + "ID": "20240113110114-erqy4o6", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-erqy4o6", + "updated": "20240113110114" + }, + "Children": [ + { + "ID": "20240113110114-eheouiq", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-eheouiq", + "updated": "20240113110114" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Uninstalling the App will cause local data to be completely deleted and cannot be recovered" + } + ] + } + ] + }, + { + "ID": "20240113110114-fn3cur4", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-fn3cur4", + "updated": "20240113110423" + }, + "Children": [ + { + "ID": "20240113110114-z7ij7u2", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-z7ij7u2", + "updated": "20240113110423" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "To exit the application, please use " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Exit the application" + }, + { + "Type": "NodeText", + "Data": "​ in the right panel to exit normally. Swiping away directly will force the application to end, resulting in data synchronization not being executed" + } + ] + } + ] + }, + { + "ID": "20240113110114-7yqcofv", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-7yqcofv", + "updated": "20240113110425" + }, + "Children": [ + { + "ID": "20240113110114-mnulyqm", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-mnulyqm", + "updated": "20240113110425" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Switching apps on iOS will cause the connection to be interrupted. Please click the button in the prompt box to manually reconnect" + } + ] + } + ] + }, + { + "ID": "20240113110114-oz77ny6", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110114-oz77ny6", + "updated": "20240113110431" + }, + "Children": [ + { + "ID": "20240113110114-rqu8ptk", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110114-rqu8ptk", + "updated": "20240113110431" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Please do not switch applications and keep the screen on during data synchronization, otherwise data synchronization will fail" + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/app/guide/20210808180117-czj9bvb/.siyuan/sort.json b/app/guide/20210808180117-czj9bvb/.siyuan/sort.json index 64eceb180..549015341 100644 --- a/app/guide/20210808180117-czj9bvb/.siyuan/sort.json +++ b/app/guide/20210808180117-czj9bvb/.siyuan/sort.json @@ -1 +1 @@ -{"20200812220555-lj3enxa":1,"20200813004551-gm0pbn1":17,"20200813004931-q4cu8na":1,"20200813013559-sgbzl5k":3,"20200813093015-u6bopdt":2,"20200813125307-pxsjela":2,"20200813131152-0wk5akh":4,"20200813163359-v04n73b":8,"20200822191536-rm6hwid":4,"20200825162036-4dx365o":1,"20200828105441-r76vmu5":20,"20200905090211-2vixtlf":2,"20200910201551-h4twhas":6,"20200915214115-42b8zma":9,"20200922102318-oz84yu3":2,"20201004184819-nj8ibyg":18,"20201117101902-2ewjjum":6,"20201121212605-9td1a62":9,"20201204181006-7bkppue":10,"20201210103036-1x3vm8t":5,"20201222093044-rx4zjoy":1,"20201222095049-hghafhe":2,"20201227173504-847cs1q":19,"20201227194925-7ipoiv6":21,"20210110175347-2xrwoiq":5,"20210117211155-56n4odu":3,"20210127202655-2334vvv":11,"20210331200042-94gs1hh":13,"20210505163537-oo97zov":3,"20210612224500-ywcms1m":7,"20210615211733-v6rzowm":14,"20210808180320-abz7w6k":2,"20210808180320-fqgskfj":1,"20210808180320-gyngv2x":3,"20210808180320-qgr0b3q":4,"20210808180321-hbvl5c2":5,"20210824201257-cy7icrc":7,"20211010211311-ffz0wbu":12,"20220628204444-9n0y9h2":2,"20221016213308-uz5af79":3,"20221223215557-o6gfsoy":15,"20230104144904-39br4c6":22,"20230106101434-e6g4av3":1,"20230303235619-ex5l63e":16,"20230405155631-leo4vc6":5,"20230428153709-hioyy5l":6,"20230429114837-70asb4j":4,"20230506210010-houyyvy":8,"20230519105228-hm0y74i":7,"20230805222417-2lj3dvk":6,"20230805225107-qm1m2f5":2,"20230805230131-sn7obzb":1,"20230805230218-aea8icj":2,"20230808120347-3cob0nb":2,"20230808120347-mw3qrwy":4,"20230808120347-pzvmkik":1,"20230808120348-hynr7og":5,"20230808120348-lgcp9zm":3,"20230808120348-vaxi6eq":6,"20230808120348-yut741f":7} \ No newline at end of file +{"20200812220555-lj3enxa":1,"20200813004551-gm0pbn1":17,"20200813004931-q4cu8na":1,"20200813013559-sgbzl5k":3,"20200813093015-u6bopdt":3,"20200813125307-pxsjela":2,"20200813131152-0wk5akh":4,"20200813163359-v04n73b":9,"20200822191536-rm6hwid":4,"20200825162036-4dx365o":1,"20200828105441-r76vmu5":20,"20200905090211-2vixtlf":2,"20200910201551-h4twhas":6,"20200915214115-42b8zma":9,"20200922102318-oz84yu3":2,"20201004184819-nj8ibyg":18,"20201117101902-2ewjjum":6,"20201121212605-9td1a62":10,"20201204181006-7bkppue":10,"20201210103036-1x3vm8t":5,"20201222093044-rx4zjoy":1,"20201222095049-hghafhe":2,"20201227173504-847cs1q":19,"20201227194925-7ipoiv6":21,"20210110175347-2xrwoiq":5,"20210117211155-56n4odu":4,"20210127202655-2334vvv":11,"20210331200042-94gs1hh":13,"20210505163537-oo97zov":3,"20210612224500-ywcms1m":7,"20210615211733-v6rzowm":14,"20210808180320-abz7w6k":2,"20210808180320-fqgskfj":1,"20210808180320-gyngv2x":3,"20210808180320-qgr0b3q":4,"20210808180321-hbvl5c2":5,"20210824201257-cy7icrc":7,"20211010211311-ffz0wbu":12,"20220628204444-9n0y9h2":2,"20221016213308-uz5af79":3,"20221223215557-o6gfsoy":15,"20230104144904-39br4c6":22,"20230106101434-e6g4av3":1,"20230303235619-ex5l63e":16,"20230405155631-leo4vc6":6,"20230428153709-hioyy5l":7,"20230429114837-70asb4j":5,"20230506210010-houyyvy":8,"20230519105228-hm0y74i":8,"20230805222417-2lj3dvk":6,"20230805225107-qm1m2f5":2,"20230805230131-sn7obzb":1,"20230805230218-aea8icj":2,"20230808120347-3cob0nb":2,"20230808120347-mw3qrwy":4,"20230808120347-pzvmkik":1,"20230808120348-hynr7og":5,"20230808120348-lgcp9zm":3,"20230808120348-vaxi6eq":6,"20230808120348-yut741f":7,"20240113102857-c63dmo5":2} \ No newline at end of file diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy index f4bf33f2f..f79a529ae 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy @@ -7,7 +7,7 @@ "id": "20200813004551-gm0pbn1", "title": "快捷键", "type": "doc", - "updated": "20240112150737" + "updated": "20240113105903" }, "Children": [ { @@ -2973,7 +2973,7 @@ "Properties": { "colgroup": "||", "id": "20201227133317-vopotjc", - "updated": "20240112145126" + "updated": "20240113105903" }, "Children": [ { @@ -6907,6 +6907,51 @@ ] } ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "切换只读模式" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "-" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "可前往 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "设置- 快捷键" + }, + { + "Type": "NodeText", + "Data": "​​ 中配置" + } + ] + } + ] } ] }, diff --git a/app/guide/20210808180117-czj9bvb/20240113102857-c63dmo5.sy b/app/guide/20210808180117-czj9bvb/20240113102857-c63dmo5.sy new file mode 100644 index 000000000..342ab6471 --- /dev/null +++ b/app/guide/20210808180117-czj9bvb/20240113102857-c63dmo5.sy @@ -0,0 +1,522 @@ +{ + "ID": "20240113102857-c63dmo5", + "Spec": "1", + "Type": "NodeDocument", + "Properties": { + "icon": "1f4f1", + "id": "20240113102857-c63dmo5", + "title": "移动端 App", + "updated": "20240113105701" + }, + "Children": [ + { + "ID": "20240113102857-aof1w7f", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113102857-aof1w7f", + "updated": "20240113103019" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "概述" + } + ] + }, + { + "ID": "20240113103019-9qixtas", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103019-9qixtas", + "updated": "20240113105701" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "思源笔记提供了 Android 端和 iOS 端 App，已经上架部分手机应用商店，请在应用商店中搜索 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "思源笔记" + }, + { + "Type": "NodeText", + "Data": "​ 或者 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SiYuan" + }, + { + "Type": "NodeText", + "Data": "​。" + } + ] + }, + { + "ID": "20240113103514-zn9zqby", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113103514-zn9zqby", + "updated": "20240113103527" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "安装和更新" + } + ] + }, + { + "ID": "20240113103522-9qmar6w", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103522-9qmar6w", + "updated": "20240113103715" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "目前已经上架应用商店：" + } + ] + }, + { + "ID": "20240113103626-ubxacja", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20240113103626-ubxacja", + "updated": "20240113103627" + }, + "Children": [ + { + "ID": "20240113103627-3msi4nv", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113103627-3msi4nv", + "updated": "20240113103627" + }, + "Children": [ + { + "ID": "20240113103627-f8jrx6i", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103627-f8jrx6i", + "updated": "20240113103636" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "小米" + } + ] + } + ] + }, + { + "ID": "20240113103636-d16mhk2", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113103636-d16mhk2" + }, + "Children": [ + { + "ID": "20240113103636-sfd0an8", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103636-sfd0an8", + "updated": "20240113103639" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "华为" + } + ] + } + ] + }, + { + "ID": "20240113103639-l2ytma2", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113103639-l2ytma2" + }, + "Children": [ + { + "ID": "20240113103639-hb5o04j", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103639-hb5o04j", + "updated": "20240113103641" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "OPPO" + } + ] + } + ] + }, + { + "ID": "20240113103641-v5mcpqr", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113103641-v5mcpqr" + }, + "Children": [ + { + "ID": "20240113103641-3m0bnw0", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103641-3m0bnw0", + "updated": "20240113103644" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "vivo" + } + ] + } + ] + }, + { + "ID": "20240113103645-f24px3a", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113103645-f24px3a" + }, + "Children": [ + { + "ID": "20240113103645-bn397ic", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103645-bn397ic", + "updated": "20240113103659" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "苹果" + } + ] + } + ] + }, + { + "ID": "20240113103702-duvw7xt", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113103702-duvw7xt" + }, + "Children": [ + { + "ID": "20240113103702-4x92du8", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103702-4x92du8", + "updated": "20240113103704" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "酷安" + } + ] + } + ] + }, + { + "ID": "20240113103706-rvth88e", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113103706-rvth88e" + }, + "Children": [ + { + "ID": "20240113103706-re3ljge", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103706-re3ljge", + "updated": "20240113103709" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Google Play" + } + ] + } + ] + } + ] + }, + { + "ID": "20240113103718-csuv9qu", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113103718-csuv9qu", + "updated": "20240113103755" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "apk 下载： " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "a", + "TextMarkAHref": "https://b3log.org/siyuan/download.html", + "TextMarkTextContent": "https://b3log.org/siyuan/download.html" + } + ] + }, + { + "ID": "20240113104101-rz1z8en", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113104101-rz1z8en", + "updated": "20240113104140" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "使用集市" + } + ] + }, + { + "ID": "20240113104141-5jvccmj", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113104141-5jvccmj", + "updated": "20240113104506" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "因为应用商店审核原因，目前无法直接在 App 上提供集市。" + } + ] + }, + { + "ID": "20240113104506-ko5m727", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113104506-ko5m727", + "updated": "20240113104506" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "如需使用集市，请启用 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "关于" + }, + { + "Type": "NodeText", + "Data": "​ - " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "网络伺服" + }, + { + "Type": "NodeText", + "Data": "​，然后在桌面端浏览器上访问配置。" + } + ] + }, + { + "ID": "20240113103753-6tsixvt", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113103753-6tsixvt", + "updated": "20240113104524" + }, + "Children": [ + { + "Type": "NodeTextMark", + "TextMarkType": "tag", + "TextMarkTextContent": "注意" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "ID": "20240113104525-jtaztd5", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20240113104525-jtaztd5", + "updated": "20240113105513" + }, + "Children": [ + { + "ID": "20240113104818-gc1i41e", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113104818-gc1i41e", + "updated": "20240113104818" + }, + "Children": [ + { + "ID": "20240113104818-pxt6yql", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113104818-pxt6yql", + "updated": "20240113104831" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "卸载 App 会导致本地数据被完全删除且无法恢复" + } + ] + } + ] + }, + { + "ID": "20240113104832-8e6vs9t", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113104832-8e6vs9t", + "updated": "20240113105513" + }, + "Children": [ + { + "ID": "20240113104832-2hvn950", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113104832-2hvn950", + "updated": "20240113105513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "退出应用请使用右侧面板中的 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "退出应用" + }, + { + "Type": "NodeText", + "Data": "​ 进行正常退出，直接划走会强制结束应用，导致数据同步未被执行" + } + ] + } + ] + }, + { + "ID": "20240113105240-owjwqqn", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113105240-owjwqqn" + }, + "Children": [ + { + "ID": "20240113105240-bkhdigy", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113105240-bkhdigy", + "updated": "20240113105348" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "iOS 端切换应用后会导致连接中断，请点击提示框中的按钮手动重连" + } + ] + } + ] + }, + { + "ID": "20240113105419-g8m50a5", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113105419-g8m50a5", + "updated": "20240113105504" + }, + "Children": [ + { + "ID": "20240113105419-pwwa9ym", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113105419-pwwa9ym", + "updated": "20240113105504" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "数据同步过程中请勿切换应用并保持亮屏，否则会导致数据同步失败" + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/app/guide/20211226090932-5lcq56f/.siyuan/sort.json b/app/guide/20211226090932-5lcq56f/.siyuan/sort.json index 777af672f..6a28f9bec 100644 --- a/app/guide/20211226090932-5lcq56f/.siyuan/sort.json +++ b/app/guide/20211226090932-5lcq56f/.siyuan/sort.json @@ -1 +1 @@ -{"20211226114339-dk0gtpr":6,"20211226114929-08ap1r0":7,"20211226115043-afhev0g":3,"20211226115227-r1rty9v":2,"20211226115423-d5z1joq":1,"20211226115825-mhcslw2":1,"20211226120055-9mityht":1,"20211226120147-ib6yy3i":2,"20211226120247-63nd8y5":3,"20211226120349-rbkmozu":4,"20211226120422-bkzsd2e":5,"20211226120508-yzh70eh":6,"20211226120802-77aj0is":7,"20211226120854-dr1jfx2":2,"20211226120933-vnjgwwh":3,"20211226121109-f060fkg":4,"20211226121203-rjjngpz":5,"20211226121319-emrk2yy":1,"20211226121329-c5v3dto":21,"20211226121332-irgblss":4,"20211226121438-xaafdo8":2,"20211226121503-k3jma6m":1,"20211226122358-hctqcn5":20,"20211226122459-08mi5cq":19,"20211226122523-rl8356a":18,"20211226122549-jktxego":17,"20211226122707-8cr09co":14,"20211226122728-cnqf7rz":13,"20211226122814-r1rdpcx":12,"20211226122943-st7fpcj":11,"20211226123004-dplpw0o":10,"20211226123038-4umgpxy":9,"20211226123101-qjw03ab":7,"20211226123130-jpeg5b2":6,"20211226123154-fd5e001":5,"20211226123216-tlxw66f":4,"20211226123241-51pujtr":3,"20211226123302-akitvb1":2,"20220105101348-corstqc":5,"20220628204420-ui79vkt":2,"20220708102441-u6wopo9":3,"20221016213639-1nag9jj":3,"20221223221501-mops33i":15,"20230104151953-48hwkwf":22,"20230106104645-o838uew":1,"20230304000829-9jwu3po":16,"20230405172131-yb16aax":5,"20230429115206-ob8nl8t":4,"20230506211210-1roopyo":8,"20230805232636-zh0adz2":6,"20230805232719-04mqbcx":2,"20230805232903-erdoerp":1,"20230805232920-5fdco36":2} \ No newline at end of file +{"20211226114339-dk0gtpr":7,"20211226114929-08ap1r0":8,"20211226115043-afhev0g":4,"20211226115227-r1rty9v":3,"20211226115423-d5z1joq":1,"20211226115825-mhcslw2":1,"20211226120055-9mityht":1,"20211226120147-ib6yy3i":2,"20211226120247-63nd8y5":3,"20211226120349-rbkmozu":4,"20211226120422-bkzsd2e":5,"20211226120508-yzh70eh":6,"20211226120802-77aj0is":7,"20211226120854-dr1jfx2":2,"20211226120933-vnjgwwh":3,"20211226121109-f060fkg":4,"20211226121203-rjjngpz":5,"20211226121319-emrk2yy":1,"20211226121329-c5v3dto":21,"20211226121332-irgblss":4,"20211226121438-xaafdo8":2,"20211226121503-k3jma6m":1,"20211226122358-hctqcn5":20,"20211226122459-08mi5cq":19,"20211226122523-rl8356a":18,"20211226122549-jktxego":17,"20211226122707-8cr09co":14,"20211226122728-cnqf7rz":13,"20211226122814-r1rdpcx":12,"20211226122943-st7fpcj":11,"20211226123004-dplpw0o":10,"20211226123038-4umgpxy":9,"20211226123101-qjw03ab":7,"20211226123130-jpeg5b2":6,"20211226123154-fd5e001":5,"20211226123216-tlxw66f":4,"20211226123241-51pujtr":3,"20211226123302-akitvb1":2,"20220105101348-corstqc":5,"20220628204420-ui79vkt":2,"20220708102441-u6wopo9":3,"20221016213639-1nag9jj":3,"20221223221501-mops33i":15,"20230104151953-48hwkwf":22,"20230106104645-o838uew":1,"20230304000829-9jwu3po":16,"20230405172131-yb16aax":6,"20230429115206-ob8nl8t":5,"20230506211210-1roopyo":8,"20230805232636-zh0adz2":6,"20230805232719-04mqbcx":2,"20230805232903-erdoerp":1,"20230805232920-5fdco36":2,"20240113110500-dz2ae4n":2} \ No newline at end of file diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy index cbfdacbae..294f4d2fe 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy @@ -6,7 +6,7 @@ "icon": "2328", "id": "20211226122549-jktxego", "title": "快捷鍵", - "updated": "20240112151316" + "updated": "20240113110727" }, "Children": [ { @@ -3048,7 +3048,7 @@ "Properties": { "colgroup": "||", "id": "20240112151141-ggglv0f", - "updated": "20240112151316" + "updated": "20240113110727" }, "Children": [ { @@ -6996,6 +6996,51 @@ } ] }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "可前往 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "設置-\u0026gt;快捷鍵" + }, + { + "Type": "NodeText", + "Data": "​ 中配置" + } + ] + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "切換唯讀模式" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "-" + } + ] + }, { "Type": "NodeTableCell", "Data": "td", diff --git a/app/guide/20211226090932-5lcq56f/20240113110500-dz2ae4n.sy b/app/guide/20211226090932-5lcq56f/20240113110500-dz2ae4n.sy new file mode 100644 index 000000000..625367071 --- /dev/null +++ b/app/guide/20211226090932-5lcq56f/20240113110500-dz2ae4n.sy @@ -0,0 +1,520 @@ +{ + "ID": "20240113110500-dz2ae4n", + "Spec": "1", + "Type": "NodeDocument", + "Properties": { + "icon": "1f4f1", + "id": "20240113110500-dz2ae4n", + "title": "行動端 App", + "updated": "20240113111013" + }, + "Children": [ + { + "ID": "20240113110513-8s7tp6d", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113110513-8s7tp6d", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "概述" + } + ] + }, + { + "ID": "20240113110513-7dv2nyk", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-7dv2nyk", + "updated": "20240113110531" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "思源筆記提供了 Android 端和 iOS 端 App，已經上架部分手機應用程式商店，請在應用程式商店中搜尋 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "code", + "TextMarkTextContent": "SiYuan" + }, + { + "Type": "NodeText", + "Data": "​。" + } + ] + }, + { + "ID": "20240113110513-zvmefnd", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113110513-zvmefnd", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "安裝和更新" + } + ] + }, + { + "ID": "20240113110513-f0yckci", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-f0yckci", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "目前已經上架應用程式商店：" + } + ] + }, + { + "ID": "20240113110513-s2ty09e", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20240113110513-s2ty09e", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-zkcjaqy", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-zkcjaqy", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-orc8lc9", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-orc8lc9", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "小米" + } + ] + } + ] + }, + { + "ID": "20240113110513-iztzopq", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-iztzopq", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-wugi1za", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-wugi1za", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "華為" + } + ] + } + ] + }, + { + "ID": "20240113110513-cn7qzup", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-cn7qzup", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-g7vsmnv", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-g7vsmnv", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "OPPO" + } + ] + } + ] + }, + { + "ID": "20240113110513-qxnwszv", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-qxnwszv", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-hkyqb3y", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-hkyqb3y", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "vivo" + } + ] + } + ] + }, + { + "ID": "20240113110513-f3vaz7w", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-f3vaz7w", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-dc4b1v0", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-dc4b1v0", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "蘋果" + } + ] + } + ] + }, + { + "ID": "20240113110513-pa32ob5", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-pa32ob5", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-s2nbnca", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-s2nbnca", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "酷安" + } + ] + } + ] + }, + { + "ID": "20240113110513-ymrho6a", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-ymrho6a", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-izjg5e1", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-izjg5e1", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Google Play" + } + ] + } + ] + } + ] + }, + { + "ID": "20240113110513-8lwzed3", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-8lwzed3", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "apk 下載： " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "a", + "TextMarkAHref": "https://b3log.org/siyuan/download.html", + "TextMarkTextContent": "https://b3log.org/siyuan/download.html" + } + ] + }, + { + "ID": "20240113110513-f0ouee1", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113110513-f0ouee1", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "使用集市" + } + ] + }, + { + "ID": "20240113110513-1zlx78j", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-1zlx78j", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "因為應用程式商店審核原因，目前無法直接在 App 上提供市集。" + } + ] + }, + { + "ID": "20240113110513-bta55b6", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-bta55b6", + "updated": "20240113110550" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "如需使用集市，請啟用 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "關於" + }, + { + "Type": "NodeText", + "Data": "​ - " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "網路伺服" + }, + { + "Type": "NodeText", + "Data": "​，然後在桌面端瀏覽器上存取配置。" + } + ] + }, + { + "ID": "20240113110513-pxc89dc", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20240113110513-pxc89dc", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeTextMark", + "TextMarkType": "tag", + "TextMarkTextContent": "注意" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "ID": "20240113110513-hrvrjsj", + "Type": "NodeList", + "ListData": {}, + "Properties": { + "id": "20240113110513-hrvrjsj", + "updated": "20240113110557" + }, + "Children": [ + { + "ID": "20240113110513-cvue0bs", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-cvue0bs", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-cfsoofb", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-cfsoofb", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "卸載 App 會導致本機資料完全刪除且無法復原" + } + ] + } + ] + }, + { + "ID": "20240113110513-2q984od", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-2q984od", + "updated": "20240113110557" + }, + "Children": [ + { + "ID": "20240113110513-4xcnhoh", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-4xcnhoh", + "updated": "20240113110557" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "退出應用程式請使用右側面板中的 " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "退出應用" + }, + { + "Type": "NodeText", + "Data": "​ 進行正常退出，直接劃走會強制結束應用，導致資料同步未執行" + } + ] + } + ] + }, + { + "ID": "20240113110513-jqntg24", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-jqntg24", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-gw393oi", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-gw393oi", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "iOS 端切換應用程式後會導致連線中斷，請點選提示框中的按鈕手動重連" + } + ] + } + ] + }, + { + "ID": "20240113110513-99in2ac", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20240113110513-99in2ac", + "updated": "20240113110513" + }, + "Children": [ + { + "ID": "20240113110513-213ok2i", + "Type": "NodeParagraph", + "Properties": { + "id": "20240113110513-213ok2i", + "updated": "20240113110513" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "資料同步過程中請勿切換應用程式並保持亮屏，否則會導致資料同步失敗" + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kernel/model/flashcard.go b/kernel/model/flashcard.go index b7e7ba9fa..711e155ae 100644 --- a/kernel/model/flashcard.go +++ b/kernel/model/flashcard.go @@ -641,7 +641,7 @@ func (tx *Transaction) doRemoveFlashcards(operation *Operation) (ret *TxErr) { deckLock.Lock() defer deckLock.Unlock() - if syncingStorages.Load() { + if isSyncingStorages() { ret = &TxErr{code: TxErrCodeDataIsSyncing} return } @@ -753,7 +753,7 @@ func (tx *Transaction) doAddFlashcards(operation *Operation) (ret *TxErr) { deckLock.Lock() defer deckLock.Unlock() - if syncingStorages.Load() { + if isSyncingStorages() { ret = &TxErr{code: TxErrCodeDataIsSyncing} return } diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 0c54bbc86..ad0959d62 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -955,11 +955,15 @@ var syncingFiles = sync.Map{} var syncingStorages = atomic.Bool{} func waitForSyncingStorages() { - for syncingStorages.Load() { + for isSyncingStorages() { time.Sleep(time.Second) } } +func isSyncingStorages() bool { + return syncingStorages.Load() || isBootSyncing.Load() +} + func IsSyncingFile(rootID string) (ret bool) { _, ret = syncingFiles.Load(rootID) return @@ -1105,6 +1109,8 @@ func syncRepoUpload() (err error) { return } +var isBootSyncing = atomic.Bool{} + func bootSyncRepo() (err error) { if 1 > len(Conf.Repo.Key) { autoSyncErrCount++ @@ -1129,11 +1135,14 @@ func bootSyncRepo() (err error) { return } + isBootSyncing.Store(true) + start := time.Now() _, _, err = indexRepoBeforeCloudSync(repo) if nil != err { autoSyncErrCount++ planSyncAfter(fixSyncInterval) + isBootSyncing.Store(false) return } @@ -1180,17 +1189,21 @@ func bootSyncRepo() (err error) { util.PushStatusBar(msg) util.PushErrMsg(msg, 0) BootSyncSucc = 1 + isBootSyncing.Store(false) return } if 0 < len(fetchedFiles) { go func() { _, syncErr := syncRepo(false, false) + isBootSyncing.Store(false) if nil != err { logging.LogErrorf("boot background sync repo failed: %s", syncErr) return } }() + } else { + isBootSyncing.Store(false) } return } diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index 96560f969..cf7367863 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -115,7 +115,7 @@ func flushTx(tx *Transaction) { util.PushTxErr("Transaction failed", txErr.code, nil) return case TxErrCodeDataIsSyncing: - util.PushErrMsg(Conf.Language(81), 5000) + util.PushMsg(Conf.Language(222), 5000) default: txData, _ := gulu.JSON.MarshalJSON(tx) logging.LogFatalf(logging.ExitCodeFatal, "transaction failed [%d]: %s\n tx [%s]", txErr.code, txErr.msg, txData)