Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -18,12 +18,14 @@
            //AddChidren(bodyView);
            bodyView = this;
            //2020-12-22 增加点击隐藏键盘事件
            bodyView.MouseDownEventHandler += (sender, e) => {
            bodyView.MouseDownEventHandler += (sender, e) =>
            {
                Application.HideSoftInput();
            };
            pm = new HttpServerRequest();
#if __ANDROID__
            BaseActivity.HideKeyboardEvent = () => {
            BaseActivity.HideKeyboardEvent = () =>
            {
                if (this.Y != 0)
                {
                    Application.RunOnMainThread(() =>
@@ -36,12 +38,13 @@
                    });
                }
            };
            BaseActivity.ShowKeyboardEvent = () => {
            BaseActivity.ShowKeyboardEvent = () =>
            {
                try
                {
                    if (etPassword.Foucs)
                    {
                     

                        new Thread(() =>
                        {
                            Thread.Sleep(100);
@@ -67,8 +70,9 @@
                }
                catch { }
            };
            BaseActivity.SmsAction = (message) => {
                Console.WriteLine($"接收到短信："+ message);
            BaseActivity.SmsAction = (message) =>
            {
                Console.WriteLine($"接收到短信：" + message);

                string pattern = @"【HDL】.*(\d{6}).*";

@@ -80,7 +84,7 @@
                {
                    string code = match.Groups[1].Value;
                    Console.WriteLine("验证码为：" + code);
                    if(loginType==0 && logintMode == 1)
                    if (loginType == 0 && logintMode == 1)
                    {
                        etPassword.Text = code;
                    }
@@ -104,7 +108,8 @@
            }

#if __ANDROID__
            BaseActivity.HideKeyboardEvent = () => {
            BaseActivity.HideKeyboardEvent = () =>
            {

            };
            BaseActivity.ShowKeyboardEvent = () => { };
@@ -116,7 +121,7 @@
            //Application.HideSoftInput();
        }

#region 局部变量
        #region 局部变量
        /// <summary>
        /// 登录类型
        /// 0:手机
@@ -135,9 +140,9 @@
        /// 短信验证码
        /// </summary>
        string smsCode = "";
#endregion
        #endregion

#region 控件列表
        #region 控件列表
        /// <summary>
        /// 等待提示
        /// </summary>
@@ -230,7 +235,7 @@
        /// 服务器请求对象
        /// </summary>
        HttpServerRequest pm;
#endregion
        #endregion

        string verAccount = "";

@@ -273,7 +278,8 @@
                UnSelectedImagePath = "Public/Logo-bg.png"
            };
            bodyView.AddChidren(btnIcon_bg);
            btnIcon_bg.MouseDownEventHandler += (sender, e) => {
            btnIcon_bg.MouseDownEventHandler += (sender, e) =>
            {
                Application.HideSoftInput();
            };

@@ -281,117 +287,83 @@
            btnIcon_bg.MouseUpEventHandler += (sender, e) =>
            {
                return;
                

            };

            bool b = false;
            btnIcon.MouseUpEventHandler += (sender, e) =>
            btnIcon.MouseUpEventHandler = (sender, e) =>
            {


                //ESOnVideo.Current.Test(false);

                //return;
                if (b)
                {
                    //etAccount.Text = "1033326940@qq.com";
                    //etAccount.Text = "18022428438";//wjc
                    //etAccount.Text = "13602944661";//kx
                    //etAccount.Text = "13226233133";//豆豆
                    //etAccount.Text = "18316120654";//tujie
                    //etAccount.Text = "13450425807";//黄竹溪 knx项目
                    //etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "455740454@qq.com";
                    //etAccount.Text = "18688565449";
                    //etAccount.Text = "18570064522";
                    //etAccount.Text = "18718417827";
                    //etAccount.Text = "18188019284";
                    //etAccount.Text = "13143792049";
                    //etAccount.Text = "13288623489";//罗晓东
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "13143792049";
                    //etAccount.Text = "18688414428";//天河3楼
                    //etAccount.Text = "13418062953";
                    //etAccount.Text = "13138683659";
                    //etAccount.Text = "15217626103";
                    //etAccount.Text = "18100573477";
                    //etAccount.Text = "18321091245";
                    //etAccount.Text = "13751916353";
                    //etAccount.Text = "13549566666";
                    //etAccount.Text = "13375012446";//测试服务器
                    //etAccount.Text = "15855403939";
                    //etAccount.Text = "15006564444";
                    //etAccount.Text = "pjh@hdlchina.com.cn";
                    //etAccount.Text = "12345678904";//2.0 测试  萤石
                    //etAccount.Text = "18316672920";
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "1272061968@qq.com";//万科城市之光E区8栋206
                    //etAccount.Text = "13533335801";
                    //etAccount.Text = "13682244600";
                    //etAccount.Text = "marketing@australindo.co.id";
                    //etAccount.Text = "13922115008";//刘总
                    //etAccount.Text = "1272061968@qq.com";
                    //etAccount.Text = "info@hdlegypt.com";
                    //etAccount.Text = "18402017839";
                    //etAccount.Text = "support7@hdlautomation.com";
                    etAccount.Text = "649362315@qq.com";


                    etAccount.Text = "13336018868";
                    etAccount.Text = "649362315@qq.com";//蔡淑娴
                    //etAccount.Text = "18402017839";
                    //etAccount.Text = "13414984501";//吴晓聪
                    etAccount.Text = "13682244600";
                    etAccount.Text = "pjh@hdlchina.com.cn";
                    etAccount.Text = "13580507523";
                    etAccount.Text = "18475593023";
                    //etAccount.Text = "13960905167";
                }
                else
                {
                    //etAccount.Text = "464027401@qq.com";//
                    //etAccount.Text = "15217626103";//
                    //etAccount.Text = "13168123446";//昆明金茂项目，新风问题
                    //etAccount.Text = "2949126848@qq.com";//陈琳
                    //etAccount.Text = "15014291819 ";
                    //etAccount.Text = "13676202754";//巴林服务器
                    //etAccount.Text = "13602944661";//kx
                    //etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
                    //etAccount.Text = "15971583093";//高胜
                    //etAccount.Text = "15217626103";//昆明金茂项目
                    //etAccount.Text = "18598273624";
                    //etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "18814122445";//董泽斌 天河办公室
                    //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
                    //etAccount.Text = "13430286286";//cwc
                    //etAccount.Text = "13709260805";
                    //etAccount.Text = "support5@hdlchina.com.cn";
                    //etAccount.Text = "13375012441";
                    //etAccount.Text = "info@smartlife-ks.com";
                    //etAccount.Text = "551775569@qq.com";//wcf
                    etAccount.Text = "15626203746";
                    //etAccount.Text = "zhangquansongjava@163.com";
                    //etAccount.Text = "s.savinov@hdlautomation.ru";

                }
                //etAccount.Text = "13580507523";
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "info@hdlegypt.com")
                if (etAccount.Text == "13682244600")
                {
                    etPassword.Text = "@Hdl2020";
                    etPassword.Text = "asd123456789123";
                }
                else if(etAccount.Text == "18600200915")
                else if (etAccount.Text == "18475593023")
                {
                    etPassword.Text = "ZJtiaoshi";
                }else if(etAccount.Text == "13288623489")
                    etPassword.Text = "a123456";
                }
                else if (etAccount.Text == "13288623489")
                {
                    etPassword.Text = "luoxiaodong";
                }else if(etAccount.Text == "18688414428")
                }
                else if (etAccount.Text == "15014291819")
                {
                    etPassword.Text = "HDL1985000";
                }else if (etAccount.Text == "15855403939")
                    etPassword.Text = "hdl123456";
                }
                else if (etAccount.Text == "15262988048")
                {
                    etPassword.Text = "yyr123456";
                    etPassword.Text = "15262988048";
                }
                else if (etAccount.Text == "649362315@qq.com")
                {
                    etPassword.Text = "aa123456";
                }else if(etAccount.Text == "dcai.assist@gmail.com")
                {
                    etPassword.Text = "GraniteTileS57";
                }
                //etPassword.Text = "Hdl85521566";
                else if (etAccount.Text == "13580507523")
                {
                    etPassword.Text = "a123456";
                }
                btnLogin.IsSelected = true;
            };
#endif
@@ -412,7 +384,7 @@

            btnEmailLogin = new Button()
            {
                X = btnPhoneLogin.Right ,//+ Application.GetRealWidth(20),
                X = btnPhoneLogin.Right,//+ Application.GetRealWidth(20),
                Y = Application.GetRealHeight(177),
                Width = Application.GetRealWidth(140),
                Height = Application.GetRealHeight(40),
@@ -422,9 +394,9 @@
                TextSize = CSS_FontSize.TextFontSize,
            };
            bodyView.AddChidren(btnEmailLogin);
#endregion
            #endregion

#region 账号填写
            #region 账号填写
            accountView = new FrameLayout()
            {
                X = Application.GetRealWidth(28),
@@ -515,9 +487,9 @@
                accountView.AddChidren(btnAccountIcon);
            }

#endregion
            #endregion

#region 密码填写
            #region 密码填写
            passwordView = new FrameLayout()
            {
                X = Application.GetRealWidth(28),
@@ -558,10 +530,11 @@
                PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
                SecureTextEntry = true,
                TextAlignment = TextAlignment.CenterLeft,

            };
            passwordView.AddChidren(etPassword);

#region 密码登录-控件加载
            #region 密码登录-控件加载
            btnVisiblePassword = new Button()
            {
                X = Application.GetRealWidth(223),
@@ -593,9 +566,9 @@
                TextSize = 12,
            };
            passwordView.AddChidren(btnForgetPassword);
#endregion
            #endregion

#region 验证码登录-控件加载
            #region 验证码登录-控件加载
            btnGetVerificationCode = new Button()
            {
                X = Application.GetRealWidth(219),
@@ -609,7 +582,7 @@
                IsSelected = false,
            };
            passwordView.AddChidren(btnGetVerificationCode);
#endregion
            #endregion

            btnPasswordViewBottomLine = new Button()
            {
@@ -620,9 +593,9 @@
            };
            passwordView.AddChidren(btnPasswordViewBottomLine);

#endregion
            #endregion

#region 注册与快捷登录
            #region 注册与快捷登录
            btnRegister = new Button()
            {
                X = Application.GetRealWidth(28),
@@ -649,7 +622,7 @@
            };
            bodyView.AddChidren(btnSwitchLoginMode);

#endregion
            #endregion

            btnLogin = new Button()
            {
@@ -691,7 +664,8 @@
                }
            }

            btnDomeLogin.MouseUpEventHandler = (sender, e) => {
            btnDomeLogin.MouseUpEventHandler = (sender, e) =>
            {

                MainPage.NoLoginMode = true;
#if DEBUG
@@ -701,13 +675,13 @@
                //楼层房间列表
                var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
                floor1.SaveRoomFile();
#region 房间一 -- 客厅
                #region 房间一 -- 客厅
                //处理房间列表

                var room1 = new Room()
                {
                    roomId = "1405771366041378818",
                    roomName = Language.CurrentLanguage == "Chinese"? "洗手间" : "Restroom",
                    roomName = Language.CurrentLanguage == "Chinese" ? "洗手间" : "Restroom",
                    roomImage = "Classification/Room/Roombg.png",
                    uid = "47c98953-6fd4-4379-88b9-4b748963504f",
                    roomType = "ROOM",
@@ -735,7 +709,7 @@
                var room3 = new Room()
                {
                    roomId = "1405771193802285057",
                    roomName = Language.CurrentLanguage == "Chinese"? "餐厅" : "Restaurant",
                    roomName = Language.CurrentLanguage == "Chinese" ? "餐厅" : "Restaurant",
                    roomImage = "Classification/Room/Roombg.png",
                    uid = "ed7fc784-aace-44b8-97a3-bc3e727e598b",
                    roomType = "ROOM",
@@ -749,7 +723,7 @@
                var room4 = new Room()
                {
                    roomId = "1405771024583090178",
                    roomName = Language.CurrentLanguage == "Chinese"? "客厅" : "Drawing room",
                    roomName = Language.CurrentLanguage == "Chinese" ? "客厅" : "Drawing room",
                    roomImage = "Classification/Room/Roombg.png",
                    uid = "9191a3a2-026f-4667-a0b1-e3af699e7295",
                    roomType = "ROOM",
@@ -781,15 +755,15 @@
                SpatialInfo.CurrentSpatial.RoomList.Add(room4);


#region 客厅
#region 功能
                #region 客厅
                #region 功能
                var lightRgb1 = new Function()
                {
                    sid = "light10000000000",
                    deviceId = "light10000000000",
                    name = Language.CurrentLanguage == "Chinese"?  "客厅氛围灯1": "RGB light 1",
                    name = Language.CurrentLanguage == "Chinese" ? "客厅氛围灯1" : "RGB light 1",
                    spk = SPK.LightRGB,
                    roomIds = new List<string>() { "1405771024583090178"},
                    roomIds = new List<string>() { "1405771024583090178" },
                    collect = true,
                    attributes = new List<FunctionAttributes>()
                    {
@@ -811,7 +785,7 @@
                    deviceId = "light2",
                    name = Language.CurrentLanguage == "Chinese" ? "客厅氛围灯2" : "RGB light 2",
                    spk = SPK.LightRGB,
                    roomIds = new List<string>() { "1405771024583090178"},
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -828,7 +802,7 @@
                    deviceId = "light3",
                    name = Language.CurrentLanguage == "Chinese" ? "阅读灯" : "CCT light",
                    spk = SPK.LightCCT,
                    roomIds = new List<string>() { "1405771024583090178"},
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -860,7 +834,7 @@
                    deviceId = "light5",
                    name = Language.CurrentLanguage == "Chinese" ? "开关灯" : "light 2",
                    spk = SPK.LightSwitch,
                    roomIds = new List<string>() { "1405771024583090178"},
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -874,7 +848,7 @@
                    deviceId = "curtain1",
                    name = Language.CurrentLanguage == "Chinese" ? "开合帘" : "Curtain 1",
                    spk = SPK.CurtainTrietex,
                    roomIds = new List<string>() { "1405771024583090178"},
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -888,7 +862,7 @@
                    deviceId = "curtain2",
                    name = Language.CurrentLanguage == "Chinese" ? "卷帘" : "Curtain 2",
                    spk = SPK.CurtainRoller,
                    roomIds = new List<string>() { "1405771024583090178"},
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -921,7 +895,7 @@
                    deviceId = "floorheat1",
                    name = Language.CurrentLanguage == "Chinese" ? "地暖" : "Floorheat 1",
                    spk = SPK.FloorHeatStandard,
                    roomIds = new List<string>() { "1405771024583090178"},
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -936,21 +910,7 @@


#if DEBUG
                var hesTv = new Function()
                {
                    sid = "hisense000000000001",
                    deviceId = "hisense000000000001",
                    name = "海信电视",
                    spk = SPK.ElectricalTvHisense,

                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "off" }, curValue="on",state = "on"   },
                        new FunctionAttributes() { key = "wol",value =new List<string>(){ "on" }, curValue="on",state = "on"   },
                    }
                };
                hesTv.SaveFunctionFile();
               


                var airSwitchP3 = new Function()
@@ -1085,11 +1045,39 @@

                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-金茂光伏储能",
                    extend = "jinmaot1rue",
                    spk = SPK.InverterJinmao,
                    collect = true,
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.pv_power.ToString(),value =new List<string>(){ "on","off" }, curValue="28",state = "28" },
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.pv_electricity_today.ToString(),value = new List<string>(){ "0" },curValue ="20",state = "20"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.pv_electricity_month.ToString(),value = new List<string>(){ "0" },curValue ="500",state = "500"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.pv_electricity.ToString(),value = new List<string>(){ "0" },curValue ="2100",state = "2100"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.system_status.ToString(),value = new List<string>(){ "0" },curValue = InverterJinmao_Attr_SystemStatusEnum.run.ToString(),state = InverterJinmao_Attr_SystemStatusEnum.run.ToString()},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.ess_status.ToString(),value = new List<string>(){ "0" },curValue = InverterJinmao_Attr_EssStatusEnum.charge.ToString(),state = InverterJinmao_Attr_EssStatusEnum.charge.ToString()},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.ess_charge_power.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.ess_discharg_power.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.battery_soc.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_active_power.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity_today.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity_month.ToString(),value = new List<string>(){ "0" },curValue ="200",state = "200"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity.ToString(),value = new List<string>(){ "0" },curValue ="1000",state = "1000"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.coal.ToString(),value = new List<string>(){ "0" },curValue ="1021210",state = "1021210"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.co2.ToString(),value = new List<string>(){ "0" },curValue ="1031300",state = "1031300"},
                        new FunctionAttributes(){key = InverterJinmao_AttrEnum.trees.ToString(),value = new List<string>(){ "0" },curValue ="121310",state = "121310"},
                    }
                });

                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统总控",
                    spk = SPK.AcstParent,
                    //collect = true,
                    extend = "jinmaotrue",
                    collect = true,
                    attributes = new List<FunctionAttributes>()
                {
                    {
                    new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
                         value = new List<string>
@@ -1114,17 +1102,17 @@
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"},
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"},
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"},
                    //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
                    //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
                    //new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
                    //new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
                    //new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
                }
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
                    new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
                    }
                });

                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统子控-1",
                    name = "子控-1",
                    spk = SPK.AcstSub,
                    sid = "0000001",
                    attributes = new List<FunctionAttributes>()
