1.

wei

2021-03-16 223b318d0070d06e7b64192dc93aa8103865d657

1.

合并红外宝代码
谭召元：入网
温居城：添加设备

 .DS_Store

Binary files differ

 DLL/IOS/HdlBluWi.dll

Binary files differ

 HDL-ON_Android/.DS_Store

Binary files differ

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL-ON_iOS/.DS_Store

Binary files differ

 HDL_ON/Common/FileUtlis.cs

@@ -48,7 +48,7 @@
        {
            get
            {
                if(DB_ResidenceData.Instance.CurrentRegion == null)
                if(DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.RegionID == null)
                {
                    return AccountPath;
                }

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -229,7 +229,7 @@
        public void SearchLoaclGateway()
        {
            //2021-01-15 : 住宅没有绑定网关的时候不用搜索，并且不能链接mqtt
            if(DB_ResidenceData.Instance.HomeGateway == null)
            if(DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId))
            {
                return;
            }
@@ -625,7 +625,7 @@
                    var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
                    if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
                    {
                        //MainPage.Log("本地搜索网关成功");   
                        MainPage.Log("本地搜索网关成功");
                        Ins.IsSearchLocalGatewaySuccessful = true;
                        Ins.GatewayOnline_Local = true;
                        if (!string.IsNullOrEmpty(device.gatewayId))

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -229,6 +229,10 @@
            {
                return;
            }
            if(DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.RegionID == null)
            {
                return;
            }

            //追加：没有远程连接的权限
            if (RemoteMqttIsConnecting || remoteIsConnected)

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -242,7 +242,33 @@

            btnAddIcon.MouseUpEventHandler += (sender, e) =>
            {
                LoadEvent_AddEvent(type, callBack);
                if (type == "floors")
                {
                    Action<string> callBackAction = (floorName) =>
                    {
                        callBack("add", floorName);
                    };
                    string newFloorName = "1F";
                    for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1;)
                    {
                        newFloorName = ++i + "F";
                        if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == newFloorName))
                        {
                            break;
                        }
                    }
                    var fs = new List<string>();
                    foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
                    {
                        fs.Add(f.roomName);
                    }
                    new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors, newFloorName, callBackAction, StringId.FloorNameCannotBeEmpty,
                        StringId.AddFloorFailed_FloorAlreadyExist, fs);
                }
                else
                {
                    callBack("", "");
                }
            };
        }


 HDL_ON/UI/UI0-Public/TopViewDivBLL.cs

@@ -36,38 +36,11 @@
        /// <param name="type">添加按钮的功能类型</param>
        void LoadEvent_AddEvent(string type,Action <string,string> callBack)
        {
            switch (type)
            {
                case "floors":
                    Action<string> callBackAction = (floorName) =>
                    {
                        callBack("add", floorName);
                    };
                    string newFloorName = "1F";
                    for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1; )
                    {
                        newFloorName = ++i + "F";
                        if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj)=>obj.roomName ==  newFloorName))
                        {
                            break;
                        }
                    }
                    var fs = new List<string>();
                    foreach(var f in SpatialInfo.CurrentSpatial.FloorList)
                    {
                        fs.Add(f.roomName);
                    }
                    new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty,
                        StringId.AddFloorFailed_FloorAlreadyExist,fs);
                    break;
                case "rooms":
                    callBack("", "");
                    break;
                case "Member":
                    callBack("","");
                    break;
            //switch (type)
            //{
                
            }
                
            //}
        }

    }

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs

@@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
namespace HDL_ON.UI
@@ -16,7 +18,14 @@

        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();
            Action<string,string> action = (s,a) => {
                var page = new AddThirdPartyBrandListpage();
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                this.RemoveFromParent();
            };
            new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_AddIcon("3ty",action);

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

