Skip to content

Commit

Permalink
add mobile support
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaohongxuan committed Jul 7, 2022
1 parent 68094c7 commit 30541f0
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@typescript-eslint/ban-ts-comment": "off",
"no-prototype-builtins": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": ["off"]

"@typescript-eslint/no-explicit-any": ["off"],
"@typescript-eslint/no-var-requires": 0
}
}
8 changes: 6 additions & 2 deletions main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Notice, Plugin } from 'obsidian';
import { Notice, Platform, Plugin } from 'obsidian';
import FileManager from './src/fileManager';
import SyncNotebooks from './src/syncNotebooks';
import ApiManager from './src/api';
Expand Down Expand Up @@ -43,7 +43,11 @@ export default class WereadPlugin extends Plugin {
await this.syncNotebooks.startSync(force);
console.log('syncing Weread note finish');
} catch (e) {
new Notice('同步微信读书笔记异常,请打开控制台查看详情');
if (Platform.isDesktopApp) {
new Notice('同步微信读书笔记异常,请打开控制台查看详情');
} else {
new Notice('同步微信读书笔记异常,请使用电脑端打开控制台查看详情');
}
console.error('同步微信读书笔记异常', e);
}
}
Expand Down
4 changes: 2 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"id": "obsidian-weread-plugin",
"name": "Weread Plugin",
"version": "0.2.7",
"version": "0.3.0",
"minAppVersion": "0.12.0",
"description": "This is obsidian plugin for Tencent weread.",
"author": "hankzhao",
"authorUrl": "https://zhaohongxuan.github.io",
"isDesktopOnly": true
"isDesktopOnly": false
}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obsidian-weread-plugin",
"version": "0.2.7",
"version": "0.3.0",
"description": "This is a community plugin for tencent weread (https://r.qq.com)",
"main": "main.ts",
"scripts": {
Expand Down
8 changes: 6 additions & 2 deletions src/api.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Notice, requestUrl, RequestUrlParam } from 'obsidian';
import { Notice, requestUrl, RequestUrlParam, Platform } from 'obsidian';
import { settingsStore } from './settings';
import { get } from 'svelte/store';
import { getCookieString } from './utils/cookiesUtil';
Expand Down Expand Up @@ -49,7 +49,11 @@ export default class ApiManager {
console.log('weread cookie expire retry refresh cookie... ');
await this.refreshCookie();
} else {
new Notice('微信读书未登录或者用户异常,请在设置中重新登录!');
if (Platform.isDesktopApp) {
new Notice('微信读书未登录或者用户异常,请在设置中重新登录!');
} else {
new Notice('微信读书未登录或者用户异常,请在电脑端重新登录!');
}
console.log('微信读书未登录或者用户异常,请重新登录', resp.json.errcode);
settingsStore.actions.clearCookies();
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/wereadLoginModel.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { remote, BrowserWindow } from 'electron';
import { Notice } from 'obsidian';
import { parseCookies } from '../utils/cookiesUtil';
import { settingsStore } from '../settings';
import { WereadSettingsTab } from '../settingTab';
const { BrowserWindow: RemoteBrowserWindow } = remote;

export default class WereadLoginModel {
private modal: BrowserWindow;
private modal: any;
private settingTab: WereadSettingsTab;
constructor(settingTab: WereadSettingsTab) {
this.settingTab = settingTab;
const { remote } = require('electron');
const { BrowserWindow: RemoteBrowserWindow } = remote;
this.modal = new RemoteBrowserWindow({
parent: remote.getCurrentWindow(),
width: 960,
Expand Down
8 changes: 3 additions & 5 deletions src/components/wereadLogoutModel.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
import { remote, BrowserWindow } from 'electron';
import { settingsStore } from '../settings';
import { WereadSettingsTab } from '../settingTab';

const { BrowserWindow: RemoteBrowserWindow } = remote;

export default class WereadLoginModel {
private modal: BrowserWindow;
private modal: any;
private settingTab: WereadSettingsTab;
constructor(settingTab: WereadSettingsTab) {
this.settingTab = settingTab;
const { remote } = require('electron');
const { BrowserWindow: RemoteBrowserWindow } = remote;
this.modal = new RemoteBrowserWindow({
parent: remote.getCurrentWindow(),
width: 960,
height: 540,
show: false
});

this.modal.once('ready-to-show', () => {
this.modal.setTitle('注销微信读书,右上角头像点击退出登录~');
this.modal.show();
Expand Down
27 changes: 24 additions & 3 deletions src/settingTab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,20 @@ export class WereadSettingsTab extends PluginSettingTab {
containerEl.empty();
containerEl.createEl('h2', { text: '设置微信读书插件' });
const isCookieValid = get(settingsStore).isCookieValid;
if (isCookieValid) {
this.showLogout();
if (Platform.isDesktopApp) {
if (isCookieValid) {
this.showLogout();
} else {
this.showLogin();
}
} else {
this.showLogin();
if (isCookieValid) {
this.showMobileLogout();
} else {
this.showMobileLogin();
}
}

this.notebookFolder();
this.noteCountLimit();
this.fileNameType();
Expand All @@ -36,6 +45,18 @@ export class WereadSettingsTab extends PluginSettingTab {
this.showDebugHelp();
}

private showMobileLogin() {
const info = this.containerEl.createDiv();
info.setAttr('align', 'center');
info.setText('请先在电脑端登录!');
}

private showMobileLogout() {
const info = this.containerEl.createDiv();
info.setAttr('align', 'center');
info.setText(`微信读书已登录,用户名:${get(settingsStore).user},请现在电脑端操作注销!`);
}

private notebookFolder(): void {
new Setting(this.containerEl)
.setName('笔记保存位置')
Expand Down

0 comments on commit 30541f0

Please sign in to comment.