From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs |   48 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
index 4981897..5ba6f1a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
@@ -99,15 +99,33 @@
                 listView.Height = bodyFrameLayout.Height;
                 bodyFrameLayout.AddChidren(listView);
 
-                //娣诲姞鏂瑰悜琛�
-                this.AddDirectionRow();
-                //娣诲姞闄愪綅琛�
-                this.AddLimitRow();
-                //娣诲姞閲嶇疆鐢垫満琛�
-                this.AddElectricalMachineryRow();
+                try
+                {
+                    //娣诲姞鏂瑰悜琛�
+                    this.AddDirectionRow();
+                    //娣诲姞闄愪綅琛�
+                    this.AddLimitRow();
+                    //娣诲姞閲嶇疆鐢垫満琛�
+                    this.AddElectricalMachineryRow();
 
-                //闄愪綅鏁版嵁鎺ユ敹
-                this.ReceiveLimitData();
+                    //闄愪綅鏁版嵁鎺ユ敹
+                    this.ReceiveLimitData();
+                }
+                catch (Exception ex)
+                {
+                    //Log鍑哄姏
+                    string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + UserCenterResourse.NowActionFormID + "]";
+                    HdlLogLogic.Current.WriteLog(ex, msg);
+                    //鍑虹幇鏈煡閿欒
+                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+                    try
+                    {
+                        this.listView.RemoveAll();
+                        //璁惧寮傚父琛ユ晳 -> 娣诲姞閲嶇疆鐢垫満琛�
+                        this.AddElectricalMachineryRow();
+                    }
+                    catch (Exception ex2) { HdlLogLogic.Current.WriteLog(ex2, "寮�鍚堝笜琛ユ晳寮傚父"); }
+                }
             });
         }
 
@@ -177,7 +195,7 @@
             var btnRinght = rowLimit.AddMostRightEmptyIcon(58, 58);
             rowLimit.ChangedChidrenBindMode(btnRinght, ChidrenBindMode.NotBind);
             btnRinght.UseClickStatu = false;
-            btnRinght.UnSelectedImagePath = "Item/Next.png";
+            btnRinght.UnSelectedImagePath = "Item/RightNext.png";
             btnRinght.SelectedImagePath = "Item/Down.png";
             btnRinght.IsSelected = true;
             btnRinght.ButtonClickEvent += (sender, e) =>
@@ -266,7 +284,7 @@
                 {
                     return;
                 }
-                openSeekBar.Progress -= 1;
+                openSeekBar.Progress -= 5;
                 openSeekBar.ProgressChangedEvent(1, openSeekBar.Progress);
             };
 
@@ -284,7 +302,7 @@
                 {
                     return;
                 }
-                openSeekBar.Progress += 1;
+                openSeekBar.Progress += 5;
                 openSeekBar.ProgressChangedEvent(1, openSeekBar.Progress);
             };
 
@@ -443,7 +461,7 @@
                 {
                     return;
                 }
-                closeSeekBar.Progress -= 1;
+                closeSeekBar.Progress -= 5;
                 closeSeekBar.ProgressChangedEvent(1, closeSeekBar.Progress);
             };
 
@@ -461,7 +479,7 @@
                 {
                     return;
                 }
-                closeSeekBar.Progress += 1;
+                closeSeekBar.Progress += 5;
                 closeSeekBar.ProgressChangedEvent(1, closeSeekBar.Progress);
             };
 
@@ -588,6 +606,10 @@
 
                         //姣�10鐨勯暱搴﹀ぇ姒傛槸2绉�,澶氶鐣�1娆″嚭鏉�
                         int waitCount = ((curtainData.CurtainLength / 10) + 1) * 3;
+                        if (waitCount < 12)
+                        {
+                            waitCount = 12;
+                        }
 
                         int timeCount = 0;
                         while (timeCount <= waitCount)

--
Gitblit v1.8.0