添加融合选项在高级调试和在线注册

src/components/AdvancedDebugDialog.vue

@@ -87,7 +87,7 @@
               <q-item-section>
                 <q-checkbox
                   v-model="function_magic_wall"
-
+                  @update:model-value="changeMagic()"
                   :label="$t('magic wall')"
                   color="cyan"
                   class="offset-md-1 col"
@@ -95,6 +95,18 @@
                   :disable="loading"
                 />
               </q-item-section>
+              <q-item-section>
+                <q-checkbox
+                  v-model="function_fusion"
+                  @update:model-value="changeFusion()"
+                  :label="$t('fusion')"
+                  color="cyan"
+                  class="offset-md-1 col"
+                  :loading="loading"
+                  :disable="loading"
+
+                />
+              </q-item-section>
               <q-item-section avatar>
                 <q-btn
                   @click="setDeviceAttribute"
@@ -214,6 +226,9 @@ export default defineComponent({
     const function_magic_wall = ref(
       $store.state.custom_defines.function_magic_wall
     );
+    const function_fusion = ref(
+      $store.state.custom_defines.function_magic_wall
+    );
     const target_language = ref("zh-CN");
 
     return {
@@ -223,6 +238,7 @@ export default defineComponent({
       function_output_board,
       function_custom_ISV,
       function_magic_wall,
+      function_fusion,
       function_mirroring_output,
       target_language,
 
@@ -238,6 +254,8 @@ export default defineComponent({
           $store.state.custom_defines.function_mirroring_output;
         function_magic_wall.value =
           $store.state.custom_defines.function_magic_wall;
+          function_fusion.value =
+          $store.state.custom_defines.function_fusion;
       },
       resetData() {
         loading.value = false;
@@ -247,6 +265,7 @@ export default defineComponent({
         function_mirroring_output.value = false;
         function_custom_ISV.value = false;
         function_magic_wall.value=false;
+        function_fusion.value=false
       },
 
       restartDevice() {
@@ -342,6 +361,9 @@ export default defineComponent({
         if (function_magic_wall.value) {
             attribute |= EDeviceAttribute.ProductMagicWall;
         }
+        if (function_fusion.value) {
+            attribute |= EDeviceAttribute.ProductFusion;
+        }
 
         GlobalData.getInstance()
           .getCurrentClient()
@@ -367,6 +389,16 @@ export default defineComponent({
           timeout: 1500,
         });
       },
+      changeMagic(){
+        if(function_magic_wall.value){
+          function_fusion.value=false;
+        }
+      },
+      changeFusion(){
+        if(function_fusion.value){
+          function_magic_wall.value=false;
+        }
+      }
     };
   },
 });

src/components/RegisterDialog.vue

@@ -304,14 +304,23 @@
                     :disable="loading"
                   />
                   <q-checkbox
-                  v-model="function_magic_wall"
+                    v-model="function_magic_wall"
-
+                    @update:model-value="changeMagic()"
-                  :label="$t('magic wall')"
+                    :label="$t('magic wall')"
-                  color="cyan"
+                    color="cyan"
-                  class="offset-md-1 col"
+                    class="offset-md-1 col"
-                  :loading="loading"
+                    :loading="loading"
-                  :disable="loading"
+                    :disable="loading"
-                />
+                  />
+                  <q-checkbox
+                    v-model="function_fusion"
+                  @update:model-value="changeFusion()"
+                    :label="$t('fusion')"
+                    color="cyan"
+                    class="offset-md-1 col"
+                    :loading="loading"
+                    :disable="loading"
+                  />
                 </div>
               </q-item-section>
             </q-item>
@@ -429,6 +438,7 @@ export default defineComponent({
     const function_mirroring_output = ref(false);
     const function_custom_ISV = ref(false);
     const function_magic_wall = ref(false);
+    const function_fusion = ref(false);
 
     const trial_days = ref(0);
     const last_days = ref(0);
@@ -451,7 +461,8 @@ export default defineComponent({
       function_output_board.value = false;
       function_mirroring_output.value = false;
       function_custom_ISV.value = false;
-      function_magic_wall.value=false;
+      function_magic_wall.value = false;
+      function_fusion.value = false;
     };
 
     const showDialog = async () => {
@@ -483,9 +494,9 @@ export default defineComponent({
         $store.state.custom_defines.function_output_board;
       function_mirroring_output.value =
         $store.state.custom_defines.function_mirroring_output;
-      const function_magic_wall = ref(
+      function_magic_wall.value =
-      $store.state.custom_defines.function_magic_wall
+        $store.state.custom_defines.function_magic_wall;
-    );
+      function_magic_wall.value = $store.state.custom_defines.function_fusion;
     };
 
     return {
@@ -508,6 +519,7 @@ export default defineComponent({
       function_output_board,
       function_custom_ISV,
       function_magic_wall,
+      function_fusion,
       function_center_control,
       function_mirroring_output,
       target_language,
@@ -637,8 +649,12 @@ export default defineComponent({
               attribute |= EDeviceAttribute.CustomISV;
             }
             if (function_magic_wall.value) {
-            attribute |= EDeviceAttribute.ProductMagicWall;
+              attribute |= EDeviceAttribute.ProductMagicWall;
-        }
+
+            }
+            if (function_fusion.value) {
+                attribute |= EDeviceAttribute.ProductFusion;
+              }
 
             GlobalData.getInstance()
               .getCurrentClient()
@@ -683,6 +699,16 @@ export default defineComponent({
           )
         );
       },
+      changeMagic(){
+        if(function_magic_wall.value){
+          function_fusion.value=false;
+        }
+      },
+      changeFusion(){
+        if(function_fusion.value){
+          function_magic_wall.value=false;
+        }
+      }
     };
   },
 });

src/entities/EDeviceAttribute.ts

@@ -23,7 +23,7 @@ export enum EDeviceAttribute {
   Reserve19 = 0x00080000,
   Reserve20 = 0x00100000,
   ProductMagicWall = 0x00200000,
-  Reserve22 = 0x00400000,
+  ProductFusion = 0x00400000,
   Reserve23 = 0x00800000,
   Reserve24 = 0x01000000,
   Reserve25 = 0x02000000,

src/i18n/en-US/index.ts

@@ -406,6 +406,7 @@ export default {
   "Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080":
     "Please Input Vaild Host. Example: 192.168.1.1 or 192.168.1.1:8080",
   "equipment data": "Equipment Data",
+  "fusion":"Fusion",
   "fusion settings": "fusion settings",
   FusionLocale: "Fusion Locale",
   FourPointCalibration: "Four Pint Calibration",

src/i18n/zh-CN/index.ts

@@ -673,6 +673,7 @@ export default {
   "Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080":
     "请输入合法地址. 例: 192.168.1.1 或 192.168.1.1:8080",
   "equipment data": "联动设备",
+  "fusion":"融合",
   "fusion settings": "融合设置",
   FusionLocale: "融合区域设置",
   FourPointCalibration: "四点校正",

src/pages/TopToolBar.vue

@@ -331,7 +331,7 @@
           >
             <q-item-section avatar>
               <!-- <q-icon name="image" /> -->
-              <q-icon name="img:new_icon/file_manager.png" />
+              <q-icon name="web" />
             </q-item-section>
             <q-item-section>
               {{ $t("magic wall") }}
@@ -440,6 +440,24 @@
             </q-item-section>
           </q-item>
 
+          <q-item
+            clickable
+            v-close-popup
+            @click="
+              $refs.fusion_settings_dialog.showDialog();
+              getconfig();
+            "
+             v-if="$store.state.custom_defines.function_fusion"
+          >
+            <q-item-section avatar>
+              <q-icon name="open_with" />
+            </q-item-section>
+            <q-item-section>
+              {{ $t("fusion settings") }}
+            </q-item-section>
+          </q-item>
+
+
           <q-item
             clickable
             v-close-popup
@@ -627,7 +645,7 @@ export default defineComponent({
       let wendu: any = $store.state.fan_temp.toFixed(1);
       let sulv: any = 1 - wendu / 150;
       return "rotate " + sulv + "s linear infinite";
-    });    
+    });
     const checkRegistered = () => {
       if (
         GlobalData.getInstance().getCurrentClient()?.is_connected &&

src/store/index.ts

@@ -37,7 +37,8 @@ export class CustomDefines {
   function_output_board = false;
   function_center_control = false;
   function_mirroring_output = false;
-  function_magic_wall=false;
+  function_magic_wall = false;
+  function_fusion = false;
 }
 
 export interface IWuJieEventBus {
@@ -112,7 +113,7 @@ export interface StateInterface {
   device_attribute: number;
   power_state: boolean;
   product_name: string;
-  show_monitor_list:test_monitor[];
+  show_monitor_list: test_monitor[];
   custom_defines: CustomDefines;
   fusion_configuration: object;
   isLedPlayer: () => boolean;
@@ -381,7 +382,7 @@ export default store(function (/* { ssrContext } */) {
       power_state: false,
       fusion_configuration: {},
       product_name: EProductNames.LED_PLAYER,
-      show_monitor_list:[],
+      show_monitor_list: [],
       custom_defines: new CustomDefines(),
       selected_projector: "0/0",
       EnableBlending: false,
@@ -439,6 +440,8 @@ export default store(function (/* { ssrContext } */) {
             (state.device_attribute & EDeviceAttribute.MirroringOutput) != 0;
           state.custom_defines.function_magic_wall =
             (state.device_attribute & EDeviceAttribute.ProductMagicWall) != 0;
+          state.custom_defines.function_fusion =
+            (state.device_attribute & EDeviceAttribute.ProductFusion) != 0;
         }
       },
       setAvancedDebug(state: StateInterface, playload?: any) {
@@ -513,7 +516,7 @@ export default store(function (/* { ssrContext } */) {
                   Math.round(Math.random() * window_color_list.length),
                   1
                 )[0];
-              } catch {}
+              } catch { }
             }
           }
         }
@@ -534,7 +537,7 @@ export default store(function (/* { ssrContext } */) {
               Math.round(Math.random() * window_color_list.length - 1),
               1
             )[0];
-          } catch {}
+          } catch { }
           state.windows.push(playload);
           state.windows_sort.push(playload.uuid);
         }
@@ -639,7 +642,7 @@ export default store(function (/* { ssrContext } */) {
       setDeviceScreenConnectState(state: StateInterface, playload?: any) {
         try {
           state.device_screen_connect_state = JSON.parse(playload);
-        } catch {}
+        } catch { }
       },
       // signal source
       setSignalSourceTree(