合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserView/UserPage.cs

@@ -187,6 +187,18 @@
                                        ac.currentSystemMode = attriButeList[0].AttriButeData;

                                        ac.LastDateTime = DateTime.Now;

                                        break;

                                    case 4099:
                                        var value = Convert.ToString(attriButeList[0].AttriButeData, 2).PadLeft(16, '0');
                                        var modeStr = value.Substring(value.Length - 5, 5);
                                        for (int j = 0; j < modeStr.Length; j++)
                                        {
                                            ac.listSupportMode[j] = Convert.ToInt32(modeStr[j]) == 49 ? 1 : 0;
                                        }
                                        break;

                                    case 4097:
                                        ac.CleanStatu = attriButeList[0].AttriButeData == 42;
                                        break;
                                }
                            }


@@ -477,15 +489,18 @@
            if (sender == Instance.homePageIMG || sender == Instance.homePageName)
            {
                //主页
                CommonPage.Instance.IsDrawerLockMode = false;
                Instance.homePageName.IsSelected = true;
                Instance.homePageIMG.IsSelected = true;
                var home = new UserHomeView { };
                Instance.BodyView.AddChidren(home);
                home.Show();
                
            }
            else if (sender == Instance.categoryIMG || sender==Instance.categoryName)
            {
                //分类
                CommonPage.Instance.IsDrawerLockMode = true;
                Instance.categoryName.IsSelected = true;
                Instance.categoryIMG.IsSelected = true;
                var category = new Phone.Device.Category.Category { };
@@ -495,6 +510,7 @@
            else if (sender == Instance.settingIMG || sender==Instance.settingName)
            {
                 //个人中心
                CommonPage.Instance.IsDrawerLockMode = true;
                Instance.settingName.IsSelected = true;
                Instance.settingIMG.IsSelected = true;
                var form = new UserCenter.UserMain.UserMainForm();