diff --git a/package.json b/package.json index 96661b3..35e3444 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "media_player_client", - "version": "1.4.16", + "version": "1.4.17", "description": "A Quasar Framework app", "productName": "MediaPlayerClient", "author": "fangxiang ", diff --git a/src/components/AdvancedIpAddressDialog.vue b/src/components/AdvancedIpAddressDialog.vue new file mode 100644 index 0000000..21e314e --- /dev/null +++ b/src/components/AdvancedIpAddressDialog.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/src/components/ClockSignalSourceDialog.vue b/src/components/ClockSignalSourceDialog.vue index 364eec2..7a4f61e 100644 --- a/src/components/ClockSignalSourceDialog.vue +++ b/src/components/ClockSignalSourceDialog.vue @@ -546,7 +546,7 @@ export default defineComponent({ ); _resolove(JSON.stringify(clock_entity.value)); } catch { - _resolove(); + _resolove(null); } } show_dialog.value = false; diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index ae2c69a..20802f1 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -87,7 +87,7 @@ - + @@ -171,6 +171,46 @@ /> + + {{ + $t("dns server") + "1:" + }} + + + + + + {{ + $t("dns server") + "2:" + }} + + + + {{ $t("mac address") + ":" @@ -194,6 +234,19 @@ /> + + + + + + @@ -963,6 +1016,9 @@ + + + diff --git a/src/entities/AdvancedNetworkDialogEntity.ts b/src/entities/AdvancedNetworkDialogEntity.ts new file mode 100644 index 0000000..c96f742 --- /dev/null +++ b/src/entities/AdvancedNetworkDialogEntity.ts @@ -0,0 +1,11 @@ +export class AdvancedIpEntity { + ip_address = ""; + net_mask = ""; + dns1 = ""; + dns2 = ""; +} + +export class AdvancedNetworkDialogEntity { + ip_address_list: AdvancedIpEntity[] = []; + gateway_list: string[] = []; +} diff --git a/src/entities/ApplicationConfigEntity.ts b/src/entities/ApplicationConfigEntity.ts index 8649a0a..9d80347 100644 --- a/src/entities/ApplicationConfigEntity.ts +++ b/src/entities/ApplicationConfigEntity.ts @@ -4,6 +4,8 @@ export default class ApplicationConfigEntity { gateway: string = ""; mac_address: string = ""; subnet_mask: string = ""; + dns1 = ""; + dns2 = ""; use_ntp: string = ""; ntp_server: string = ""; ntp_sync_delay: string = ""; diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts index 1d694e2..4cea540 100644 --- a/src/entities/WSProtocol.ts +++ b/src/entities/WSProtocol.ts @@ -1687,6 +1687,8 @@ export namespace Protocol { ip_address: string = "192.168.1.68"; gateway: string = "192.168.1.1"; net_mask: string = "255.255.255.0"; + dns1: string = ""; + dns2: string = ""; mac_address: string = "04:D9:F5:D3:F4:C5"; constructor(rcp_id?: number) { @@ -2700,6 +2702,8 @@ export namespace Protocol { ip_address = "192.168.1.1"; gateway = "192.168.1.1"; net_mask = "192.168.1.1"; + dns1 = ""; + dns2 = ""; mac_address = "AA:BB:CC:DD:EE:FF"; } diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index a7a1039..b7665db 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -586,4 +586,10 @@ export default { "time format error": "时间格式错误", "input new file name": "输入新文件名", "number must be greater than or equal to ": "数字必须大于等于 ", + advanced: "高级", + "dns server": "DNS服务器", + "edit row": "编辑行", + "already existed": "已经存在", + "please input gateway": "请输入网关", + "advanced network setting": "高级网络设置", };