From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
index cf755c0..71cf137 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
@@ -51,7 +51,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Y = Application.GetRealHeight(683);
- frameBack.Radius = (uint)Application.GetMinRealAverage(6);
+ frameBack.Radius = 6;
bodyFrameLayout.AddChidren(frameBack);
//杩涘害鏄剧ず鏂囨湰
@@ -183,7 +183,9 @@
public override void CloseForm()
{
//瀹夊崜鍙互鐐瑰嚮绯荤粺鐨勮繑鍥為敭
+ UserView.HomePage.Instance.ScrollEnabled = true;
Shared.Common.CommonPage.BackKeyCanClick = true;
+
//鍗囩骇瀵硅薄
if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(deviceMac) == true
&& FirmwareUpdateResourse.dicDeviceUpdateList[deviceMac].IsFinishUpdate == true)
--
Gitblit v1.8.0