@@ -1137,7 +1125,7 @@
                });
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统子控-2",
                    name = "子控-2",
                    spk = SPK.AcstSub,
                    sid = "0000002",
                    attributes = new List<FunctionAttributes>()
@@ -1150,7 +1138,7 @@
                });
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统子控-3",
                    name = "子控-3",
                    spk = SPK.AcstSub,
                    sid = "0000003",
                    attributes = new List<FunctionAttributes>()
@@ -1163,7 +1151,7 @@
                });
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统子控-4",
                    name = "子控-4",
                    spk = SPK.AcstSub,
                    sid = "0000004",
                    attributes = new List<FunctionAttributes>()
@@ -1174,18 +1162,41 @@
                    new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
                }
                });
                
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统子控-5",
                    name = "子控-5",
                    spk = SPK.AcstSub,
                    sid = "0000005",
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
                        new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
                        new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
                        new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
                    }
                });

                FunctionList.List.Functions.Add(new Function
                {
                    new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
                    new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
                    new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
                    new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
                }
                    name = "热水器-1",
                    spk = SPK.WaterHeaterJinmao,
                    sid = "0000000001",
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.co2.ToString(),curValue = "522222",state = "522222" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.energy_electricity.ToString(),curValue = "144400",state = "144400" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.flow.ToString(),curValue = "2",state = "2" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.mode.ToString(),curValue = "economic",state = "economic" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.mode_free.ToString(),curValue = "true",state = "true" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.recycl_volume.ToString(),curValue = "10",state = "10" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.set_temp.ToString(),curValue = "25",state = "25" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.temp.ToString(),curValue = "23",state = "23" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.trees.ToString(),curValue = "11228",state = "11228" },
                        new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.volume.ToString(),curValue = "100",state = "100" },

                    },
                });


