上传

黄学彪

2020-05-11 53cb8c211ecec2388a6583d32c5d2fe709285344

上传

 ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nextIconSone.png

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -2137,6 +2137,9 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Instruct\SensorPMTwoPointFive.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\nextIconSone.png" />

  </ItemGroup>

  <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />

  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

  <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />


 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020050601" android:installLocation="auto" android:versionName="1.0.20050601">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020050901" android:installLocation="auto" android:versionName="1.0.20050901">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
    <permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

Diff too large

 ZigbeeApp/Home.Ios/Home.IOS.csproj

@@ -669,6 +669,7 @@
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedac.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\openMode.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor21.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\nextIconSone.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\3.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\back.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedtemperature.png" />

 ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nextIconSone.png

 ZigbeeApp/Shared/Common/CommonPage.cs

@@ -57,7 +57,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.0.20050701";
        public static string CodeIDString = "1.0.20050901";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>

 ZigbeeApp/Shared/Common/Device.cs

@@ -441,6 +441,8 @@
            //如果住宅为虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                //修改设备名字的话,主页需要重新刷新

                Phone.UserView.UserPage.Instance.RefreshForm = true;

                return true;

            }



@@ -465,6 +467,8 @@
                //备份数据

                await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A端点名称, newName);

            }

            //修改设备名字的话,主页需要重新刷新

            Phone.UserView.UserPage.Instance.RefreshForm = true;

            return true;

        }




 ZigbeeApp/Shared/Common/House.cs

@@ -173,7 +173,9 @@
                return;
            }
            home.Name = houseName;
            home.Save();
            home.Save();

            //住宅修改名称的话,主页需要重新刷新

            Phone.UserView.UserPage.Instance.RefreshForm = true;
        }

        #endregion

 ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs

@@ -822,6 +822,9 @@
            this.editorScene.IconPath = this.cloneScene.IconPath;

            this.editorScene.Save();



            //新建场景,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;



            HdlThreadLogic.Current.RunMain(() =>

            {

                //调用回调函数

@@ -889,6 +892,9 @@
            this.editorScene.IconPath = this.cloneScene.IconPath;

            this.editorScene.Save();



            //编辑场景,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;



            HdlThreadLogic.Current.RunMain(() =>

            {

                //调用回调函数


 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

@@ -754,16 +754,9 @@
                    {

                        //刷新卡片信息

                        var locadevice = LocalDevice.Current.GetDevice(mainKeys);

                        if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28)

                        {

                            //空调是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        }

                        if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)

                        {

                            //新风是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        }

                        //已经接收到网关的反馈 2020.05.09:删除Ack主题

                        this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        //刷新控件

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

                    }

                }, ShowErrorMode.NO);

@@ -781,23 +774,6 @@
                        bool bolOnline = LocalDevice.Current.CheckDeviceIsOnline(report);

                        this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(bolOnline);

                        return;

                    }



                }, ShowErrorMode.NO);

            });



            //设备控制反馈上报

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceRespone", ReceiveComandDiv.A节点控制反馈, (report) =>

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);

                    if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)

                    {

                        //设备卡片

                        var deviceCardContr = this.dicDeviceRowControl[mainKeys];

                        //已经接收到网关的反馈

                        deviceCardContr.SetHadGetResponeResultStatu();

                    }



                }, ShowErrorMode.NO);


 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -1054,7 +1054,9 @@


                    Application.RunOnMainThread(() =>

                    {

                        ShowForm();

                        //刷新界面

                        this.ShowForm();



                        CommonPage.Loading.Hide();

                    });

                })

@@ -1090,16 +1092,9 @@
                    {

                        //刷新卡片信息

                        var locadevice = LocalDevice.Current.GetDevice(mainKeys);

                        if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28)

                        {

                            //空调是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();

                        }

                        if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)

                        {

                            //新风是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();

                        }

                        //已经接收到网关的反馈 2020.05.09:删除Ack主题

                        this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();

                        //刷新控件

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

                    }

                }, ShowErrorMode.NO);

@@ -1117,23 +1112,6 @@
                        bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(report);

                        this.dicDeviceCardControl[mainKeys].SetCardOnlineStatu(bolOnline);

                        return;

                    }



                }, ShowErrorMode.NO);

            });



            //设备控制反馈上报

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceRespone", ReceiveComandDiv.A节点控制反馈, (report) =>

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);

                    if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)

                    {

                        //设备卡片

                        var deviceCardContr = this.dicDeviceCardControl[mainKeys];

                        //已经接收到网关的反馈

                        deviceCardContr.SetHadGetResponeResultStatu();

                    }



                }, ShowErrorMode.NO);


 ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs

@@ -27,7 +27,6 @@
                    //初始化左滑菜单

                    roomManagement = new ListRoomViewFrom();

                    CommonPage.Instance.AddLeftView(roomManagement);

                    roomManagement.ShowForm();

                }
                return roomManagement;
            }
