Merge branch 'Dev-Branch' into wjc

wjc

2023-07-19 1b56157e8edc3f502810820d99b607e3629c7171

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -41,8 +41,14 @@
                {
                    if (etPassword.Foucs)
                    {
                     
                        new Thread(() =>
                        {
                            Thread.Sleep(100);
                            if (this.Y < 0)
                            {
                                return;
                            }
                            for (var i = 0; i < 10; i++)
                            {
                                Application.RunOnMainThread(() =>
@@ -246,6 +252,8 @@
#if __Android__
            OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
            this.BackgroundColor = CSS_Color.MainBackgroundColor;

            var btnIcon = new Button()
            {
                X = Application.GetRealWidth(28),
@@ -315,6 +323,9 @@
                    etAccount.Text = "18316672920";
                    etAccount.Text = "support7@hdlautomation.com";
                    etAccount.Text = "13375012446";//测试服务器
                    etAccount.Text = "15855403939";
                    etAccount.Text = "15006564444";
                    etAccount.Text = "13580507523";
                }
                else
                {
@@ -359,16 +370,16 @@
                }else if(etAccount.Text == "18688414428")
                {
                    etPassword.Text = "HDL1985000";
                }else if (etAccount.Text == "13138683659")
                }else if (etAccount.Text == "15855403939")
                {
                    etPassword.Text = "wsad123321";
                    etPassword.Text = "yyr123456";
                }
                else if (etAccount.Text == "18100573477")
                {
                    etPassword.Text = "huang12345";
                }else if(etAccount.Text == "13549566666")
                }else if(etAccount.Text == "15006564444")
                {
                    etPassword.Text = "12345678";
                    etPassword.Text = "zht626800";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;
@@ -761,8 +772,8 @@
#region 功能
                var lightRgb1 = new Function()
                {
                    sid = "light1",
                    deviceId = "light1",
                    sid = "light10000000000",
                    deviceId = "light10000000000",
                    name = Language.CurrentLanguage == "Chinese"?  "客厅氛围灯1": "RGB light 1",
                    spk = SPK.LightRGB,
                    roomIds = new List<string>() { "1405771024583090178"},
@@ -772,8 +783,12 @@
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
                        new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100"   },
                        new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0"   },
                        //new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0"   },
                        new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0"   },
                        new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0"   },
                        new FunctionAttributes() { key = "colorful",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
                        new FunctionAttributes() { key = FunctionAttributeKey.ColorfulBegin,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0"   },
                        new FunctionAttributes() { key = FunctionAttributeKey.ColorfulEnd,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0"   },
                        new FunctionAttributes() { key = FunctionAttributeKey.ColorfulTime,value =new List<string>(){ "0","100" }, curValue="0",state = "0"   },
                    },
                };
                lightRgb1.SaveFunctionFile();
@@ -900,7 +915,7 @@
                        new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day"   },
                        new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5  },
                        new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26"   },
                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "°F", "°C" }, curValue = "°F", state = "°F" },
                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "°F", "°C" }, curValue = "°C", state = "°C" },
                    },
                };
                fh.SaveFunctionFile();
@@ -908,6 +923,69 @@


#if DEBUG


                if (FunctionList.List.groupControls.Count == 0)
                {
                    FunctionList.List.groupControls.Add(new GroupControl()
                    {
                        name = "群控测试",
                        collect = true,
                        uids = new List<string>()
                        {
                            "1405771024583090178",
                            "9191a3a2-026f-4667-a0b1-e3af699e7295",
                        },
                        roomIds = new List<string>()
                        {
                            "1405771024583090178",
                            "9191a3a2-026f-4667-a0b1-e3af699e7295",
                        },
                        sids = new List<GroupControlFunction>()
                        {
                            new GroupControlFunction(){
                               sid = "light1",
                                spk = SPK.LightRGB,
                            },
                            new GroupControlFunction(){
                            sid = "light2",
                                spk = SPK.LightRGB,
                            },
                        }
                    });
                }


                var series1 = new Function()
                {
                    sid = "light10000000000series1",
                    deviceId = "light10000000000series1",
                    name = Language.CurrentLanguage == "Chinese" ? "序列1" : "Series1",
                    spk = SPK.CommonSeries,
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
                    },
                };
                series1.SaveFunctionFile();


                var series2 = new Function()
                {
                    sid = "light10000000000series2",
                    deviceId = "light10000000000series2",
                    name = Language.CurrentLanguage == "Chinese" ? "序列2" : "Series2",
                    spk = SPK.CommonSeries,
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
                    },
                };
                series2.SaveFunctionFile();


                var mechanicalArm = new Function()
                {
                    sid = "mechanicalArm1",
@@ -1050,34 +1128,34 @@



                //FunctionList.List.Functions.Add(new Function
                //{
                //    name = "测试梦幻窗帘",
                //    spk = SPK.CurtainDream,
                //    sid = "1234577",
                //    attributes = new List<FunctionAttributes> {
                //        new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
                //        new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
                //        new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
                //    }
                //});
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试梦幻窗帘",
                    spk = SPK.CurtainDream,
                    sid = "1234577",
                    attributes = new List<FunctionAttributes> {
                        new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
                        new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
                        new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
                    }
                });

                //FunctionList.List.Functions.Add(new Function
                //{
                //    name = "测试毫米波传感器",
                //    spk = SPK.SenesorMegahealth,
                //    attributes = new List<FunctionAttributes>
                //    {
                //        new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
                //        new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
                //        new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
                //        new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0空，1走，2跑，3坐，4跌倒，5站
                //        new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//状态  有人无人
                //        //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                //        //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                //        //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                //    }
                //});
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试毫米波传感器",
                    spk = SPK.SenesorMegahealth,
                    attributes = new List<FunctionAttributes>
                    {
                        new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
                        new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
                        new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
                        new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0空，1走，2跑，3坐，4跌倒，5站
                        new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//状态  有人无人
                        //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                        //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                        //new FunctionAttributes(){ key = "",curValue = "",state = "" },
                    }
                });
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试温控器",
@@ -1329,8 +1407,9 @@
#endif


#endregion
#region 场景
                #endregion

                #region 场景
                var scene1 = new Scene()
                {
                    sid = "scene1",
@@ -1624,7 +1703,7 @@
                        new FunctionAttributes() { key = "set_temp",step = "0.5", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
                        new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
                        new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "°F", "°C" }, curValue = "°F", state = "°F" },
                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "°F", "°C" }, curValue = "°C", state = "°C" },
                    }
                };
                ac2.SaveFunctionFile();
@@ -1687,29 +1766,6 @@
            LoadEventList();
            account = etAccount.Text.Trim();

#if DEBUG1211
            //本地模式
            Button btnLocalMode = new Button()
            {
                Y = Application.GetRealHeight(600),
                Height = Application.GetRealHeight(67),
                Text = "Local Mode",
                TextAlignment = TextAlignment.Center,
                BackgroundColor  = CSS_Color.MainColor,
                TextColor = CSS_Color.TextualColor,
            };
            bodyView.AddChidren(btnLocalMode);

            btnLocalMode.MouseUpEventHandler = (sender, e) =>
            {
                MainPage.LocalMode = true;
                 UserInfo.Current = new UserInfo();
                MainPage.GoUserPage();
            };

            MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());

#endif

#region 隐私政策
            AddServiceAgreementControl(bodyView);