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

src/components/SystemSettingDialog.vue

@@ -62,7 +62,8 @@
           <q-tab
             v-if="
               $store.state.advanced_debug ||
-              (!$store.state.custom_defines.is_custom_isv &&
+              /*!$store.state.custom_defines.is_custom_isv */ (!$store.state
+                .custom_defines.function_output_board &&
                 $store.state.isLedPlayer())
             "
             name="graphics"

src/i18n/zh-CN/index.ts

@@ -556,7 +556,7 @@ export default {
     "启用镜像输出后第二个输出可能需要等待1~2分钟才会有画面!",
   "i have known": "我已知晓",
   "output setting": "输出设置",
-  language: "中文",
+  language: "语言",
   english: "英文",
   chinese: "中文",
   "hour mark color": "时标",

src/pages/custom/ISVTopToolBar.vue

@@ -1,6 +1,10 @@
 <template>
   <div>
-    <q-toolbar style="background-color: #3e9acd" class="shadow-2 text-white" @dragstart.prevent>
+    <q-toolbar
+      style="background-color: #3e9acd"
+      class="shadow-2 text-white"
+      @dragstart.prevent
+    >
       <q-btn-dropdown
         stretch
         no-caps
@@ -46,6 +50,7 @@
       />
 
       <q-btn
+        v-if="$store.state.custom_defines.function_output_board"
         stretch
         no-caps
         :disable="!$store.state.power_state"
@@ -58,6 +63,20 @@
       />
 
       <q-btn
+        stretch
+        no-caps
+        v-else
+        :disable="!$store.state.power_state"
+        flat
+        stack
+        icon="img:new_icon/full_screen_icon.png"
+        class="q-mr-sm"
+        :label="$t('full screen window')"
+        @click="fullscreenWindow"
+      />
+
+      <q-btn
+        v-if="$store.state.custom_defines.function_output_board"
         stretch
         no-caps
         :disable="!$store.state.power_state"
@@ -68,6 +87,18 @@
         class="q-mr-sm"
         @click="switchOutputBoardState"
       />
+      <q-btn
+        stretch
+        no-caps
+        v-else
+        :disable="!$store.state.power_state"
+        flat
+        stack
+        icon="img:new_icon/exit_full_screen_icon.png"
+        class="q-mr-sm"
+        :label="$t('restore window size')"
+        @click="exitFullscreenWindow"
+      />
 
       <q-btn
         stretch
@@ -194,7 +225,11 @@
         :label="$t('other setting')"
         class="q-mr-sm"
       >
-        <q-list style="background-color: #3e9acd" class="shadow-2 text-white" @dragstart.prevent>
+        <q-list
+          style="background-color: #3e9acd"
+          class="shadow-2 text-white"
+          @dragstart.prevent
+        >
           <q-item
             clickable
             v-close-popup
@@ -293,6 +328,20 @@
               {{ $t("about") }}
             </q-item-section>
           </q-item>
+          <q-item
+            clickable
+            v-if="$store.state.factory_mode"
+            v-close-popup
+            @click="$refs.register_dialog.showDialog()"
+          >
+            <q-item-section avatar>
+              <!-- <q-icon name="devices" /> -->
+              <q-icon name="lock_open" />
+            </q-item-section>
+            <q-item-section>
+              {{ $t("register device") }}
+            </q-item-section>
+          </q-item>
           <q-item
             v-if="$store.state.advanced_debug"
             clickable