@@ -37,6 +36,10 @@
        /// 是否可以触发点击事件--是否可以跳转主页房间
        /// </summary>
        public bool CanClick = true;

        /// <summary>

        /// 是否初始化完成

        /// </summary>

        private bool isInitFinish = false;

        /// <summary>
        /// 当前楼层id
        /// </summary>
@@ -58,8 +61,7 @@
        /// 画面显示
        /// </summary>
        public void ShowForm()
        {
            roomManagement = this;

        {

            //初始化头部信息
            this.InitTopFrame();
            //初始化中部控件
@@ -90,10 +92,8 @@
            };



            //获取楼层

            if (this.curFloorId == string.Empty)

            {

                this.curFloorId = Config.Instance.Home.CurrentFloorId;

            }

            this.curFloorId = Config.Instance.Home.CurrentFloorId;



            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

@@ -124,8 +124,8 @@
                {

                    this.curFloorId = floorId;

                    btnFloor.Text = dicFloor[floorId];

                    //刷新房间列表

                    this.RefreshListRoom();

                    //刷新Body容器

                    this.RefreshBodyFrame();

                };

            };

        }
@@ -139,8 +139,8 @@
            listView.Height = bodyFrameLayout.Height;
            listView.Width = bodyFrameLayout.Width;
            bodyFrameLayout.AddChidren(listView);
            //刷新房间列表
            this.RefreshListRoom();
            //刷新Body容器

            this.RefreshBodyFrame();
        }



        #endregion

@@ -152,11 +152,27 @@
        /// </summary>

        public void RefreshListRoom()

        {

            //如果还没有初始化完成界面的话

            if (this.isInitFinish == false)

            {

                this.ShowForm();

                this.isInitFinish = true;

                return;

            }

            //把头部也一起初始化了

            this.topFrameLayout.RemoveAll();

            //初始化头部信息

            this.InitTopFrame();



            //刷新Body容器

            this.RefreshBodyFrame();

        }



        /// <summary>

        /// 刷新Body容器

        /// </summary>

        private void RefreshBodyFrame()

        {

            //先清空

            this.listView.frameTable.RemoveAll();

            this.listView.frameTable.Height = Application.GetRealHeight(100);


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

@@ -111,6 +111,11 @@
            form.AddForm(title, listText, nowSelectNo);

            form.FinishSelectEvent += (selectNo) =>

            {

                if (selectNo == nowSelectNo)

                {

                    //选择的是相同的

                    return;

                }

                //-1:选择取消

                this.Text = selectNo == -1 ? string.Empty : listText[selectNo];

                nowSelectNo = selectNo;

@@ -118,6 +123,9 @@
                //记录起当前选择的功能类型

                this.RefreshDfunctionType();



                //设备改变功能类型的话,主页需要重新刷新

                UserView.UserPage.Instance.RefreshForm = true;



                //调用回调函数

                this.FinishSelectEvent?.Invoke(nowSelectNo);

            };


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs

@@ -143,7 +143,7 @@
        {

            Application.RunOnMainThread(() =>

            {

                MainPage.ListRoomViewFrom.Instance?.ShowForm();

                MainPage.ListRoomViewFrom.Instance?.RefreshListRoom();

            });

        }



@@ -582,6 +582,8 @@
            {

                //从原来的房间移除设备

                this.DeleteDevice(device);

                //设备改变房间的话,主页需要重新刷新

                UserView.UserPage.Instance.RefreshForm = true;

                return;

            }

            //房间是否修改

@@ -598,6 +600,8 @@
            {

                this.AddDevice(room, device, saveRealRoom);

            }

            //设备改变房间的话,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;

        }



        /// <summary>


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

@@ -487,7 +487,7 @@
                    alert.Show();



                    //Log出力

                    HdlLogLogic.Current.WriteLog(ex, "界面重新激活异常");

                    HdlLogLogic.Current.WriteLog(ex, "界面重新激活异常 " + UserCenterResourse.NowActionFormID);

                }

            }

        }

