From 7d041ae6788088b0d67636f0c440755d3e40247c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 17:24:22 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 138 +++++++++++++++++++---
HDL-ON_Android/Assets/Language.ini | 1
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 3
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 21 ++-
HDL_ON/Common/ImageUtlis.cs | 80 +++++++++----
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs | 6
HDL-ON_iOS/Resources/Language.ini | 1
HDL_ON/DAL/Server/NewApiRes.cs | 16 ++
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 18 +-
HDL_ON/Common/R.cs | 5
HDL_ON/DAL/Server/HttpServerRequest.cs | 37 ++++-
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 14 +-
13 files changed, 257 insertions(+), 89 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 0c80cdd..228be8b 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -567,6 +567,7 @@
9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
9049=瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
9050=楠岃瘉闈㈠ID
+9051=淇濆瓨鐢ㄦ埛澶村儚澶辫触
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c2ed74d..6e6726e 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -567,6 +567,7 @@
9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
9049=瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
9050=楠岃瘉闈㈠ID
+9051=淇濆瓨鐢ㄦ埛澶村儚澶辫触
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL_ON/Common/ImageUtlis.cs b/HDL_ON/Common/ImageUtlis.cs
index 83e55bd..f2b6cca 100644
--- a/HDL_ON/Common/ImageUtlis.cs
+++ b/HDL_ON/Common/ImageUtlis.cs
@@ -162,6 +162,7 @@
/// <summary>
/// 閫氳繃鍥剧墖璺緞涓嬭浇鍥剧墖
+ /// 閽堝浣忓畢锛屼娇鐢ㄤ綇瀹呭煙鍚嶆湇鍔″櫒
/// </summary>
public byte[] GetImageDownloadUrl(string imageKey)
{
@@ -170,6 +171,31 @@
imageKey = imageKey,
});
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetImageUrl, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ if (revertObj.Data != null)
+ {
+ if (!string.IsNullOrEmpty(revertObj.Data.ToString()))
+ {
+ var url = revertObj.Data.ToString();
+ return HttpUtil.HttpsDownload(url);
+ }
+ }
+ }
+ return null;
+ }
+
+ /// <summary>
+ /// 閫氳繃鍥剧墖璺緞涓嬭浇鍥剧墖
+ /// 閽堝鐢ㄦ埛澶村儚鎸囧畾鐢ㄦ埛璺緞绛�
+ /// </summary>
+ public byte[] GetImageDownloadUrlWithRegionUrl(string imageKey, string regionUrl)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(new GetImageUrlObj()
+ {
+ imageKey = imageKey,
+ });
+ var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetImageUrl, requestJson, regionUrl);
if (revertObj.Code == StateCode.SUCCESS)
{
if (revertObj.Data != null)
@@ -326,40 +352,42 @@
}
}
- /// <summary>
- /// 鑾峰彇鎷兼帴鐢ㄦ埛澶村儚鐨処mageKey瑙勫垯
- /// </summary>
- /// <returns></returns>
- public string GetHeadImageKey(string userId)
- {
- return "ON" + "_" + userId + "_" + HEADIMAGE;
- }
+ // /// <summary>
+ ///// 鑾峰彇鎷兼帴鐢ㄦ埛澶村儚鐨処mageKey瑙勫垯
+ ///// </summary>
+ ///// <returns></returns>
+ //public string GetHeadImageKey(string userId)
+ // {
+ // return "ON" + "_" + userId + "_" + HEADIMAGE;
+ // }
- /// <summary>
- /// 鐢熸垚澶村儚涓婁紶瑙勫垯鍙傛暟
- /// </summary>
- /// <returns></returns>
- public UploadImageObj GetHeadImageUploadKeyObj(string userId)
- {
- return new UploadImageObj()
- {
- prefix = "ON",
- uid = userId,
- fileName = HEADIMAGE,
- };
- }
+ ///// <summary>
+ ///// 鐢熸垚澶村儚涓婁紶瑙勫垯鍙傛暟
+ ///// </summary>
+ ///// <returns></returns>
+ //public UploadImageObj GetHeadImageUploadKeyObj(string userId)
+ //{
+ // return new UploadImageObj()
+ // {
+ // prefix = "Icon" + Utlis.GetTimestamp(),
+ // uid = userId,
+ // fileName = HEADIMAGE,
+ // };
+ //}
/// <summary>
/// 涓嬭浇鐢ㄦ埛澶村儚
/// </summary>
- /// <param name="userId"></param>
- /// <param name="ignoreCache">鏄惁蹇界暐缂撳瓨</param>
+ /// <param name="imageKey"></param>
+ /// <param name="ignoreCache">蹇界暐缂撳瓨</param>
+ /// <param name="regionUrl">鎸囧畾鏈嶅姟鍣ㄥ煙鍚�,浼犵┖涓轰娇鐢ㄥ綋鍓嶇敤鎴峰湴鍧�</param>
/// <returns></returns>
- public byte[] DownHeadImage(string userId, bool ignoreCache = false)
+ public byte[] DownHeadImageByImageKey(string imageKey, bool ignoreCache = false, string regionUrl = "")
{
try
{
- var imageKey = GetHeadImageKey(userId);
+ if (string.IsNullOrEmpty(imageKey)) return null;
+
byte[] imageBytes;
if (!ignoreCache && Exists(imageKey))
{
@@ -369,7 +397,7 @@
else
{
//浜戠涓嬭浇
- imageBytes = GetImageDownloadUrl(imageKey);
+ imageBytes = GetImageDownloadUrlWithRegionUrl(imageKey, regionUrl);
if(imageBytes != null)
{
//淇濆瓨鍒版湰鍦�
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index bdb306f..f6fbc29 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -717,7 +717,10 @@
/// 楠岃瘉闈㈠ID
/// </summary>
public const int VerifyFaceID = 9050;
-
+ /// <summary>
+ /// 淇濆瓨鐢ㄦ埛澶村儚澶辫触
+ /// </summary>
+ public const int FailedToSaveUserImage = 9051;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 71bfe0f..e1ae4da 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -297,6 +297,7 @@
UserInfo.Current.userEmailInfo = info.memberEmail;
UserInfo.Current.userMobileInfo = info.memberPhone;
UserInfo.Current.userName = info.memberName;
+
if (!string.IsNullOrEmpty(info.memberPhonePrefix))
{
UserInfo.Current.areaCode = info.memberPhonePrefix;
@@ -304,14 +305,16 @@
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
- var imageKey = ImageUtlis.Current.GetHeadImageKey(info.memberId);
-
- var headImageBytes = ImageUtlis.Current.DownHeadImage(info.memberId);
-
- if (headImageBytes != null && headImageBytes.Length > 0)
+ //2020-12-15 淇敼澶村儚鏂规
+ if (!string.IsNullOrEmpty(info.memberHeadIcon))
{
- //UserInfo.Current.headImagePageBytes = headImageBytes;
- UserInfo.Current.headImagePagePath = imageKey;
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
+
+ if (headImageBytes != null && headImageBytes.Length > 0)
+ {
+ UserInfo.Current.headImagePagePath = info.memberHeadIcon;
+ //UserInfo.Current.headImagePagePath = imageKey;
+ }
}
}
@@ -375,11 +378,9 @@
/// 鑾峰彇鐢ㄦ埛澶村儚
/// </summary>
/// <param name="userId"></param>
- public void GetUserHeadImage(string userId)
+ public void GetUserHeadImageByKey(string imageKey)
{
- var imageKey = ImageUtlis.Current.GetHeadImageKey(userId);
-
- var headImageBytes = ImageUtlis.Current.DownHeadImage(userId);
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(imageKey);
if (headImageBytes != null && headImageBytes.Length > 0)
{
@@ -405,6 +406,20 @@
///// <summary>
///// 鏇存柊鐢ㄦ埛澶村儚
///// </summary>
+ ///// <param name="userName"></param>
+ ///// <returns></returns>
+ //public ResponsePackNew UpdateMemberHeadIcon(string memberHeadIcon)
+ //{
+ // var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberHeadIconRes()
+ // {
+ // memberHeadIcon = memberHeadIcon
+ // });
+ // return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
+ //}
+
+ ///// <summary>
+ ///// 鏇存柊鐢ㄦ埛澶村儚
+ ///// </summary>
///// <param name="vs"></param>
///// <returns></returns>
//public string UpdataUserHeadImage(string fileName)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 95037ae..581018d 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -316,6 +316,10 @@
/// 鐧诲綍鍚�
/// </summary>
public string loginName;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
}
@@ -332,6 +336,18 @@
}
+ /// <summary>
+ /// 鏇存柊涓汉澶村儚
+ /// </summary>
+ [System.Serializable]
+ public class UpdateMemberHeadIconRes
+ {
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
+
+ }
/// <summary>
/// 缁戝畾璁よ瘉(鎵嬫満/閭)
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index e2f0f3b..d07795c 100644
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -67,7 +67,7 @@
/// <summary>
/// 鍖哄煙鏈嶅姟鍣�
/// </summary>
- public string regionUrl;
+ public string childAccountRegionUrl;
/// <summary>
/// 鏄惁鍏佽杩滅▼鎺у埗
/// </summary>
@@ -97,6 +97,10 @@
/// </summary>
public string childAccountPhone;
/// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
+ /// <summary>
/// 鐢ㄦ埛璐﹀彿
/// 浼樺厛鏄剧ず鎵嬫満鍙凤紝濡傛灉鎵嬫満鍙蜂负绌哄垯鏄剧ず閭鍦板潃
/// </summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 50bde1c..a2d2bb8 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -725,8 +725,7 @@
//鑾峰彇鐢ㄦ埛淇℃伅
new Thread(() =>
{
- pm.GetUserHeadImage(revertData.userId);
- pm.GetUserInfo(false);
+ pm.GetUserInfo();
})
{ IsBackground = true }.Start();
}
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 6e50522..4fed9cb 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -190,17 +190,17 @@
Control.Ins.SendWriteCommand(curtain, d);
};
- btnStop.MouseDownEventHandler = (sender, e) =>
+ //btnStop.MouseDownEventHandler = (sender, e) =>
+ //{
+ // btnStop.IsSelected = true;
+ // btnClose.IsSelected = false;
+ // btnOpen.IsSelected = false;
+ //};
+ btnStop.MouseUpEventHandler = (sender, e) =>
{
btnStop.IsSelected = true;
btnClose.IsSelected = false;
btnOpen.IsSelected = false;
- };
- btnStop.MouseUpEventHandler = (sender, e) =>
- {
- btnOpen.IsSelected = true;
- btnClose.IsSelected = false;
- btnStop.IsSelected = false;
curtain.trait_on_off.curValue = "stop";
//curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
index 1dc0b55..1c7dcff 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -62,13 +62,13 @@
/// </summary>
void CheckIfDownloadHeadImage(ResidenceMemberInfo residenceMemberInfo)
{
- var imageKey = ImageUtlis.Current.GetHeadImageKey(residenceMemberInfo.childAccountId);
+ if (string.IsNullOrEmpty(residenceMemberInfo.memberHeadIcon)) return;
- var headImageBytes = ImageUtlis.Current.DownHeadImage(residenceMemberInfo.childAccountId);
+ var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(residenceMemberInfo.memberHeadIcon, false, residenceMemberInfo.childAccountRegionUrl);
if (headImageBytes != null && headImageBytes.Length > 0)
{
- residenceMemberInfo.headImagePagePath = imageKey;
+ residenceMemberInfo.headImagePagePath = residenceMemberInfo.memberHeadIcon;
Utlis.WriteLine("瀛愯处鍙峰ご鍍忚幏鍙栨垚鍔�");
}
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 5689818..4e3ac72 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -180,7 +180,7 @@
btnTakePicture.MouseUpEventHandler = (sender, e) =>
{
btnTakePicture.IsSelected = false;
-
+
//鎷嶇収瑁佸壀
//var imageName = "headImage";
var imageName = Guid.NewGuid().ToString();
@@ -257,34 +257,58 @@
var waitPage = new Loading();
bodyView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
- //寮�濮嬩笂浼�
+ //1.寮�濮嬩笂浼�
new Thread(() =>
{
try
{
- var uploadImageObj = ImageUtlis.Current.GetHeadImageUploadKeyObj(userId);
- uploadImageObj.content = imageBytes;
+ //鐢熸垚涓婁紶澶村儚鍙傛暟
+ var uploadImageObj = new UploadImageObj()
+ {
+ prefix = "Icon" + Utlis.GetTimestamp(),
+ uid = userId,
+ fileName = ImageUtlis.HEADIMAGE,
+ content = imageBytes,
+ };
+
var imageUrl = ImageUtlis.Current.UploadImage(uploadImageObj);
if (!string.IsNullOrEmpty(imageUrl) && imageUrl.Contains(userId))
{
- //涓婁紶鎴愬姛
- Application.RunOnMainThread(() =>
+ //2.涓婁紶鎴愬姛
+ //2.1鏇存柊鏈�鏂板浘鐗囪矾寰勫埌浜戠
+ var resultObj = UpdateMemberHeadIcon(imageUrl);
+ if (resultObj.Code == StateCode.SUCCESS)
{
- //Utlis.WriteLine("涓婁紶鎴愬姛锛�" + imageUrl);
- //1.2濡傛灉鏄嚜瀹氫箟鍥剧墖鍒犻櫎涔嬪墠鐨�
- if (!string.IsNullOrEmpty(imageView.ImagePath) && !imageView.ImagePath.Contains("LoginIcon/2.png"))
+ //3.鏇存柊鏈�鏂板浘鐗囪矾寰勫埌浜戠鎴愬姛
+ Application.RunOnMainThread(() =>
{
- //Utlis.WriteLine("鍒犻櫎: " + imageView.ImagePath);
- System.IO.File.Delete(imageView.ImagePath);
- }
- //閲嶅懡鍚嶄繚瀛�
- ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes);
- imageView.ImagePath = imageUrl;
- imageView.ImageBytes = imageBytes;
- //涓婁紶鎴愬姛
- Utlis.ShowTip(Language.StringByID(StringId.UploadSuccessfully));
- uploadSuccessAction?.Invoke(imageUrl);
- });
+ //Utlis.WriteLine("涓婁紶鎴愬姛锛�" + imageUrl);
+ //1.2濡傛灉鏄嚜瀹氫箟鍥剧墖鍒犻櫎涔嬪墠鐨�
+ if (!string.IsNullOrEmpty(imageView.ImagePath) && !imageView.ImagePath.Contains("LoginIcon/2.png"))
+ {
+ //Utlis.WriteLine("鍒犻櫎: " + imageView.ImagePath);
+ System.IO.File.Delete(imageView.ImagePath);
+ }
+ //閲嶅懡鍚嶄繚瀛�
+ ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes);
+ imageView.ImagePath = imageUrl;
+ imageView.ImageBytes = imageBytes;
+ //涓婁紶鎴愬姛
+ Utlis.ShowTip(Language.StringByID(StringId.UploadSuccessfully));
+ uploadSuccessAction?.Invoke(imageUrl);
+ });
+ }
+ else
+ {
+ //鏇存柊鏈�鏂板浘鐗囪矾寰勫埌浜戠澶辫触
+ Application.RunOnMainThread(() =>
+ {
+ //淇濆瓨鐢ㄦ埛澶村儚澶辫触
+ Utlis.ShowTip(Language.StringByID(StringId.FailedToSaveUserImage));
+ });
+
+ }
+
}
else
{
@@ -315,6 +339,20 @@
{ IsBackground = true }.Start();
}
catch { }
+ }
+
+ /// <summary>
+ /// 鏇存柊鐢ㄦ埛澶村儚
+ /// </summary>
+ /// <param name="userName"></param>
+ /// <returns></returns>
+ public ResponsePackNew UpdateMemberHeadIcon(string memberHeadIcon)
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberHeadIconRes()
+ {
+ memberHeadIcon = memberHeadIcon
+ });
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
}
/// <summary>
@@ -526,5 +564,65 @@
})
{ IsBackground = true }.Start();
}
+
+
+ ///// <summary>
+ ///// 鑾峰彇鐢ㄦ埛淇℃伅
+ ///// </summary>
+ ///// <returns></returns>
+ //public void GetUserInfoNew()
+ //{
+
+ // new System.Threading.Thread(() =>
+ // {
+ // try
+ // {
+ // var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
+ // var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
+ // if (resultObj.Code == StateCode.SUCCESS)
+ // {
+ // var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
+ // UserInfo.Current.userEmailInfo = info.memberEmail;
+ // UserInfo.Current.userMobileInfo = info.memberPhone;
+ // UserInfo.Current.userName = info.memberName;
+
+ // if (!string.IsNullOrEmpty(info.memberPhonePrefix))
+ // {
+ // UserInfo.Current.areaCode = info.memberPhonePrefix;
+ // }
+
+ // //2020-12-15 淇敼澶村儚鏂规
+ // if (!string.IsNullOrEmpty(info.memberHeadIcon))
+ // {
+ // var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
+
+ // if (headImageBytes != null && headImageBytes.Length > 0)
+ // {
+ // UserInfo.Current.headImagePagePath = info.memberHeadIcon;
+ // }
+ // }
+
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnUserName.Text = str;
+ // updataUserName();
+ // });
+
+ // UserInfo.Current.SaveUserInfo();
+ // MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
+
+ // //userHeadImageView
+ // }
+ // }
+ // catch { }
+ // finally
+ // {
+
+
+ // }
+
+ // })
+ // { IsBackground = true }.Start();
+ //}
}
}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index f6ac829..428a93c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -19,9 +19,9 @@
{
if (uCurtain.trait_on_off.curValue.ToString() == "stop")
{
- bodyView.btnCurtainOpen.IsSelected = true;
+ bodyView.btnCurtainOpen.IsSelected = false;
bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainStop.IsSelected = true;
}
else if (uCurtain.trait_on_off.curValue.ToString() == "on")
{
@@ -90,17 +90,20 @@
DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
};
- btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ //btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ //{
+ // btnCurtainStop.IsSelected = true;
+ // btnCurtainClose.IsSelected = false;
+ // btnCurtainOpen.IsSelected = false;
+ //};
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
+ //btnCurtainOpen.IsSelected = true;
+ //btnCurtainClose.IsSelected = false;
+ //btnCurtainStop.IsSelected = false;
btnCurtainStop.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- };
- btnCurtainStop.MouseUpEventHandler = (sender, e) =>
- {
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
curtain.trait_on_off.curValue = "stop";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.curValue.ToString());
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 689ce72..1339b70 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -22,9 +22,9 @@
{
if (uCurtain.trait_on_off.curValue.ToString() == "stop")
{
- bodyView.btnCurtainOpen.IsSelected = true;
+ bodyView.btnCurtainOpen.IsSelected = false;
bodyView.btnCurtainClose.IsSelected = false;
- bodyView.btnCurtainStop.IsSelected = false;
+ bodyView.btnCurtainStop.IsSelected = true;
}
else if (uCurtain.trait_on_off.curValue.ToString() == "on")
{
@@ -92,17 +92,17 @@
Control.Ins.SendWriteCommand(curtain, d);
};
- btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ //btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+ //{
+ // btnCurtainStop.IsSelected = true;
+ // btnCurtainClose.IsSelected = false;
+ // btnCurtainOpen.IsSelected = false;
+ //};
+ btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
btnCurtainStop.IsSelected = true;
btnCurtainClose.IsSelected = false;
btnCurtainOpen.IsSelected = false;
- };
- btnCurtainStop.MouseUpEventHandler = (sender, e) =>
- {
- btnCurtainOpen.IsSelected = true;
- btnCurtainClose.IsSelected = false;
- btnCurtainStop.IsSelected = false;
curtain.trait_on_off.curValue = "stop";
//Control.Send(CommandType_A.write, curtain);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
--
Gitblit v1.8.0