From ecbf9d722cf59efe93cf60ee47e8782eca18eca6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 19 十二月 2020 13:22:55 +0800
Subject: [PATCH] 20201219-1

---
 HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs |   92 ++++++++++++++++++++++++++++++---------------
 1 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 6844db7..6645647 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -22,7 +22,32 @@
                     return;
                 try
                 {
-                    UpdataFunctionOnCount(function.functionCategory, function.functionType);
+                    ShowFunction vv = ShowFunction.Light;
+                    switch (function.spk)
+                    {
+                        case SPK.FloorHeatStandard:
+                            vv = ShowFunction.FloorHeating;
+                            break;
+                        case SPK.AcStandard:
+                            vv = ShowFunction.AC;
+                            break;
+                        case SPK.CurtainRoller:
+                        case SPK.CurtainShades:
+                        case SPK.CurtainSwitch:
+                        case SPK.CurtainTrietex:
+                            vv = ShowFunction.Curtain;
+                            break;
+                        case SPK.LightCCT:
+                        case SPK.LightDimming:
+                        case SPK.LightRGB:
+                        case SPK.LightSwitch:
+                            vv = ShowFunction.Light;
+                            break;
+                        case SPK.ElectricSocket:
+                            vv = ShowFunction.Electric;
+                            break;
+                    }
+                    UpdataFunctionOnCount(vv, function.functionType);
                     UpdataCloseAllButton(function);
                 }
                 catch
@@ -35,7 +60,7 @@
         /// 鏇存柊鍔熻兘鎵撳紑鏁伴噺
         /// </summary>
         /// <param name="functionCategory"></param>
-        static void UpdataFunctionOnCount(FunctionCategory functionCategory, FunctionType functionType)
+        static void UpdataFunctionOnCount(ShowFunction functionCategory, FunctionType functionType)
         {
             try
             {
@@ -53,9 +78,14 @@
                                 {
                                     if (view2.GetChildren(k).GetType() == typeof(FrameLayout))
                                     {
-                                        var view3 = view2.GetChildren(j) as FrameLayout;
+                                        var view3 = view2.GetChildren(k) as FrameLayout;
                                         if (view3 == null)
                                         {
+                                            continue;
+                                        }
+                                        if (view3.Tag == null || view3.Tag.ToString() != functionCategory + "_View")
+                                        {
+                                            MainPage.Log($"i={i}:j={j}:k={k} view3 tag : {view3.Tag.ToString()}");
                                             continue;
                                         }
                                         for (var o = 0; o < view3.ChildrenCount; o++)
@@ -70,24 +100,19 @@
                                                         string btnText = "0";
                                                         switch (functionCategory)
                                                         {
-                                                            case FunctionCategory.Thermostat:
-                                                                switch (functionType)
-                                                                {
-                                                                    case FunctionType.FloorHeating:
-                                                                        btnText = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
-                                                                        break;
-                                                                    case FunctionType.AC:
-                                                                        btnText = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
-                                                                        break;
-                                                                }
+                                                            case ShowFunction.FloorHeating:
+                                                                btnText = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                 break;
-                                                            case FunctionCategory.Curtain:
+                                                            case ShowFunction.AC:
+                                                                btnText = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+                                                                break;
+                                                            case ShowFunction.Curtain:
                                                                 btnText = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                 break;
-                                                            case FunctionCategory.Light:
+                                                            case ShowFunction.Light:
                                                                 btnText = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                 break;
-                                                            case FunctionCategory.Electrical:
+                                                            case ShowFunction.Electric:
                                                                 btnText = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                 break;
                                                         }
@@ -98,24 +123,19 @@
                                                         var openCount = 0;
                                                         switch (functionCategory)
                                                         {
-                                                            case FunctionCategory.Thermostat:
-                                                                switch (functionType)
-                                                                {
-                                                                    case FunctionType.FloorHeating:
-                                                                        openCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
-                                                                        break;
-                                                                    case FunctionType.AC:
-                                                                        openCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
-                                                                        break;
-                                                                }
+                                                            case ShowFunction.FloorHeating:
+                                                                openCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                 break;
-                                                            case FunctionCategory.Curtain:
+                                                            case ShowFunction.AC:
+                                                                openCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
+                                                                break;
+                                                            case ShowFunction.Curtain:
                                                                 openCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                 break;
-                                                            case FunctionCategory.Light:
+                                                            case ShowFunction.Light:
                                                                 openCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                 break;
-                                                            case FunctionCategory.Electrical:
+                                                            case ShowFunction.Electric:
                                                                 openCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                 break;
                                                         }
@@ -133,7 +153,7 @@
             }
             catch (Exception ex)
             {
-                MainPage.Log($"鏇存柊鍏ㄥ叧鎸夐挳寮傚父 : {ex.Message}");
+                MainPage.Log($"鏇存柊鍏ㄥ叧鎸夐挳寮傚父 : {ex.Message} ");
             }
         }
         /// <summary>
@@ -242,7 +262,7 @@
             }
             catch (Exception ex)
             {
-                MainPage.Log($"load close all function : {ex.Message}");
+                MainPage.Log($"load close all function : {ex.Message} ");
             }
         }
 
@@ -329,6 +349,15 @@
                             Control.Ins.SendWriteCommand(f, d);
                         }
                         break;
+                    case ShowFunction.FloorHeating:
+                        foreach (var f in FunctionList.List.floorHeatings)
+                        {
+                            f.trait_on_off.curValue = onoff;
+                            Dictionary<string, string> d = new Dictionary<string, string>();
+                            d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
+                            Control.Ins.SendWriteCommand(f, d);
+                        }
+                        break;
                     case ShowFunction.Curtain:
                         //foreach (var f in FunctionList.List.curtains)
                         //{
@@ -402,3 +431,4 @@
         }
     }
 }
+

--
Gitblit v1.8.0