@@ -832,6 +832,8 @@
        /// <returns></returns>

        public async static Task<bool> InitUserCenterMenmoryAndThread(bool ShowPrompted = true)

        {

            //调用这个方法,都需要重新刷新主页

            UserView.UserPage.Instance.RefreshForm = true;

            //如果是虚拟住宅

            if (Config.Instance.Home.IsVirtually == true)

            {


 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs

@@ -189,6 +189,8 @@
                //改名字

                btnNote.txtInput.FinishInputEvent();



                this.CloseForm();



                var form = new DeviceMacInfoEditorForm();

                form.AddForm(this.listNewDevice[0].DeviceAddr);

            };


 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

@@ -912,7 +912,7 @@
        #region ■ 实现外部调用_______________________



        /// <summary>

        /// 添加新的设备到界面桌布中

        /// 添加新的设备到界面桌布中(外部调用)

        /// </summary>

        /// <param name="deviceAddr">设备Mac地址</param>

        public void AddDeviceToFormTable(string deviceAddr)

@@ -940,6 +940,30 @@


                //创建新的行

                this.AddDeviceMenuRow(deviceAddr);



                //记录当前的正在操作的设备的Mac地址

                this.nowActionDeviceMac = deviceAddr;

            }

        }



        /// <summary>

        /// 刷新指定设备行的信息(外部调用)

        /// </summary>

        /// <param name="deviceAddr">设备Mac地址</param>

        public void RefreshDeviceRow(string deviceAddr)

        {

            if (this.dicRowInfo.ContainsKey(deviceAddr) == true)

            {

                var row = this.dicRowInfo[deviceAddr];

                row.MenuRow?.RefreshControlInfo(true);

                //明细

                if (row.dicDetailRow != null)

                {

                    foreach (var detailRow in row.dicDetailRow.Values)

                    {

                        detailRow.RefreshControlInfo();

                    }

                }

            }

        }




 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -1208,6 +1208,12 @@
            //移除获取设备硬件信息的监听线程

            HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);



            //设备新入网

            if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)

            {

                this.LoadFormMethodByName("DeviceListMainForm", "RefreshDeviceRow", new object[] { listNewDevice[0].DeviceAddr });

            }



            base.CloseFormBefore();

        }




 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs

@@ -32,6 +32,8 @@
        /// </summary>

        private void InitMiddleFrame(string i_file)

        {

            if (i_file == string.Empty) { return; }



            if (i_file.EndsWith(".png") == true || i_file.EndsWith(".jpg") == true || i_file.EndsWith(".JPG") == true)

            {

                var btnPic = new ImageView();

@@ -46,26 +48,35 @@
            else

            {

                string textValue = System.Text.Encoding.UTF8.GetString(Shared.IO.FileUtils.ReadFile(i_file)).Trim();

                textValue = textValue.Replace(",", "\r\n");

                if (textValue.StartsWith("{") == true)

                {

                    textValue = "{\r\n" + textValue.Substring(1);

                }

                if (textValue.EndsWith("}") == true)

                {

                    textValue = textValue.Substring(0, textValue.Length - 1) + "\r\n}";

                }



                var btnText = new EditTextView();

                btnText.Width = bodyFrameLayout.Width;

                btnText.Height = bodyFrameLayout.Height;

                btnText.TextAlignment = TextAlignment.TopLeft;

                btnText.TextColor = UserCenterColor.Current.TextColor1;

                btnText.Text = textValue;

                bodyFrameLayout.AddChidren(btnText);

                this.SetTextContent(textValue);

            }

        }



        /// <summary>

        /// 自定义设置显示的文本

        /// </summary>

        /// <param name="i_text"></param>

        public void SetTextContent(string textValue)

        {

            textValue = textValue.Replace(",", "\r\n");

            if (textValue.StartsWith("{") == true)

            {

                textValue = "{\r\n" + textValue.Substring(1);

            }

            if (textValue.EndsWith("}") == true)

            {

                textValue = textValue.Substring(0, textValue.Length - 1) + "\r\n}";

            }



            var btnText = new EditTextView();

            btnText.Width = bodyFrameLayout.Width;

            btnText.Height = bodyFrameLayout.Height;

            btnText.TextAlignment = TextAlignment.TopLeft;

            btnText.TextColor = UserCenterColor.Current.TextColor1;

            btnText.Text = textValue;

            bodyFrameLayout.AddChidren(btnText);

        }



        #endregion



        #region ■ 一般方法___________________________


 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs

@@ -160,9 +160,11 @@
            listView.AddChidren(row1);

            row1.AddLeftCaption("设备缓存变量", 500);

            row1.AddRightArrow();

            row1.AddBottomLine();

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

            {



                var form = new HideOptionMemoryListDeviceForm();

                form.AddForm();

            };






 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMemoryListDeviceForm.cs

New file
@@ -0,0 +1,79 @@
using System;

using System.Collections.Generic;

using System.Text;

using ZigBee.Device;



namespace Shared.Phone.UserCenter.HideOption

{

    /// <summary>

    /// 本地缓存设备列表的界面

    /// </summary>

    public class HideOptionMemoryListDeviceForm : EditorCommonForm

    {

        #region ■ 变量声明___________________________



        #endregion



        #region ■ 初始化_____________________________



        /// <summary>

        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        public void ShowForm()

        {

            //设置头部信息

            base.SetTitleText("设备列表");



            //初始化中部信息

            this.InitMiddleFrame();

        }



        /// <summary>

        /// 初始化中部信息

        /// </summary>

        private void InitMiddleFrame()

        {

            var listView = new VerticalListControl(23);

            listView.BackgroundColor = UserCenterColor.Current.White;

            listView.Height = bodyFrameLayout.Height;

            bodyFrameLayout.AddChidren(listView);



            var listDevice = Common.LocalDevice.Current.listAllDevice;

            for (int i = 0; i < listDevice.Count; i++)

            {

                this.AddRowControl(listView, listDevice[i], i != listDevice.Count - 1);

            }



            listView.AdjustRealHeight(Application.GetRealHeight(23));

        }



        private void AddRowControl(VerticalListControl listView, CommonDevice device, bool addLine)

        {

            var row1 = new RowLayoutControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

            row1.frameTable.AddTopView(Common.LocalDevice.Current.GetDeviceEpointName(device), 800);

            row1.frameTable.AddBottomView(device.FilePath, 800);

            if (addLine == true)

            {

                row1.frameTable.AddBottomLine();

            }

            row1.frameTable.AddRightArrow();



            row1.frameTable.ButtonClickEvent += (sender, e) =>

            {

                var txtContent = Newtonsoft.Json.JsonConvert.SerializeObject(device);



                var form = new HideOptionFileContentForm();

                form.AddForm(string.Empty);



                form.SetTextContent(txtContent);

            };

        }



        #endregion



        #region ■ 一般方法___________________________



        #endregion

    }

}


 ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs

@@ -214,6 +214,9 @@
                    newRoom.Temperatrue = 0;

                }



                //添加房间,主页需要重新刷新

                UserView.UserPage.Instance.RefreshForm = true;



                HdlRoomLogic.Current.AddRoom(newRoom);

                this.FinishEditorEvent?.Invoke();




 ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs

