From 70049a660d5b010b1118d26d4b54aec293263ec8 Mon Sep 17 00:00:00 2001 From: phobal Date: Sat, 5 May 2018 19:54:03 +0800 Subject: [PATCH 1/3] update: modify UI styles --- app/containers/ToolBar.js | 2 +- app/containers/Video.js | 19 +++++++++++++------ app/main.dev.js | 8 +++++++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/containers/ToolBar.js b/app/containers/ToolBar.js index dfe8810..bd6cb7e 100644 --- a/app/containers/ToolBar.js +++ b/app/containers/ToolBar.js @@ -11,7 +11,7 @@ const ToolBar = ({ onComeback, onSwitchSource, onSourceSelected, freeUrl, title return (
返回
- {title} + {title}
diff --git a/app/containers/Video.js b/app/containers/Video.js index 9574de2..7e9860c 100644 --- a/app/containers/Video.js +++ b/app/containers/Video.js @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import { webview } from 'electron'; +import { webview, ipcRenderer } from 'electron'; import Channel from './Channel'; import ToolBar from './ToolBar'; @@ -21,6 +21,7 @@ class VideoPlay extends PureComponent < Props > { url: 'https://v.qq.com', freeUrl: [], selectedUrl: 'http://vip.jlsprh.com/index.php?url=', + isFullScreen: false, } componentDidMount() { this.props.actions.getAllVideoSource(); @@ -39,6 +40,11 @@ class VideoPlay extends PureComponent < Props > { url: `${obj.url}` }); }); + ipcRenderer.on('enter-full-screen', (e, msg) => { + this.setState({ + isFullScreen: msg + }); + }); } componentWillReceiveProps(nextProps) { const { source } = nextProps; @@ -81,17 +87,18 @@ class VideoPlay extends PureComponent < Props > { }); } render() { - const { channel, url, freeUrl, title } = this.state; + const { channel, url, freeUrl, title, isFullScreen } = this.state; + const isHiddenStyle = isFullScreen ? { display: 'none'} : { display: 'flex'}; return (
-
+
-
-
+
+
{ {this.webview = webview} } title="腾讯视频" - style={{ height: 'calc(100vh - 60px)', width: '100%' }} + style={{ height: isFullScreen ? '100vh' : 'calc(100vh - 60px)', width: '100%' }} src={url} allowpopups="true" > diff --git a/app/main.dev.js b/app/main.dev.js index 9271476..ad5023d 100644 --- a/app/main.dev.js +++ b/app/main.dev.js @@ -10,7 +10,7 @@ * * @flow */ -import { app, BrowserWindow } from 'electron'; +import { app, BrowserWindow, ipcMain} from 'electron'; import MenuBuilder from './menu'; let mainWindow = null; @@ -81,6 +81,12 @@ app.on('ready', async () => { mainWindow = null; }); + mainWindow.on('enter-full-screen', () => { + mainWindow.webContents.send('enter-full-screen', true); + }) + mainWindow.on('leave-full-screen', () => { + mainWindow.webContents.send('enter-full-screen', false); + }) const menuBuilder = new MenuBuilder(mainWindow); menuBuilder.buildMenu(); }); From 71ea12504cfcc78fc190a7c0784ffff6d6647fa0 Mon Sep 17 00:00:00 2001 From: phobal Date: Sat, 5 May 2018 19:54:31 +0800 Subject: [PATCH 2/3] update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29..cc974e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,3 @@ +* 2018.5.5 + +修改页面样式,当全屏时隐藏掉左侧菜单栏和顶部接口切换栏 \ No newline at end of file From cf30af78638a869edc80cc66fd13c7cc0aab45ee Mon Sep 17 00:00:00 2001 From: phobal Date: Sat, 5 May 2018 19:56:59 +0800 Subject: [PATCH 3/3] update version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c861ecd..2a2c114 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "electron-react-boilerplate", - "version": "0.13.2", + "version": "1.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c996388..813d4e6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ivideo", "productName": "ivideo", - "version": "1.0.1", + "version": "1.1.0", "description": "一个视频播放器观看国内主流视频网站,不用单独下载各个平台客户端", "scripts": { "build": "concurrently \"npm run build-main\" \"npm run build-renderer\"",