From dc6493db59dcb0893eac50b72122f94c24056b3f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 12 十月 2020 14:35:39 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs
index 3f8d140..f1191b1 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs
@@ -42,11 +42,14 @@
/// <param name="finishEvent">缁撴潫閫夋嫨鐨勪簨浠�,绗竴涓弬鏁版槸閫夋嫨鐨勬ā鏉跨殑鍚嶅瓧,绗簩涓弬鏁版槸閫夋嫨鐨勬ā鏉跨殑鏂囦欢鍚嶅瓧</param>
public void ShowBottomSelectTemplateForm(string nowSelectFile, Action<string, string> finishEvent)
{
+ //2020.09.15 涓嶅啀鑾峰彇浜戠妯℃澘
+
//鑾峰彇鏈湴鐨勬ā鏉�
var listLocal = TemplateCommonLogic.Current.GetLocalAllModelList();
//鑾峰彇浜戠鐨勬ā鏉�
- var listClound = TemplateCommonLogic.Current.GetCloundAllModelList();
- if (listLocal.Count == 0 && listClound.Count == 0)
+ //var listClound = TemplateCommonLogic.Current.GetCloundAllModelList();
+ //if (listLocal.Count == 0 && listClound.Count == 0)
+ if (listLocal.Count == 0)
{
//妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬ā鏉挎暟鎹�
HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.NotHadTemplateDataToSelect));
@@ -79,16 +82,16 @@
//宸茬粡瀛樺湪浜嗙殑妯℃澘鍚嶅瓧
listEsixtName.Add(listLocal[i].ModelName);
}
- for (int i = 0; i < listClound.Count; i++)
- {
- //濡傛灉鏈湴宸茬粡瀛樺湪浜嗚繖涓ā鏉�,鍒欏凡鏈湴鐨勪负鍑�
- if (listEsixtName.Contains(listClound[i].TemplateName) == true)
- {
- continue;
- }
- listText1.Add(listClound[i].TemplateName);
- listText2.Add(listClound[i].CreatedOnUtc);
- }
+ //for (int i = 0; i < listClound.Count; i++)
+ //{
+ // //濡傛灉鏈湴宸茬粡瀛樺湪浜嗚繖涓ā鏉�,鍒欏凡鏈湴鐨勪负鍑�
+ // if (listEsixtName.Contains(listClound[i].TemplateName) == true)
+ // {
+ // continue;
+ // }
+ // listText1.Add(listClound[i].TemplateName);
+ // listText2.Add(listClound[i].CreatedOnUtc);
+ //}
var selectForm = new BottomItemSelectForm();
selectForm.SelectRowCanCancel = false;
@@ -96,25 +99,25 @@
selectForm.FinishSelectEvent += (select) =>
{
//宸查�夋ā鐗堬細鍗楁矙閲戣寕搴淿鎴峰瀷A
- if (select >= listLocal.Count)
- {
- //濡傛灉閫夋嫨鐨勬槸浜戠妯℃澘鐨勮瘽
- int index = select - listLocal.Count;
- //闇�瑕佸幓涓嬭浇杩欎釜妯℃澘
- TemplateCommonLogic.Current.DownLoadTemplate(listClound[index].Id, (fullName) =>
- {
- if (fullName != null)
- {
- string fileName = fullName.Substring(DirNameResourse.AllResidenceTemplateDirectory.Length + 1);
- //璋冪敤鍥炶皟鍑芥暟
- HdlThreadLogic.Current.RunMain(() =>
- {
- finishEvent?.Invoke(listText1[select], fileName);
- });
- }
- });
- }
- else
+ //if (select >= listLocal.Count)
+ //{
+ // //濡傛灉閫夋嫨鐨勬槸浜戠妯℃澘鐨勮瘽
+ // int index = select - listLocal.Count;
+ // //闇�瑕佸幓涓嬭浇杩欎釜妯℃澘
+ // TemplateCommonLogic.Current.DownLoadTemplate(listClound[index].Id, (fullName) =>
+ // {
+ // if (fullName != null)
+ // {
+ // string fileName = fullName.Substring(DirNameResourse.AllResidenceTemplateDirectory.Length + 1);
+ // //璋冪敤鍥炶皟鍑芥暟
+ // HdlThreadLogic.Current.RunMain(() =>
+ // {
+ // finishEvent?.Invoke(listText1[select], fileName);
+ // });
+ // }
+ // });
+ //}
+ //else
{
//璋冪敤鍥炶皟鍑芥暟
finishEvent?.Invoke(listText1[select], listLocal[select].FileName);
--
Gitblit v1.8.0