上传一个很特别的新版本

黄学彪

2020-07-20 2029e64ec0491f7e511dc15bffaf821bfbabe2de

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

@@ -66,6 +66,10 @@
        {

            //先清除吧

            this.RemoveAll();



            //初始化默认楼层ID

            this.InitDefultFloorId();



            //初始化头部控件

            this.InitTopControl();

            //初始化中间控件

@@ -395,9 +399,9 @@
            //上一次选择的菜单

            MainPage.Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;

            DeviceRowInfo nowSelectDeviceInfo = null;

            foreach (int Textid in dicGroupDevice.Keys)

            foreach (string strText in dicGroupDevice.Keys)

            {

                var rowInfo = dicGroupDevice[Textid];

                var rowInfo = dicGroupDevice[strText];



                //设备类型的容器

                var devieFrame = new FrameLayout();

@@ -407,11 +411,11 @@
                //菜单图片控件

                var deviceObjContr = new MainPage.Controls.DeviceFunctionUnallocatedControl();

                devieFrame.AddChidren(deviceObjContr);

                deviceObjContr.InitControl(Language.StringByID(Textid), rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);

                deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);

                deviceObjContr.ButtonClickEvent += (sender, e) =>

                {

                    //选择的是同一个东西的话,不处理

                    if (nowSelectDeviceInfo.TextId != rowInfo.TextId)

                    if (nowSelectDeviceInfo.Text != rowInfo.Text)

                    {

                        //上一次的菜单取消,本次菜单选择

                        oldSelectContr.SetSelectStatu(false);

@@ -632,7 +636,7 @@
                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        //从网关刷新场景列表

                        bool result = HdlSceneLogic.Current.RefreshSceneUIList();

                        bool result = HdlSceneLogic.Current.RefreshSceneUIList(false);

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            listview1.EndHeaderRefreshing();

@@ -783,13 +787,13 @@
                while (remainTime > 0 && this.Parent != null)

                {

                    System.Threading.Thread.Sleep(1000);

                    Application.RunOnMainThread(() =>

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        sceneContr.SetTimeText(this.GetTimeString(remainTime, hourText, minuText, secondText));

                    });

                    }, ShowErrorMode.NO);

                    remainTime--;

                }

                Application.RunOnMainThread(() =>

                HdlThreadLogic.Current.RunMain(() =>

                {

                    if (listview.Parent != null)

                    {

@@ -797,7 +801,7 @@
                        //开启Loading特效

                        sceneContr.StartLoadingApreal();

                    }

                });

                }, ShowErrorMode.NO);

            });

        }



@@ -828,6 +832,11 @@
                        {

                            //传感器不需要属性上报(但是那个球型传感器居然会属性上报)

                            this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);

                        }

                        else if (report.DeviceStatusReport.CluterID == 1)

                        {

                            //这个是电量推送

                            this.dicDeviceRowControl[mainKeys].RefreshBatteryStatu();

                        }

                    }

                }, ShowErrorMode.NO);

@@ -885,7 +894,7 @@
        /// 获取分组后的设备

        /// </summary>

        /// <returns></returns>

        private Dictionary<int, DeviceRowInfo> GetAllGroupDevice(Common.Room room)

        private Dictionary<string, DeviceRowInfo> GetAllGroupDevice(Common.Room room)

        {

            //全部的设备

            var listDeviceTemp = HdlRoomLogic.Current.GetRoomListDevice(room);

@@ -902,23 +911,23 @@


            //根据设备所属类型排序

            listDevice = LocalDevice.Current.SortDeviceByBelongType(listDevice);

            var dic = new Dictionary<int, DeviceRowInfo>();

            var dic = new Dictionary<string, DeviceRowInfo>();

            foreach (var device in listDevice)

            {

                var typeInfo = LocalDevice.Current.GetDeviceBelongEnumInfo(device);

                //按所属ID分组

                if (dic.ContainsKey(typeInfo.BeloneTextId) == false)

                if (dic.ContainsKey(typeInfo.BeloneText) == false)

                {

                    dic[typeInfo.BeloneTextId] = new DeviceRowInfo();

                    dic[typeInfo.BeloneText] = new DeviceRowInfo();

                    string path1 = string.Empty;

                    string path2 = string.Empty;

                    //获取图片

                    LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);

                    dic[typeInfo.BeloneTextId].IconPath = path1;

                    dic[typeInfo.BeloneTextId].IconPathSelected = path2;

                    dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;

                    dic[typeInfo.BeloneText].IconPath = path1;

                    dic[typeInfo.BeloneText].IconPathSelected = path2;

                    dic[typeInfo.BeloneText].Text = typeInfo.BeloneText;

                }

                dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));

                dic[typeInfo.BeloneText].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));

            }

            return dic;

        }

@@ -974,6 +983,23 @@
            return timeStr;

        }



        /// <summary>

        /// 初始化默认楼层ID

        /// </summary>

        private void InitDefultFloorId()

        {

            if (Config.Instance.Home.CurrentFloorId != string.Empty)

            {

                return;

            }

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            foreach (var floorId in dicFloor.Keys)

            {

                Config.Instance.Home.CurrentFloorId = floorId;

                break;

            }

        }



        #endregion



        #region ■ 结构体_____________________________

@@ -984,9 +1010,9 @@
        private class DeviceRowInfo

        {

            /// <summary>

            /// 文本ID,目前用来做主键

            /// 文本,目前用来做主键

            /// </summary>

            public int TextId = 0;

            public string Text = string.Empty;

            /// <summary>

            /// 图标

            /// </summary>