2021-0304-1

wei

2021-03-04 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb

 HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs

@@ -17,7 +17,7 @@
        /// <param name="function"></param>
        public static void UpdataInfo(Function function)
        {
            Application.RunOnMainThread(() => {
            Application.RunOnMainThread((Action)(() => {
                if (bodyView == null)
                    return;
                try
@@ -44,23 +44,27 @@
                            vv = ShowFunction.Light;
                            break;
                        case SPK.ElectricSocket:
                        case SPK.ElectricTuyaAirCleaner:
                        case SPK.ElectricTuyaFan:
                        case SPK.ElectricTuyaWaterValve:
                        case SPK.ElectricTuyaWeepRobot:
                            vv = ShowFunction.Electric;
                            break;
                    }
                    UpdataFunctionOnCount(vv, function.functionType);
                    UpdataFunctionOnCount(vv, function.spk);
                    UpdataCloseAllButton(function);
                }
                catch
                {
                }
            });
            }));
        }

        /// <summary>
        /// 更新功能打开数量
        /// </summary>
        /// <param name="functionCategory"></param>
        static void UpdataFunctionOnCount(ShowFunction functionCategory, FunctionType functionType)
        static void UpdataFunctionOnCount(ShowFunction functionCategory, string functionType)
        {
            try
            {
@@ -192,7 +196,7 @@
                                        {
                                            continue;
                                        }
                                        var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on" && obj.functionCategory != FunctionCategory.Scene);
                                        var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on");
                                        var sss = ssd.Count;
                                        if (sss == 0)
                                        {
@@ -222,11 +226,6 @@
                        {
                            foreach (var f in room.GetRoomFunctions(false))
                            {
                                if (f.functionCategory == FunctionCategory.Scene)
                                {
                                    continue;
                                }

                                f.trait_on_off.curValue = "off";
                                Dictionary<string, string> d = new Dictionary<string, string>();
                                d.Add("on_off", f.trait_on_off.curValue.ToString());
@@ -249,10 +248,6 @@
                };
                foreach (var f in room.GetRoomFunctions(false))
                {
                    if (f.functionCategory == FunctionCategory.Scene)
                    {
                        continue;
                    }
                    if (f.trait_on_off.curValue.ToString() == "on")
                    {
                        btn.Visible = true;
@@ -341,11 +336,15 @@
                view.AddChidren(waitPage);
                waitPage.BackgroundColor = 0x00000000;
                waitPage.Start("");


                new System.Threading.Thread(() =>
                {
                    try
                    {
                        if (DB_ResidenceData.Instance.GatewayType == 0 && !Control.Ins.IsRemote)
                        //全开全关
                        //if (DB_ResidenceData.Instance.GatewayType == 0 && !Control.Ins.IsRemote)
                        if (Control.Ins.GatewayOnline_Local)
                        {
                            switch (functionCategory)
                            {