From af48875ef7f8b34022b39cbb15d745769abf37d9 Mon Sep 17 00:00:00 2001
From: greedysky <greedysky@163.com>
Date: Sun, 9 Oct 2016 17:54:32 +0800
Subject: [PATCH]  #47update TTKMobile part[749678]

---
 TTKMobile/TTKMobile.pro                       |   2 +-
 TTKMobile/TTKMobile.qrc                       |   2 +
 .../images/playing_volumn_slide_icon.png      | Bin 0 -> 1001 bytes
 .../playing_volumn_slide_nosound_icon.png     | Bin 0 -> 1100 bytes
 .../qmls/TTKMusicPlayerCenterSettingPage.qml  |  86 +++++++++++-------
 5 files changed, 57 insertions(+), 33 deletions(-)
 create mode 100644 TTKMobile/images/playing_volumn_slide_icon.png
 create mode 100644 TTKMobile/images/playing_volumn_slide_nosound_icon.png

diff --git a/TTKMobile/TTKMobile.pro b/TTKMobile/TTKMobile.pro
index c74176a318..8ca1a7bcb8 100644
--- a/TTKMobile/TTKMobile.pro
+++ b/TTKMobile/TTKMobile.pro
@@ -10,7 +10,7 @@
 # * works are strictly forbiden.
 # =================================================
 
-TTKMusicPlayer = 2.4.0.0
+TTKMusicPlayer = 2.4.1.0
 
 QT       += core gui xml qml quick multimedia
 
diff --git a/TTKMobile/TTKMobile.qrc b/TTKMobile/TTKMobile.qrc
index 90136a0753..a47511405a 100644
--- a/TTKMobile/TTKMobile.qrc
+++ b/TTKMobile/TTKMobile.qrc
@@ -65,6 +65,8 @@
         <file alias="action_ring_normal">images/action_ring_normal.png</file>
         <file alias="action_check_singer_normal">images/action_check_singer_normal.png</file>
         <file alias="actionsheet_pplayer_normal">images/actionsheet_pplayer_normal.png</file>
+        <file alias="playing_volumn_slide_icon">images/playing_volumn_slide_icon.png</file>
+        <file alias="playing_volumn_slide_nosound_icon">images/playing_volumn_slide_nosound_icon.png</file>
     </qresource>
     <qresource prefix="/">
         <file>qmls/main.qml</file>