@@ -313,6 +313,10 @@
                    //刷新左滑的房间列表界面的房间列表信息

                    MainPage.ListRoomViewFrom.Instance.RefreshListRoom();

                }



                //算了,这里如果按下保存,则主页需要重新刷新

                UserView.UserPage.Instance.RefreshForm = true;



                this.CloseForm();

            };

        }


 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs

@@ -425,6 +425,8 @@
                            //调整桌布高度

                            this.AdjustContrlTableHeight();

                        }

                        //删除楼层的话,主页需要重新刷新

                        UserView.UserPage.Instance.RefreshForm = true;

                    });

                };

            }

@@ -495,6 +497,8 @@
                        //根据指定模式,初始化桌布控件

                        this.InitFrameTableByMode();

                    }

                    //创建或者修改楼层的话,主页需要重新刷新

                    UserView.UserPage.Instance.RefreshForm = true;

                }

            });

        }

@@ -649,6 +653,8 @@
                        //调整桌布高度

                        this.AdjustContrlTableHeight();

                    }

                    //删除房间的话,主页需要重新刷新

                    UserView.UserPage.Instance.RefreshForm = true;

                });

            };

        }


 ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs

@@ -253,6 +253,8 @@
                        UserCenterResourse.ResidenceOption.SafetyShortcut = false;

                        UserCenterResourse.ResidenceOption.Save();

                        btnShortCut.IsSelected = false;

                        //取消主页的「安防」捷径的话,主页需要重新刷新

                        UserView.UserPage.Instance.RefreshForm = true;

                    });

                }

                else

@@ -263,6 +265,8 @@
                        UserCenterResourse.ResidenceOption.SafetyShortcut = true;

                        UserCenterResourse.ResidenceOption.Save();

                        btnShortCut.IsSelected = true;

                        //创建主页的「安防」捷径的话,主页需要重新刷新

                        UserView.UserPage.Instance.RefreshForm = true;

                    });

                }

            };


 ZigbeeApp/Shared/Phone/UserView/UserPage.cs

@@ -329,9 +329,26 @@
            //关闭全部界面,直到主页为止
            UserCenterLogic.CloseAllOpenForm();
            //强制显示自动化列表界面
            UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;

            this.BottomMenuClickEvent(MenuSelectEnum.A分类, false);
            UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 2;



            this.nowSelectMenu = MenuSelectEnum.A分类;



            //左滑菜单不可

            CommonPage.Instance.IsDrawerLockMode = true;

            if (listForm[1] == null)

            {

                var form = new Category.CategoryMainForm();

                this.bodyFrameView.AddChidren(form);

                form.ShowForm();

                //加缓存

                listForm[1] = form;

            }
            else

            {

                ((Category.CategoryMainForm)listForm[1]).RefreshBodyView();

            }

            //设置全部控件的各种状态状态

            this.SetAllControlStatu();
        }



        #endregion

 ZigbeeApp/Shared/Shared.projitems

@@ -253,6 +253,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionFileListForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionGatewayListForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMainForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMemoryListDeviceForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionSearchAllFile.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberNotEsixtForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckNewPhoneForm.cs" />