From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
index c97b330..9423667 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -939,7 +939,7 @@
for (int j = 0; j < A31MusicModel.A31MusicModelList.Count; j++)
{
var music = A31MusicModel.A31MusicModelList[j];
- if(music.collection && !mainModelCollection)
+ if(music.collect && !mainModelCollection)
{
mainModelCollection = true;
}
@@ -1287,6 +1287,7 @@
ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉＄殑楂樺害
Progress = int.Parse(a31player.A31PlayStatus.vol),
+ SeekBarPadding = Application.GetRealWidth(20),
//ProgressChangeDelayTime=
};
totalVolumeFra.AddChidren(totalVolSeekBar);
@@ -1349,6 +1350,7 @@
ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉＄殑楂樺害
Progress = int.Parse(player.A31PlayStatus.vol),
+ SeekBarPadding = Application.GetRealWidth(20),
//ProgressChangeDelayTime=
};
volumeFra.AddChidren(volSeekBar);
--
Gitblit v1.8.0