lingling
/
media_player_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善信号源对话框英文翻译， 注册对话框移动到工厂模式

This commit is contained in:
fangxiang 2022-07-06 14:44:11 +08:00
parent 31b0a82725
commit 37baa6d678
16 changed files with 147 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/App.vue
View File

@ -58,6 +58,7 @@ export default defineComponent({
console.log(e);
}
try {
{
const user_search = (<any>window).user_search || {};
if (typeof user_search == "object") {
@ -65,8 +66,16 @@ export default defineComponent({
"setAvancedDebug",
typeof user_search["debug"] != "undefined"
);
$store.commit(
"setFactoryMode",
typeof user_search["factory"] != "undefined"
);
}
}
} catch (e) {
console.log(e);
}
window.onresize = (evt: any) =>
EventBus.getInstance().emit(EventNamesDefine.WindowResize, evt);

9
src/components/AdvancedIpAddressDialog.vue
View File

@ -127,10 +127,17 @@
<q-separator />
<q-card-actions align="right">
<q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup />
<q-btn
flat
:label="$t('Cancel')"
no-caps
color="primary"
v-close-popup
/>
<q-btn
ref="accept"
flat
no-caps
:label="$t('Accept')"
type="submit"
color="primary"

2
src/components/ClockSignalSourceDialog.vue
View File

@ -415,6 +415,7 @@
<q-btn
:loading="loading"
flat
no-caps
:label="$t('close and reset')"
color="primary"
v-close-popup
@ -422,6 +423,7 @@
<q-btn
ref="accept"
flat
no-caps
:label="$t('close and save')"
:loading="loading"
type="submit"

1
src/components/RegisterDialog.vue
View File

@ -352,6 +352,7 @@
<q-btn
ref="accept"
flat
no-caps
:label="$t('register')"
:loading="loading"
:disable="loading"

16
src/components/SignalSourceDialog.vue
View File

@ -331,6 +331,7 @@ import TimerSignalSourceDialog from "src/components/TimerSignalSourceDialog.vue"
import FileEntity from "src/entities/FileEntity";
import FileSuffixHelper from "src/common/FileSuffixHelper";
import { Protocol } from "src/entities/WSProtocol";
export default defineComponent({
name: "ComponentSignalSourceDialog",
@ -391,16 +392,23 @@ export default defineComponent({
label: $t.t("clock"),
value: "EwindowType::Clock",
},
{
label: $t.t("weather"),
value: "EwindowType::Weather",
},
{
label: $t.t("timer"),
value: "EwindowType::Timer",
},
];
if (
($store.state.device_attribute & Protocol.EDeviceAttribute.CustomISV) !=
0
) {
signal_source_options.push({
label: $t.t("weather"),
value: "EwindowType::Weather",
});
}
const tree_nodes = computed({
get: () => $store.state.signal_source_tree,
set: (val) => {},

3
src/components/SystenSettingAdvancedNetworkDialog.vue
View File

@ -97,6 +97,7 @@
<q-btn
flat
color="primary"
no-caps
:label="$t('add row')"
class="col-2"
@click="advance_ip_addRow"
@ -104,6 +105,7 @@
<q-btn
:disable="advance_ip_table_selected.length == 0"
flat
no-caps
color="primary"
:label="$t('edit row')"
class="col-2"
@ -112,6 +114,7 @@
<q-btn
:disable="advance_ip_table_selected.length == 0"
flat
no-caps
color="primary"
:label="$t('delete row')"
class="col-2"

2
src/components/TimerSignalSourceDialog.vue
View File

@ -332,6 +332,7 @@
<q-btn
:loading="loading"
flat
no-caps
:label="$t('close and reset')"
color="primary"
v-close-popup
@ -339,6 +340,7 @@
<q-btn
ref="accept"
flat
no-caps
:label="$t('close and save')"
:loading="loading"
type="submit"

2
src/components/TimingTaskDialog.vue
View File

@ -17,7 +17,7 @@
<div class="row">
<div class="col-auto text-h6">
{{ type == 1 ? $t("add") : type == 2 ? $t("edit") : $t("view")
}}{{ $t("timing task") }}
}}{{ $t(" ") }}{{ $t("timing task") }}
</div>
<q-space />
<div>

2
src/components/WeatherSignalSourceDialog.vue
View File

@ -192,6 +192,7 @@
<q-btn
:loading="loading"
flat
no-caps
:label="$t('close and reset')"
color="primary"
v-close-popup
@ -199,6 +200,7 @@
<q-btn
ref="accept"
flat
no-caps
:label="$t('close and save')"
:loading="loading"
type="submit"

61
src/i18n/en-US/index.ts
View File

@ -2,6 +2,7 @@
// so you can safely delete all default props below
export default {
" ": " ",
title: "MediaPlayerWebAPP",
failed: " failed",
success: " successful",
@ -24,7 +25,7 @@ export default {
"edit window rect": "Window Size Adjust",
"set the window rectangle beyond the desktop rectangle, the window rectangle will be clipped, are you sure to use this window rectangle":
"if the window size exceeds the desktop size, the window size will be clipped. Are you sure to use this window size",
hour_2_: "hour",
hour_2_: "Hour",
"system setting": "System",
"grid setting": "Layout",
subtitle: "OSD",
@ -98,6 +99,8 @@ export default {
"polling data": "Loop Signal Data",
delay: "Delay",
"add row": "Add Row",
"edit row": "Edit Row",
"delete row": "Delete Row",
"new polling": "New Loop Signal",
"add mode": "Add Mode",
"edit mode": "Edit Mode",
@ -198,4 +201,60 @@ export default {
usb8: "usb8",
usb9: "usb9",
"device standby mode": "Device Standby Mode",
"server ip address": "Server Ip Address",
"please input server ip address": "Please Input Server Ip Address",
"user name": "User Name",
"please input user name": "Please Input User Name",
password: "Password",
"please input password": "Please Input Password",
"remember password": "Remember Password",
"auto login": "Auto Login",
login: "Login",
"register dialog": "Register Dialog",
registered: "Registered",
"register date": "Register Date",
"register code": "Register Code",
"active code": "Active Code",
register: "Register",
"http url": "Htpp Url",
image: "Image",
rtsp: "RTSP",
clock: "Clock",
weather: "Weather",
timer: "Timer",
"clock setting": "Clock Setting",
"weather setting": "Weather Setting",
"timer setting": "Timer Setting",
"clock type": "Clock Type",
"font size": "Font Size",
"font color": "Font Color",
"background color": "Background Color",
"date format": "Date Format",
"time format": "Time Format",
text: "Text",
date: "Date",
week: "Week",
"background transparent": "Background Transparent",
"multiple lines": "Multiple Lines",
"font bold": "Font Bold",
"auto location": "Auto Location",
location: "Location",
city_province: "Province",
city_city: "City",
city_area: "Area",
"timer type": "Timer Type",
"forward timer": "Forward Timer",
"backward timer": "Backward Timer",
"timer mode": "Timer Mode",
"relative time": "Relative Time",
duration: "Duration",
second: "Second",
minute: "Minute",
hour: "Hour",
day: "Day",
"new task": "New Task",
"advanced network setting": "Advanced Network Setting",
"network disconnect!": "Network Disconnect!",
"wait reconnection": "Wait Reconnection",
"back to login page": "Back To Login Page",
};

1
src/i18n/zh-CN/index.ts
View File

@ -2,6 +2,7 @@
// so you can safely delete all default props below
export default {
" ": "",
title: "MediaPlayerWebApp",
failed: "失败",
fail: "失败",

1
src/pad/Login.vue
View File

@ -221,6 +221,7 @@
class="text-h5"
style="width: 60%"
color="accent"
no-caps
:loading="data.loading"
:label="$t('login')"
rounded

15
src/pad/TopToolbar.vue
View File

@ -190,7 +190,12 @@
{{ $t("background image setting") }}
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="switchLanguage">
<q-item
clickable
v-close-popup
@click="switchLanguage"
v-if="!is_custon_isv"
>
<q-item-section avatar>
<q-icon name="img:pad/toolbar/cn_en.png" />
</q-item-section>
@ -249,6 +254,7 @@ import SystemSettingDialog from "src/components/SystemSettingDialog.vue";
import GlobalData from "src/common/GlobalData";
import { Protocol } from "src/entities/WSProtocol";
import { component } from "v-viewer";
export default defineComponent({
name: "PadTopToolbarPage",
@ -278,17 +284,24 @@ export default defineComponent({
0
);
const is_custon_isv = ref(
($store.state.device_attribute & Protocol.EDeviceAttribute.CustomISV) != 0
);
watch(
() => $store.state.device_attribute,
(value) => {
function_center_control.value =
(value & Protocol.EDeviceAttribute.CenterControl) != 0;
is_custon_isv.value =
(value & Protocol.EDeviceAttribute.CustomISV) != 0;
}
);
return {
plan_running,
function_center_control,
is_custon_isv,
window_rect_edit_dialog,
toogleFullScreen() {

1
src/pages/Login.vue
View File

@ -175,6 +175,7 @@
class="full-width text-h6"
:loading="data.loading"
:label="$t('login')"
no-caps
style="
background: #273de4;
box-shadow: 0 4px 6px 0px rgb(39 60 228 / 40%);

15
src/pages/TopToolBar.vue
View File

@ -300,7 +300,12 @@
{{ $t("upgrade") }}
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="switchLanguage">
<q-item
clickable
v-close-popup
@click="switchLanguage"
v-if="!is_custon_isv"
>
<q-item-section avatar>
<!-- <q-icon name="info_outline" /> -->
<q-icon name="translate" />
@ -313,6 +318,7 @@
clickable
v-close-popup
@click="$refs.register_dialog.showDialog()"
v-if="$store.state.factory_mode"
>
<q-item-section avatar>
<!-- <q-icon name="devices" /> -->
@ -455,6 +461,10 @@ export default defineComponent({
0
);
const is_custon_isv = ref(
($store.state.device_attribute & Protocol.EDeviceAttribute.CustomISV) != 0
);
const window_rect_edit_dialog: Ref<any> = ref(null);
const plan_running = computed(
@ -525,6 +535,8 @@ export default defineComponent({
(value) => {
function_center_control.value =
(value & Protocol.EDeviceAttribute.CenterControl) != 0;
is_custon_isv.value =
(value & Protocol.EDeviceAttribute.CustomISV) != 0;
}
);
@ -534,6 +546,7 @@ export default defineComponent({
edge_blending_dialog,
register_dialog,
function_center_control,
is_custon_isv,
window_rect_edit_dialog,
async backupDB() {

9
src/store/index.ts
View File

@ -36,6 +36,7 @@ export interface StateInterface {
// Declared as unknown to avoid linting issue. Best to strongly type as per the line above.
initialized: boolean;
advanced_debug: boolean;
factory_mode: boolean;
signal_source_tree: SignalSourceTreeItemEntity[];
polling_tree: PollingTreeItemEntity[];
mode_tree: ModeTreeItemEntity[];
@ -285,6 +286,7 @@ export default store(function (/* { ssrContext } */) {
// state
initialized: false,
advanced_debug: false,
factory_mode: false,
signal_source_tree: [],
polling_tree: [],
mode_tree: [],
@ -338,6 +340,13 @@ export default store(function (/* { ssrContext } */) {
}
state.advanced_debug = playload;
},
setFactoryMode(state: StateInterface, playload?: any) {
if (playload || playload == "true") {
console.log("factory", playload);
state.advanced_debug = playload;
}
state.factory_mode = playload;
},
setArrayValue(state: StateInterface, playload?: any) {
if (Array.isArray(playload.value)) {
const arr: Array<any> = (<any>state)[playload.name];