Merge branch 'new_board'

This commit is contained in:
fangxiang 2022-12-30 09:56:16 +08:00
commit 53e0dde532
6 changed files with 139 additions and 0 deletions

View File

@ -1279,6 +1279,16 @@ export default class ClientConnection {
} }
} }
public async setHdmiInAudioDevice(index: number, type: string) {
try {
return await this.doRpc<Protocol.SetHdmiInAudioDeviceResponseEntity>(
new Protocol.SetHdmiInAudioDeviceRequestEntity(index, type)
);
} catch (e) {
console.error(e);
}
}
public async getCityList(language?: string) { public async getCityList(language?: string) {
try { try {
return await this.doRpc<Protocol.GetCityListResponseEntity>( return await this.doRpc<Protocol.GetCityListResponseEntity>(

View File

@ -116,6 +116,53 @@
</q-list> </q-list>
</q-menu> </q-menu>
</q-item> </q-item>
<q-item
clickable
v-ripple
v-if="
hw_version == 2 &&
prop.node.item_data?.window_type == 'EwindowType::HdmiIn'
"
>
<q-item-section>
{{ $t("hdmi audio frequency acquisition device") }}
</q-item-section>
<q-item-section side>
<q-icon name="keyboard_arrow_right" />
</q-item-section>
<q-menu
@before-show="updateCurrentHdmiAudioDevice"
anchor="top end"
self="top start"
>
<q-list>
<q-item
v-close-popup
v-for="item in [
{
label: 'hdmi internal',
value: '',
},
{
label: '3.5mm',
value: '3.5mm',
},
]"
:key="item.value"
clickable
@click="setHdmiInAudioDevice(1, item.value)"
>
<q-item-section>{{ $t(item.label) }}</q-item-section>
<q-item-section side>
<q-icon
v-if="item.value == current_hdmi_audio_device"
name="done"
/>
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-item>
<q-item <q-item
v-if=" v-if="
@ -242,10 +289,12 @@ export default defineComponent({
const $t = useI18n(); const $t = useI18n();
const lossy_pic = ref(false); const lossy_pic = ref(false);
const hw_version = ref(1);
const content_height = ref(0); const content_height = ref(0);
const current_hdmi_rotation = ref(0); const current_hdmi_rotation = ref(0);
const current_hdmi_audio_device = ref("");
const refresh_content_height = () => { const refresh_content_height = () => {
content_height.value = window.innerHeight - 135; content_height.value = window.innerHeight - 135;
@ -276,6 +325,8 @@ export default defineComponent({
content_height, content_height,
lossy_pic, lossy_pic,
current_hdmi_rotation, current_hdmi_rotation,
hw_version,
current_hdmi_audio_device,
loga(a: any) { loga(a: any) {
console.log(a); console.log(a);
@ -443,6 +494,15 @@ export default defineComponent({
lossy_pic.value = lossy_pic.value =
GlobalData.getInstance().applicationConfig?.hdmi_in_decode_type_1 == GlobalData.getInstance().applicationConfig?.hdmi_in_decode_type_1 ==
"NV12"; "NV12";
const num = parseInt(
GlobalData.getInstance().applicationConfig?.hw_version ?? "1"
);
if (isNaN(num)) {
hw_version.value = 1;
} else {
hw_version.value = num;
}
}, },
async setHdmiInDecodeType(index: number, type: string) { async setHdmiInDecodeType(index: number, type: string) {
let success = false; let success = false;
@ -468,6 +528,39 @@ export default defineComponent({
current_hdmi_rotation.value = current_hdmi_rotation.value =
GlobalData.getInstance().applicationConfig?.device_hdmi_rotation ?? 0; GlobalData.getInstance().applicationConfig?.device_hdmi_rotation ?? 0;
}, },
updateCurrentHdmiAudioDevice() {
current_hdmi_audio_device.value =
GlobalData.getInstance().applicationConfig?.hdmi_in_audio_device_1 ??
"";
switch (current_hdmi_audio_device.value) {
case "":
case "3.5mm":
break;
default:
current_hdmi_audio_device.value = "";
break;
}
},
async setHdmiInAudioDevice(index: number, device: string) {
let success = false;
const response = await GlobalData.getInstance()
.getCurrentClient()
?.setHdmiInAudioDevice(index, device);
if (response) {
success = response.success;
}
$q.notify({
color: success ? "positive" : "negative",
icon: success ? "done" : "warning",
message:
$t.t("set") + (success ? $t.t("success") : $t.t("fail")) + "!",
position: "top",
timeout: 1500,
});
},
setHDMIRotation(rotation: number) { setHDMIRotation(rotation: number) {
let success = true; let success = true;
try { try {

View File

@ -34,6 +34,8 @@ export default class ApplicationConfigEntity {
runtime_os: string = ""; runtime_os: string = "";
registered: boolean = false; registered: boolean = false;
hdmi_in_decode_type_1: string | undefined; hdmi_in_decode_type_1: string | undefined;
hdmi_in_audio_device_1: string | undefined;
hw_version: string | undefined;
device_hdmi_output_count = 1; device_hdmi_output_count = 1;
video_suffix_filter: string | null = ""; video_suffix_filter: string | null = "";
image_suffix_filter: string | null = ""; image_suffix_filter: string | null = "";

View File

@ -474,6 +474,9 @@ export namespace Protocol {
public static get kSetHDMIRotation() { public static get kSetHDMIRotation() {
return Commands.PROTOCOL_PREFIX + "SetHDMIRotation"; return Commands.PROTOCOL_PREFIX + "SetHDMIRotation";
} }
public static get kRpcSetHdmiInAudioDevice() {
return Commands.PROTOCOL_PREFIX + "RpcSetHdmiInAudioDevice";
}
public static get kRpcSetMagicWallConfig() { public static get kRpcSetMagicWallConfig() {
return Commands.PROTOCOL_PREFIX + "RpcSetMagicWallConfig"; return Commands.PROTOCOL_PREFIX + "RpcSetMagicWallConfig";
@ -616,6 +619,7 @@ export namespace Protocol {
Commands.kRpcDeleteJointActionEquipment, Commands.kRpcDeleteJointActionEquipment,
Commands.kCleanBrowserCache, Commands.kCleanBrowserCache,
Commands.kSetHDMIRotation, Commands.kSetHDMIRotation,
Commands.kRpcSetHdmiInAudioDevice,
Commands.kRpcGetMagicWallConfig, Commands.kRpcGetMagicWallConfig,
Commands.kRpcSetMagicWallConfig, Commands.kRpcSetMagicWallConfig,
Commands.kRpcTestA, Commands.kRpcTestA,
@ -2919,6 +2923,30 @@ export namespace Protocol {
note = ""; note = "";
} }
export class SetHdmiInAudioDeviceRequestEntity extends PacketEntity {
constructor(index: number, device: string, rpc_id = 0) {
super();
super.command = Commands.kRpcSetHdmiInAudioDevice;
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
this.index = index ?? 1;
this.device = device ?? "";
}
index: number;
device: string;
note: string = "";
}
export class SetHdmiInAudioDeviceResponseEntity extends PacketEntity {
constructor() {
super();
super.flag = PacketEntity.FLAG_RESPONSE;
}
success = false;
note = "";
}
export class GetCityListRequestEntity extends PacketEntity { export class GetCityListRequestEntity extends PacketEntity {
constructor(language?: string, rpc_id = 0) { constructor(language?: string, rpc_id = 0) {
super(); super();

View File

@ -376,6 +376,10 @@ export default {
"row multiply column should be less than or equal to ": "row multiply column should be less than or equal to ":
"Row Multiply Column Should Be Less Than Or Equal To ", "Row Multiply Column Should Be Less Than Or Equal To ",
"please select window rotation": "Please Select Window Rotation", "please select window rotation": "Please Select Window Rotation",
"hdmi internal": "HDMI Internal",
set: "Set",
"hdmi audio frequency acquisition device":
"HDMI Audio Frequency Acquisition Device",
"send command": "Send Command", "send command": "Send Command",
"please check connection config": "Please Check Connection Config", "please check connection config": "Please Check Connection Config",
"connection setting": "Connection Setting", "connection setting": "Connection Setting",

View File

@ -648,6 +648,8 @@ export default {
"row multiply column should be less than or equal to ": "row multiply column should be less than or equal to ":
"行乘以列的值不能大于", "行乘以列的值不能大于",
"please select window rotation": "请选择窗口旋转", "please select window rotation": "请选择窗口旋转",
"hdmi internal": "HDMI内置",
"hdmi audio frequency acquisition device": "HDMI声音采集设备",
"please check connection config": "请检查连接配置", "please check connection config": "请检查连接配置",
"connection setting": "连接设置", "connection setting": "连接设置",
"connection type": "连接类型", "connection type": "连接类型",