This commit is contained in:
zhuzihcu 2023-03-31 17:59:20 +08:00
parent 936a310ca6
commit 1e5bd75123
7 changed files with 3 additions and 88 deletions

View File

@ -16,9 +16,9 @@ Window {
"/about":"qrc:/page/AboutPage.qml", "/about":"qrc:/page/AboutPage.qml",
"/login":"qrc:/page/LoginPage.qml", "/login":"qrc:/page/LoginPage.qml",
"/chat":"qrc:/page/ChatPage.qml", "/chat":"qrc:/page/ChatPage.qml",
"/mediaplayer":"qrc:/page/MediaPlayerPage.qml", "/media":"qrc:/page/MediaPage.qml",
} }
FluApp.initialRoute = "/" FluApp.initialRoute = "/media"
FluApp.run() FluApp.run()
} }

View File

@ -152,6 +152,6 @@
<file>global/ItemsOriginal.qml</file> <file>global/ItemsOriginal.qml</file>
<file>global/qmldir</file> <file>global/qmldir</file>
<file>global/ItemsFooter.qml</file> <file>global/ItemsFooter.qml</file>
<file>page/MediaPlayerPage.qml</file> <file>page/MediaPage.qml</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -55,13 +55,6 @@ Rectangle{
height: root.height height: root.height
spacing: 0 spacing: 0
TFpsMonitor{
Layout.alignment: Qt.AlignVCenter
Layout.rightMargin: 20
Layout.topMargin: 5
color:root.textColor
visible: showFps
}
RowLayout{ RowLayout{
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter

View File

@ -31,7 +31,6 @@ Rectangle {
audioOutput: AudioOutput{ audioOutput: AudioOutput{
id:audio_output id:audio_output
} }
onErrorChanged: onErrorChanged:
(error)=> { (error)=> {
console.debug(error) console.debug(error)
@ -73,13 +72,11 @@ Rectangle {
MouseArea{ MouseArea{
anchors.fill: parent anchors.fill: parent
} }
Behavior on y{ Behavior on y{
NumberAnimation{ NumberAnimation{
duration: 150 duration: 150
} }
} }
Rectangle{ Rectangle{
anchors.fill: parent anchors.fill: parent
color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97) color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
@ -101,13 +98,11 @@ Rectangle {
mediaplayer.autoSeek = true mediaplayer.autoSeek = true
mediaplayer.play() mediaplayer.play()
} }
onValueChanged: { onValueChanged: {
if(mediaplayer.autoSeek == false){ if(mediaplayer.autoSeek == false){
mediaplayer.position = value*mediaplayer.duration/slider.maxValue mediaplayer.position = value*mediaplayer.duration/slider.maxValue
} }
} }
onLineClickFunc:function(val){ onLineClickFunc:function(val){
mediaplayer.position = val*mediaplayer.duration/slider.maxValue mediaplayer.position = val*mediaplayer.duration/slider.maxValue
} }
@ -198,7 +193,6 @@ Rectangle {
audio_output.volume = value/100 audio_output.volume = value/100
} }
} }
} }
function formatDuration(duration) { function formatDuration(duration) {

View File

@ -1,71 +0,0 @@
import QtQuick
import FluentUI
Item {
readonly property alias fps: _private.fps;
readonly property alias fpsAvg: _private.fpsAvg;
property color color: "#C0C0C0"
property Component contentItem: contentComponent;
id: control
width: contentItemLoader.width + 5;
height: contentItemLoader.height + 5;
Component{
id:contentComponent
FluText{
color:control.color
text: " Avg " + fpsAvg + " | " + fps + " Fps";
}
}
FluObject{
id:_private;
property int frameCounter: 0
property int frameCounterAvg: 0
property int counter: 0
property int fps: 0
property int fpsAvg: 0
}
Rectangle {
id: monitor
radius: 3
width: 6
height: width
opacity: 0;
NumberAnimation on rotation {
from:0
to: 360
duration: 800
loops: Animation.Infinite
}
onRotationChanged: _private.frameCounter++;
}
Loader{
id:contentItemLoader
sourceComponent: contentItem
}
Timer {
interval: 2000
repeat: true
running: visible
onTriggered: {
_private.frameCounterAvg += _private.frameCounter;
_private.fps = _private.frameCounter/2;
_private.counter++;
_private.frameCounter = 0;
if (_private.counter >= 3) {
_private.fpsAvg = _private.frameCounterAvg/(2 * _private.counter)
_private.frameCounterAvg = 0;
_private.counter = 0;
}
}
}
}

View File

@ -22,7 +22,6 @@
<file>controls/FluIcon.qml</file> <file>controls/FluIcon.qml</file>
<file>controls/FluDivider.qml</file> <file>controls/FluDivider.qml</file>
<file>controls/FluTooltip.qml</file> <file>controls/FluTooltip.qml</file>
<file>controls/TFpsMonitor.qml</file>
<file>controls/FluTextBoxBackground.qml</file> <file>controls/FluTextBoxBackground.qml</file>
<file>controls/FluMultiLineTextBox.qml</file> <file>controls/FluMultiLineTextBox.qml</file>
<file>controls/FluWindowResize.qml</file> <file>controls/FluWindowResize.qml</file>