@@ -28,7 +37,116 @@
            bodyView.AddChidren(contentView);


            NotListTipView();

        }
        /// <summary>
        /// 获取绑定列表
        /// </summary>
        void GetBindList()
        {
            var waitPage = new Loading();
            waitPage.Start();
            new System.Threading.Thread(() => {
                try
                {
                    var pm = new DAL.Server.HttpServerRequest();
                    var pack = pm.Get3tyBrandList();
                    if (pack.Code == DAL.Server.StateCode.SUCCESS)
                    {
                        var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrand>>(pack.Data.ToString());
                        if (revData.Count > 0)
                        {
                            Application.RunOnMainThread(() =>
                            {
                                LoadRow(revData);
                            });
                        }else
                        {
                            Application.RunOnMainThread(() =>
                            {
                                NotListTipView();
                              
                            });
                        }
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log("2--::" + ex.Message);
                }
                finally
                {
                    Application.RunOnMainThread(() => { waitPage.Hide(); });
                }
            })
            { IsBackground = true }.Start();
        }


        void LoadRow(List<IntegratedBrand> brandList)
        {
            contentView.RemoveAll();
            bool isFrist = true;
            foreach (var brand in brandList)
            {
                FrameLayout row = new FrameLayout()
                {
                    Height = Application.GetRealHeight(50),
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                };
                contentView.AddChidren(row);

                if (isFrist)
                {
                    isFrist = false;
                }
                else
                {
                    Button btnLine = new Button()
                    {
                        X = Application.GetRealWidth(56),
                        Y = Application.GetRealHeight(49),
                        Width = Application.GetRealWidth(303),
                        Height = 1,
                        BackgroundColor = CSS_Color.DividingLineColor,
                    };
                    row.AddChidren(btnLine);
                }

                ImageView btnIcon = new ImageView()
                {
                    X = Application.GetRealWidth(12),
                    Gravity = Gravity.CenterVertical,
                    Width = Application.GetRealWidth(32),
                    Height = Application.GetRealWidth(32),
                    Radius = (uint)Application.GetRealWidth(4),
                    BackgroundColor = CSS_Color.PromptingColor1
                    //ImagePath = "tuya_logo.png"
                };
                row.AddChidren(btnIcon);
                Button btnRight = new Button()
                {
                    X = Application.GetRealWidth(339),
                    Gravity = Gravity.CenterVertical,
                    Width = Application.GetMinRealAverage(16),
                    Height = Application.GetMinRealAverage(16),
                    UnSelectedImagePath = "Public/Right.png",
                };
                row.AddChidren(btnRight);

                Button btnName = new Button()
                {
                    X = Application.GetRealWidth(56),
                    Width = Application.GetRealWidth(303),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    Text = brand.brandName,
                };
                row.AddChidren(btnName);
                //下载第三方品牌icon
                ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
            }

        }

@@ -88,7 +206,11 @@


            btnAdd.MouseUpEventHandler = (sender, e) => {
                Console.WriteLine("ddd");
                var page = new AddThirdPartyBrandListpage();
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                this.RemoveFromParent();
            };



 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs

@@ -509,7 +509,7 @@
                    Width = Application.GetRealWidth(64 + 48),
                    Height = Application.GetRealWidth(64),
                };
                //residenceInfoView.AddChidren(residenceAddFunctionView);
                residenceInfoView.AddChidren(residenceAddFunctionView);
                btnResidenceAddFunctionIcon = new Button
                {
                    Gravity = Gravity.CenterHorizontal,

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs

@@ -260,7 +260,7 @@
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                var page = new AddThirdPartyBrandListpage(); //new BrandListPage();
                var page = new BrandListPage();// AddThirdPartyBrandListpage(); // BrandListPage();
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

 HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs

@@ -92,7 +92,7 @@

                btn.MouseUpEventHandler = (sender, e) => {
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.Key, attr.key);
                    d.Add(attr.key, "");
                    Control.Ins.SendWriteCommand(device, d);

                    new System.Threading.Thread(() => {

 HdlBluWi/.DS_Store

Binary files differ