Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-20 76f93f093282d72e97894132277d3412b6bf8bea

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

@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Newtonsoft.Json.Linq;
using Shared;

namespace HDL_ON.UI
@@ -939,7 +941,8 @@
                        break;
                    case ShowFunction.DoorLock:
                        btnName.TextID = StringId.DoorLock;
                        btnFunctionViewBg.MouseUpEventHandler = (sende, e) => {
                        btnFunctionViewBg.MouseUpEventHandler = (sende, e) =>
                        {
                            var form = new DoorLockListPage();
                            form.AddForm(FunctionList.List.GetDoorLockList());
                        };
@@ -969,7 +972,8 @@
                    case ShowFunction.EnergyMonitoring:
                        #region 能源监测
                        btnName.TextID = StringId.EnergyMonitoring;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var skipView = new EnergyMainPage();
                            MainPage.BasePageView.AddChidren(skipView);
                            skipView.LoadPage();
@@ -1230,7 +1234,8 @@
                var clickButton = new Button();
                inverterListView.AddChidren(clickButton);

                clickButton.MouseUpEventHandler = (sender2, e2) => {
                clickButton.MouseUpEventHandler = (sender2, e2) =>
                {
                    var h5BasePage = new FrameLayout();
                    
#if __Android__
@@ -1241,16 +1246,46 @@
                    MainPage.BasePageView.AddChidren(h5BasePage);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    
                    h5BasePage.AddChidren(Inverter.Ins.H5Page);
                    h5BasePage.AddChidren(Inverter.Ins.H5Page);//000
                    string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}";
                    Inverter.Ins.ShowWebviewFormUrl(url);
                    Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
                    {
                        JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));

                    Inverter.Ins.ShowWebviewFormUrl($"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}");
                    Inverter.Ins.H5Page.JSToNativeAction =  (pairs) => {
                        MainPage.Log("xxxx");
                        if (!jObj.ContainsKey("method") || !jObj.ContainsKey("data"))
                        {
                            return;
                        }
                        if (jObj["method"].ToString() == "control" && jObj["data"].Type == JTokenType.Object)
                        {//控制
                            var data = JObject.FromObject(jObj["data"]);

                            if (!data.ContainsKey("sid") || !data.ContainsKey("on_off"))
                            {
                                return;
                            }
                            var function = new Function();
                            function.sid = data["sid"].ToString();
                            var inObj = FunctionList.List.InverterList.Find((obj) => obj.sid == function.sid);
                            if (inObj == null)
                            {
                                return;
                            }
                            function.deviceId = inObj.deviceId;
                            //function.spk = inObj.spk;

                            var status = new Dictionary<string, string>() { ["on_off"] = data["on_off"].ToString() };
                            Control.Ins.SendWriteCommand(function, status);
                        }
                        else if (jObj["method"].ToString() == "back")
                        {
                            Application.RunOnMainThread(() =>
                            {
                                h5BasePage.RemoveFromParent();
                            });
                        }
                    };
                    Inverter.Ins.H5Page.CallJS("");
                    //Inverter.Ins.H5Page.DidFinishAction = () => {

                    //};
                };