Merge pull request #368 from woniuxingdong/master

caorushizi · Dec 12, 2024 · f41ba42 · f41ba42
2 parents 68fa822 + 998e24d
commit f41ba42
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 3 deletions.
diff --git a/packages/main/src/controller/HomeController.ts b/packages/main/src/controller/HomeController.ts
@@ -173,6 +173,10 @@ export default class HomeController implements Controller {
     if (key === "allowBeta") {
       this.updater.changeAllowBeta(val);
     }
+    // audio muted mode
+    if (key === "audioMuted") {
+      this.webviewService.setAudioMuted(val);
+    }
 
     this.store.set(key, val);
   }

diff --git a/packages/main/src/main.d.ts b/packages/main/src/main.d.ts
@@ -62,6 +62,8 @@ declare interface AppStore {
   allowBeta: boolean;
   // 关闭主窗口
   closeMainWindow: boolean;
+  // 浏览器中是否播放声音，默认静音
+  audioMuted: boolean;
 }
 
 declare interface BrowserStore {

diff --git a/packages/main/src/services/WebviewService.ts b/packages/main/src/services/WebviewService.ts
@@ -63,9 +63,8 @@ export default class WebviewService {
       },
     });
     this.view.setBackgroundColor("#fff");
-    this.view.webContents.setAudioMuted(true);
-
-    const { isMobile } = this.store.store;
+    const { isMobile, audioMuted } = this.store.store;
+    this.setAudioMuted(audioMuted);
     this.setUserAgent(isMobile);
 
     this.view.webContents.on("dom-ready", this.onDomReady);
@@ -305,6 +304,12 @@ export default class WebviewService {
     this.logger.info(`[AdBlocker] disable`);
   }
 
+  setAudioMuted(audioMuted?: boolean) {
+    if (!this.view) return;
+    this.view.webContents.setAudioMuted(audioMuted? true: false);
+    this.logger.info(`Play audio: ${!audioMuted}`);
+  }
+
   setUserAgent(isMobile?: boolean) {
     if (!this.view) return;
     if (isMobile) {

diff --git a/packages/main/src/vendor/ElectronStore.ts b/packages/main/src/vendor/ElectronStore.ts
@@ -33,6 +33,7 @@ export default class StoreService extends Store<AppStore> implements Vendor {
         autoUpgrade: true,
         allowBeta: false,
         closeMainWindow: false,
+        audioMuted: true,
       },
     });
   }

diff --git a/packages/renderer/src/i18n/index.ts b/packages/renderer/src/i18n/index.ts
@@ -139,6 +139,7 @@ Referer: http://www.example.com`,
           numberOfEpisodes: "Number of episodes",
           showNumberOfEpisodes: "Show number of episodes",
           canUseMouseWheelToAdjust: "Can use mouse wheel to adjust",
+          audioMuted: "Audio Muted Mode",
           openBrowser: "Open Browser",
           privacy: "Privacy Mode",
           privacyTooltip:
@@ -300,6 +301,7 @@ Referer: http://www.example.com`,
           numberOfEpisodes: "集数",
           showNumberOfEpisodes: "显示集数",
           canUseMouseWheelToAdjust: "可以使用鼠标滚轮调整",
+          audioMuted: "静音模式",
           openBrowser: "打开浏览器",
           privacy: "隐私模式",
           privacyTooltip: "打开开关后浏览器将不保存任何数据",

diff --git a/packages/renderer/src/pages/SettingPage/index.tsx b/packages/renderer/src/pages/SettingPage/index.tsx
@@ -287,6 +287,9 @@ const SettingPage: React.FC = () => {
           </Form.Item>
         </GroupWrapper>
         <GroupWrapper hidden={isWeb} title={t("browserSetting")}>
+          <Form.Item label={t("audioMuted")} name="audioMuted">
+            <Switch />
+          </Form.Item>
           <Form.Item label={t("openInNewWindow")} name="openInNewWindow">
             <Switch />
           </Form.Item>

diff --git a/packages/renderer/src/renderer.d.ts b/packages/renderer/src/renderer.d.ts
@@ -82,6 +82,8 @@ declare interface AppStore {
   downloadProxySwitch?: boolean;
   // 自动更新
   autoUpgrade?: boolean;
+  // 浏览器中是否播放声音，默认静音
+  audioMuted?: boolean;
 }
 
 declare interface BrowserStore {

diff --git a/packages/renderer/src/store/appSlice.ts b/packages/renderer/src/store/appSlice.ts
@@ -20,6 +20,7 @@ const initialState: AppStore = {
   machineId: "",
   downloadProxySwitch: false,
   autoUpgrade: true,
+  audioMuted: true,
 };
 
 export const appSlice = createSlice({