diff --git a/TTKMobile/images/playing_volumn_slide_icon.png b/TTKMobile/images/playing_volumn_slide_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..51e9ff3adfc5a664204e83320030a82aa14a44eb
GIT binary patch
literal 1001
zcmeAS@N?(olHy`uVBq!ia0vp^MnJ5?!3-n?Y^5`R6lZ})WHAE+w-5+3Ub<WN2PmkJ
z>=ES4z)+>iz|hdl!0_`wkbcR)P-?)y@G60U!D<ErgLwX=_@izN49pAxJ|V6^J)>YW
z1V(HKY&Q7P0rWg$NswPKgTu2MX+Tbxr;B4q#jQ72tc4mBM4STy{v5jdzbuxaw^O9&
z^QHNEo?a90tIb~(p}pvaqw-HDm8FW4m`yg_=}5`mqxywYC?(^#oypCc-CMoVf1f)X
hVgGDTYD$+4GehZdelf$|)%KvU_H^}gS?83{1OVCJO3wfQ

literal 0
HcmV?d00001

diff --git a/TTKMobile/images/playing_volumn_slide_nosound_icon.png b/TTKMobile/images/playing_volumn_slide_nosound_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b7790df0e97a7b0dafc2e95712c7e695f44a6f
GIT binary patch
literal 1100
zcmeAS@N?(olHy`uVBq!ia0vp^MnJ5?!3-n?Y^5`R6lZ})WHAE+w-5+3Ub<WN2PmkJ
z>=ES4z)+>iz|hdl!0_`wkbcR)P-?)y@G60U!D<ErgLwX=_@izN49pAxJ|V6^J)>YW
z1V(HKY&Q7P0rWg$NswPKgTu2MX+X|SPZ!6Kid%24c=H`H;Bmb;W0KgVC-3Ta@?;z=
zn>r<gM_^TYV2RrK`2y#D-JVpvUczW@Qj?uhr(cn7$s}nFBcDa~$v2M`%`{wMpe?+x
zLXdl!%9Kur82OynvPZLeRtTrA$(S&`aFMInW7o+no)h+FOiq<qb3-waWz&}l90^ss
z+?5Q}@}r*2oLX^NA$yl}@NC1Y2WNeptfO^zR^e}<O|RNjX4u{EGPKn_JiYAyiB`*!
h<9#uwH`gtaV`fl%FP0K2!lMC-PES`qmvv4FO#t?4c0vFE

literal 0
HcmV?d00001

diff --git a/TTKMobile/qmls/TTKMusicPlayerCenterSettingPage.qml b/TTKMobile/qmls/TTKMusicPlayerCenterSettingPage.qml
index 974ad160a4..e235142e13 100644
--- a/TTKMobile/qmls/TTKMusicPlayerCenterSettingPage.qml
+++ b/TTKMobile/qmls/TTKMusicPlayerCenterSettingPage.qml
@@ -32,7 +32,7 @@ Rectangle{
     Rectangle {
         width: parent.width
         height: parent.height*0.7
-        color: "#EEEEEE"
+        color: "#F0F0F0"
         anchors {
             bottom: parent.bottom
             left: parent.left
@@ -61,7 +61,7 @@ Rectangle{
             Rectangle {
                 Layout.fillWidth: true
                 Layout.preferredHeight: 1
-                color: "black"
+                color: ttkTheme.alphaLv10
             }
 
             ListView {
@@ -137,7 +137,7 @@ Rectangle{
             Rectangle {
                 Layout.fillWidth: true
                 Layout.preferredHeight: 1
-                color: "black"
+                color: ttkTheme.alphaLv10
             }
 
             ListView {
@@ -217,44 +217,66 @@ Rectangle{
             Rectangle {
                 Layout.fillWidth: true
                 Layout.preferredHeight: 1
-                color: "black"
+                color: ttkTheme.alphaLv10
             }
 
-            Slider {
-                id: musicTimeSlider
+            Rectangle {
                 Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: ttkMusicPlayerCenterSettingPage.width - dpWidth(100)
+                Layout.fillWidth: true
                 Layout.preferredHeight: dpHeight(30)
-                height: 30
-                minimumValue: 0
-                value: 0
+                color: ttkTheme.alphaLv0
 
-                function sliderGeometry() {
-                    return (musicTimeSlider.value - musicTimeSlider.minimumValue) /
-                           (musicTimeSlider.maximumValue - musicTimeSlider.minimumValue);
-                }
+                RowLayout{
+                    anchors.fill: parent
 
-                style: SliderStyle{
-                    groove: Row {
-                        Rectangle{
-                            implicitWidth: musicTimeSlider.width*musicTimeSlider.sliderGeometry()
-                            implicitHeight: dpHeight(3)
-                            color: ttkTheme.topbar_background
+                    TTKImageButton {
+                        anchors {
+                            left: parent.left
+                            leftMargin: dpWidth(30)
                         }
+                        Layout.alignment: Qt.AlignCenter
+                        Layout.preferredWidth: dpWidth(30)
+                        Layout.preferredHeight: dpHeight(30)
+                        source: "qrc:/image/playing_volumn_slide_icon"
+                    }
 
-                        Rectangle{
-                            implicitWidth: musicTimeSlider.width*(1-musicTimeSlider.sliderGeometry())
-                            implicitHeight: dpHeight(3)
-                            color: "gray"
+                    Slider {
+                        id: musicTimeSlider
+                        Layout.alignment: Qt.AlignCenter
+                        Layout.preferredWidth: ttkMusicPlayerCenterSettingPage.width - dpWidth(100)
+                        Layout.preferredHeight: dpHeight(30)
+                        height: 30
+                        minimumValue: 0
+                        value: 0
+
+                        function sliderGeometry() {
+                            return (musicTimeSlider.value - musicTimeSlider.minimumValue) /
+                                   (musicTimeSlider.maximumValue - musicTimeSlider.minimumValue);
                         }
-                    }
 
-                    handle: Rectangle{
-                        anchors.centerIn: parent;
-                        color: ttkTheme.topbar_background
-                        width: dpWidth(20)
-                        height: dpHeight(20)
-                        radius: dpWidth(10)
+                        style: SliderStyle{
+                            groove: Row {
+                                Rectangle{
+                                    implicitWidth: musicTimeSlider.width*musicTimeSlider.sliderGeometry()
+                                    implicitHeight: dpHeight(3)
+                                    color: ttkTheme.topbar_background
+                                }
+
+                                Rectangle{
+                                    implicitWidth: musicTimeSlider.width*(1-musicTimeSlider.sliderGeometry())
+                                    implicitHeight: dpHeight(3)
+                                    color: "gray"
+                                }
+                            }
+
+                            handle: Rectangle{
+                                anchors.centerIn: parent;
+                                color: ttkTheme.topbar_background
+                                width: dpWidth(20)
+                                height: dpHeight(20)
+                                radius: dpWidth(10)
+                            }
+                        }
                     }
                 }
             }
@@ -262,7 +284,7 @@ Rectangle{
             Rectangle {
                 Layout.fillWidth: true
                 Layout.preferredHeight: 1
-                color: "black"
+                color: ttkTheme.alphaLv10
             }
 
             Text {