@@ -1223,6 +1234,7 @@
                {
                    name = "测试温控器",
                    spk = SPK.HvacCac,
                    collect = true,
                    attributes = new List<FunctionAttributes>
                {
                    new FunctionAttributes(){ key = "on_off",curValue = "on",state = "on" },
@@ -1678,9 +1690,9 @@

                };
                scene2.SaveSceneFile();
#endregion
#endregion
#region 餐厅
                #endregion
                #endregion
                #region 餐厅
                var lightSwitch3 = new Function()
                {
                    sid = "light6",
@@ -1784,8 +1796,8 @@
                    }
                };
                scene4.SaveSceneFile();
#endregion
#region 卧室
                #endregion
                #region 卧室
                var ac = new Function()
                {
                    sid = "ac1",
@@ -1847,7 +1859,7 @@
                //    collect = false,
                //};
                //scene6.SaveSceneFile();
#endregion
                #endregion


                var lightSwitch6 = new Function()
@@ -1865,12 +1877,12 @@
                };
                lightSwitch6.SaveFunctionFile();

#endregion
                #endregion

                var fileList = Common.FileUtlis.Files.ReadFiles();
                foreach(var file in fileList)
                foreach (var file in fileList)
                {
                    FunctionList.List.IniFunctionList(file,true);
                    FunctionList.List.IniFunctionList(file, true);
                }
                Room.CurrentSpatial.InitRoomListFunctions();

@@ -1885,13 +1897,13 @@
            account = etAccount.Text.Trim();


#region 隐私政策
            #region 隐私政策
            AddServiceAgreementControl(bodyView);
#endregion
            #endregion

        }

#region ■ 服务协议___________________________
        #region ■ 服务协议___________________________
        bool isAgreePrivacyPolicy = false;
        /// <summary>
        /// 添加服务协议控件
@@ -1921,7 +1933,7 @@
                X = Application.GetRealWidth(22),
            };
            frameRow.AddChidren(agreeView);
            if(Language.CurrentLanguage == "Chinese")
            if (Language.CurrentLanguage == "Chinese")
            {
                agreeView.X = Application.GetRealWidth(52);
            }
@@ -2041,7 +2053,7 @@
#if DEBUG
            return true;
#endif
            if(HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
            if (HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
            {
                return true;
            }
@@ -2054,6 +2066,6 @@
            return true;
        }

#endregion
        #endregion
    }
}