Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 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,7 +38,8 @@
                    });
                }
            };
            BaseActivity.ShowKeyboardEvent = () => {
            BaseActivity.ShowKeyboardEvent = () =>
            {
                try
                {
                    if (etPassword.Foucs)
@@ -67,7 +70,8 @@
                }
                catch { }
            };
            BaseActivity.SmsAction = (message) => {
            BaseActivity.SmsAction = (message) =>
            {
                Console.WriteLine($"接收到短信："+ message);

                string pattern = @"【HDL】.*(\d{6}).*";
@@ -104,7 +108,8 @@
            }

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

            };
            BaseActivity.ShowKeyboardEvent = () => { };
@@ -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();
            };

@@ -309,9 +315,12 @@
                    //etAccount.Text = "13922115008";//刘总
                    //etAccount.Text = "support7@hdlautomation.com";
                    etAccount.Text = "13336018868";
                    etAccount.Text = "13435693712";


                    etAccount.Text = "649362315@qq.com";//蔡淑娴
                    //etAccount.Text = "18402017839";
                    //etAccount.Text = "18620993214";
                    //etAccount.Text = "13414984501";//吴晓聪
                    etAccount.Text = "13580507523";
                    etAccount.Text = "18475593023";
                }
                else
                {
@@ -330,31 +339,34 @@
                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "13336018868")
                if (etAccount.Text == "18620993214")
                {
                    etPassword.Text = "zzy20020928";
                    etPassword.Text = "hdl1985.";
                }
                else if(etAccount.Text == "13435693712")
                else if (etAccount.Text == "18475593023")
                {
                    etPassword.Text = "a123456";
                }else if(etAccount.Text == "13288623489")
                }
                else if (etAccount.Text == "13288623489")
                {
                    etPassword.Text = "luoxiaodong";
                }else if(etAccount.Text == "15014291819")
                }
                else if (etAccount.Text == "15014291819")
                {
                    etPassword.Text = "hdl123456";
                }else if (etAccount.Text == "15262988048")
                }
                else if (etAccount.Text == "15262988048")
                {
                    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
@@ -521,6 +533,7 @@
                PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
                SecureTextEntry = true,
                TextAlignment = TextAlignment.CenterLeft,

            };
            passwordView.AddChidren(etPassword);

@@ -654,7 +667,8 @@
                }
            }

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

                MainPage.NoLoginMode = true;
#if DEBUG
@@ -1034,9 +1048,37 @@

                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" },
@@ -1063,17 +1105,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>()
@@ -1086,7 +1128,7 @@
                });
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统子控-2",
                    name = "子控-2",
                    spk = SPK.AcstSub,
                    sid = "0000002",
                    attributes = new List<FunctionAttributes>()
@@ -1099,7 +1141,7 @@
                });
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统子控-3",
                    name = "子控-3",
                    spk = SPK.AcstSub,
                    sid = "0000003",
                    attributes = new List<FunctionAttributes>()
@@ -1112,7 +1154,7 @@
                });
                FunctionList.List.Functions.Add(new Function
                {
                    name = "测试-空调科技系统子控-4",
                    name = "子控-4",
                    spk = SPK.AcstSub,
                    sid = "0000004",
                    attributes = new List<FunctionAttributes>()
@@ -1123,9 +1165,10 @@
                    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>()
@@ -1135,6 +1178,28 @@
                    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
                {
                    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" },

                    },
                });


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