Merge branch 'master' of http://www.cloudview.work/git/fangxiang/media_player_client into 融合

.gitignore

@@ -2,6 +2,7 @@
 .thumbs.db
 node_modules
 .vscode
+.vs
 
 # Quasar core related directories
 .quasar

src/common/ClientConnection.ts

@@ -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) {
     try {
       return await this.doRpc<Protocol.GetCityListResponseEntity>(
@@ -1387,6 +1397,34 @@ export default class ClientConnection {
     );
   }
 
+  public async EnableBlending(
+    enable: boolean
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.EnableBlendingRequestEntity(
+        enable
+      )
+    );
+  }
+
+  public async SetBlendingOverlap(
+    row: number,
+    column: number,
+    location: number,
+    enable: boolean,
+    width: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingOverlapRequestEntity(
+        row,
+        column,
+        location,
+        enable,
+        width
+      )
+    );
+  }
+
   public destory() {
     this.ws?.close();
     if (this.ws) {

src/components/SignalSourceTree.vue

@@ -116,6 +116,53 @@
                   </q-list>
                 </q-menu>
               </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
                 v-if="
@@ -242,10 +289,12 @@ export default defineComponent({
     const $t = useI18n();
 
     const lossy_pic = ref(false);
+    const hw_version = ref(1);
 
     const content_height = ref(0);
 
     const current_hdmi_rotation = ref(0);
+    const current_hdmi_audio_device = ref("");
 
     const refresh_content_height = () => {
       content_height.value = window.innerHeight - 135;
@@ -276,6 +325,8 @@ export default defineComponent({
       content_height,
       lossy_pic,
       current_hdmi_rotation,
+      hw_version,
+      current_hdmi_audio_device,
 
       loga(a: any) {
         console.log(a);
@@ -443,6 +494,15 @@ export default defineComponent({
         lossy_pic.value =
           GlobalData.getInstance().applicationConfig?.hdmi_in_decode_type_1 ==
           "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) {
         let success = false;
@@ -468,6 +528,39 @@ export default defineComponent({
         current_hdmi_rotation.value =
           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) {
         let success = true;
         try {

src/entities/ApplicationConfigEntity.ts

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

src/entities/WSProtocol.ts

@@ -474,6 +474,9 @@ export namespace Protocol {
     public static get kSetHDMIRotation() {
       return Commands.PROTOCOL_PREFIX + "SetHDMIRotation";
     }
+    public static get kRpcSetHdmiInAudioDevice() {
+      return Commands.PROTOCOL_PREFIX + "RpcSetHdmiInAudioDevice";
+    }
 
     public static get kRpcSetMagicWallConfig() {
       return Commands.PROTOCOL_PREFIX + "RpcSetMagicWallConfig";
@@ -499,6 +502,12 @@ export namespace Protocol {
     public static get kSetBlendingGammaParam() {
       return Commands.PROTOCOL_PREFIX + "SetBlendingGammaParam";
     }
+    public static get kEnableBlending() {
+      return Commands.PROTOCOL_PREFIX + "EnableBlending";
+    }
+    public static get kSetBlendingOverlap() {
+      return Commands.PROTOCOL_PREFIX + "SetBlendingOverlap";
+    }
 
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
@@ -616,6 +625,7 @@ export namespace Protocol {
       Commands.kRpcDeleteJointActionEquipment,
       Commands.kCleanBrowserCache,
       Commands.kSetHDMIRotation,
+      Commands.kRpcSetHdmiInAudioDevice,
       Commands.kRpcGetMagicWallConfig,
       Commands.kRpcSetMagicWallConfig,
       Commands.kRpcTestA,
@@ -623,6 +633,8 @@ export namespace Protocol {
       Commands.kSetBlendingAlphaParam,
       Commands.kSetBlendingPowerParam,
       Commands.kSetBlendingGammaParam,
+      Commands.kEnableBlending,
+      Commands.kSetBlendingOverlap,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -2919,6 +2931,30 @@ export namespace Protocol {
     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 {
     constructor(language?: string, rpc_id = 0) {
       super();
@@ -3257,4 +3293,46 @@ export namespace Protocol {
     location = 0; //0：左融合带，1：上融合带，2：右融合带，3：下融合带
     value = 0.0;
   }
+
+  export class EnableBlendingRequestEntity extends PacketEntity {
+    constructor(
+      enable: boolean,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kEnableBlending;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.enable = row ?? false;
+    }
+    enable = false;
+  }
+
+  export class SetBlendingOverlapRequestEntity extends PacketEntity {
+    constructor(
+      row: number,
+      column: number,
+      location: number,
+      enable: boolean,
+      width: number,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kSetBlendingOverlap;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.row = row ?? 0;
+      this.column = column ?? 0;
+      this.location = location ?? 0;
+      this.enable = row ?? false;
+      this.width = width ?? 0;
+    }
+    row = 0;
+    column = 0;
+    location = 0; //0：左融合带，1：上融合带，2：右融合带，3：下融合带
+    enable = false;
+    width = 0;
+  }
 }

src/i18n/en-US/index.ts

@@ -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 ",
   "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",
   "please check connection config": "Please Check Connection Config",
   "connection setting": "Connection Setting",

src/i18n/zh-CN/index.ts

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