mirror of
https://github.com/kuaifan/dootask.git
synced 2026-01-12 08:58:11 +00:00
no message
This commit is contained in:
parent
7c1834107e
commit
77f6381eff
@ -95,7 +95,7 @@ export default {
|
||||
}, 6000)
|
||||
}
|
||||
//
|
||||
if (this.$openVlog) {
|
||||
if (this.$openLog) {
|
||||
$A.loadScript('js/vconsole.min.js', (e) => {
|
||||
if (e !== null || typeof window.VConsole !== 'function') {
|
||||
$A.modalAlert("vConsole 组件加载失败!");
|
||||
@ -109,7 +109,6 @@ export default {
|
||||
console.log('vConsole: onClearLog');
|
||||
}
|
||||
});
|
||||
console.info('vConsole: Welcome');
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -186,14 +185,14 @@ export default {
|
||||
}
|
||||
// 页面失活
|
||||
window.__onPagePause = () => {
|
||||
if (this.$openVlog) {
|
||||
if (this.$openLog) {
|
||||
console.log('onPagePause');
|
||||
}
|
||||
this.$store.dispatch("getBasicData", -1)
|
||||
}
|
||||
// 页面激活
|
||||
window.__onPageResume = (num) => {
|
||||
if (this.$openVlog) {
|
||||
if (this.$openLog) {
|
||||
console.log('onPageResume', num);
|
||||
console.log('ws', this.ws, this.ws ? this.ws.readyState : null);
|
||||
}
|
||||
|
||||
4
resources/assets/js/app.js
vendored
4
resources/assets/js/app.js
vendored
@ -136,7 +136,7 @@ $A.isMainElectron = false;
|
||||
$A.isSubElectron = false;
|
||||
$A.isEEUiApp = isEEUiApp;
|
||||
$A.isDesktop = $A.isDesktop();
|
||||
$A.openVlog = $A.getStorageString("vlog::open") === "open";
|
||||
$A.openLog = $A.getStorageString("log::open") === "open";
|
||||
if (isElectron) {
|
||||
$A.Electron = electron;
|
||||
$A.Platform = /macintosh|mac os x/i.test(navigator.userAgent) ? "mac" : "win";
|
||||
@ -151,7 +151,7 @@ Vue.prototype.$isMainElectron = $A.isMainElectron;
|
||||
Vue.prototype.$isSubElectron = $A.isSubElectron;
|
||||
Vue.prototype.$isEEUiApp = $A.isEEUiApp;
|
||||
Vue.prototype.$isDesktop = $A.isDesktop;
|
||||
Vue.prototype.$openVlog = $A.openVlog;
|
||||
Vue.prototype.$openLog = $A.openLog;
|
||||
|
||||
Vue.config.productionTip = false;
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ export default {
|
||||
msg = msg == this.audioId
|
||||
}
|
||||
if (typeof msg === "boolean") {
|
||||
if (!msg && !ended) {
|
||||
if (msg && !ended) {
|
||||
audio.pause()
|
||||
}
|
||||
return
|
||||
|
||||
@ -230,6 +230,16 @@ export default {
|
||||
}
|
||||
}
|
||||
}, 1000)
|
||||
//
|
||||
if (this.$isEEUiApp) {
|
||||
window.__onPermissionRequest = (type, result) => {
|
||||
console.log(type, result);
|
||||
if (type === 'recordAudio' && result === false) {
|
||||
// Android 录音权限被拒绝了
|
||||
this.stopRecord(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
beforeDestroy() {
|
||||
if (this.quill) {
|
||||
@ -675,6 +685,7 @@ export default {
|
||||
this.recordRec.close();
|
||||
}
|
||||
}, (msg) => {
|
||||
this.recordState = "stop";
|
||||
$A.messageError(msg || '打开录音失败')
|
||||
});
|
||||
})
|
||||
|
||||
@ -311,14 +311,16 @@ export default {
|
||||
watch: {
|
||||
dialogKey(val) {
|
||||
switch (val) {
|
||||
case 'vlog.open':
|
||||
case 'vlog:open':
|
||||
$A.setStorage("vlog::open", "open");
|
||||
case 'log.open':
|
||||
case 'log:open':
|
||||
case 'eruda:open':
|
||||
$A.setStorage("log::open", "open");
|
||||
$A.reloadUrl();
|
||||
break;
|
||||
case 'vlog.close':
|
||||
case 'vlog:close':
|
||||
$A.setStorage("vlog::open", "close");
|
||||
case 'log.close':
|
||||
case 'log:close':
|
||||
case 'eruda:close':
|
||||
$A.setStorage("log::open", "close");
|
||||
$A.reloadUrl();
|
||||
break;
|
||||
}
|
||||
|
||||
2
resources/assets/js/store/actions.js
vendored
2
resources/assets/js/store/actions.js
vendored
@ -2256,7 +2256,7 @@ export default {
|
||||
url = url.replace("http://", "ws://");
|
||||
url += "?action=web&token=" + state.userToken;
|
||||
//
|
||||
const wgLog = $A.openVlog;
|
||||
const wgLog = $A.openLog;
|
||||
const wsRandom = $A.randomString(16);
|
||||
state.wsRandom = wsRandom;
|
||||
//
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 5e43f5d24edce45158d33acc4c71e9a9f8579cba
|
||||
Subproject commit 6b0878b7e6ae7ade39bb8f5dfafdb332e0f022d3
|
||||
Loading…
x
Reference in New Issue
Block a user