From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs
index 4f9dd8f..b1dce70 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs
@@ -113,7 +113,7 @@
                 ProgressColor = ZigbeeColor.Current.GXCProgressColor,
                 ThumbColor = ZigbeeColor.Current.GXCBackgroundColor,
                 Max = MaxLevel,
-                Progress = max
+                Progress = MaxLevel
             };
             AddChidren(SeekBar);
 
@@ -123,7 +123,7 @@
                 Height = Application.GetRealHeight(50),
                 Width = Application.GetRealWidth(200),
                 Gravity = Gravity.CenterHorizontal,
-                Text = $"{SeekBar.Progress} %",
+                Text = $"{(int)(SeekBar.Progress * 1.0 / MaxLevel * 100)} %",
                 TextColor = ZigbeeColor.Current.GXCTextGrayColor
             };
             AddChidren(SeekBarTitle);

--
Gitblit v1.8.0