一个新版本

黄学彪

2019-12-09 163777d8a2cb7cfa469f54a7042528870ebc10a3

一个新版本

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

old mode 100644
new mode 100755
@@ -541,8 +541,8 @@
5274=检测无漏水
5275=检测到燃气
5276=检测无燃气
5277=检测到烟幕
5278=检测无烟幕
5277=检测到烟雾
5278=检测无烟雾
5279=添加安防
5280=立即执行
5281=时间范围
@@ -626,10 +626,10 @@
10113=请再次输入密码
10114=发送验证码成功，请注意查收
10115=确定
10116=该账号已注册，可直接登录
10116=该用户已存在，可直接登录
10117=提供的参数错误
10118=两次密码不一致
10119=验证码错误
10118=确认密码不一致，请重新输入
10119=验证码错误，请重新输入
10120=请求服务器失败
10121=恭喜注册成功！
10122=即将自动登录
@@ -650,8 +650,10 @@
10137=住宅名称为空
10138=邮箱错误，请重新输入
10139=手机号错误，请重新输入
10140=请输入长度为6-13个字符的密码
10141=你已被强制下线！


10150=改房间名称已存在
10151=场景名不能为空
10152=控制场景失败

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

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

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -1290,6 +1290,12 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Scene\Background.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\sensor0.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="2019120501" android:installLocation="auto" android:versionName="1.0.19120501">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019120901" android:installLocation="auto" android:versionName="1.0.19120901">
    <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/Home.Ios/Home.IOS.csproj

@@ -486,6 +486,7 @@
      <BundleResource Include="Resources\Phone\Item\InputAccountIconSelected.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\deviceselectedbackgroundcolor.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\add.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\sensor0.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor13.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\logicbj1.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\dimmableLight.png" />
@@ -542,6 +543,7 @@
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor40.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\deviceunselectedbackgroundcolor.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\sensor21.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor0.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\next.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\security.png" />

 ZigbeeApp/Home.Ios/Resources/Language.ini

old mode 100644
new mode 100755
@@ -541,8 +541,8 @@
5274=检测无漏水
5275=检测到燃气
5276=检测无燃气
5277=检测到烟幕
5278=检测无烟幕
5277=检测到烟雾
5278=检测无烟雾
5279=添加安防
5280=立即执行
5281=时间范围
@@ -626,10 +626,10 @@
10113=请再次输入密码
10114=发送验证码成功，请注意查收
10115=确定
10116=该账号已注册，可直接登录
10116=该用户已存在，可直接登录
10117=提供的参数错误
10118=两次密码不一致
10119=验证码错误
10118=确认密码不一致，请重新输入
10119=验证码错误，请重新输入
10120=请求服务器失败
10121=恭喜注册成功！
10122=即将自动登录
@@ -650,8 +650,10 @@
10137=住宅名称为空
10138=邮箱错误，请重新输入
10139=手机号错误，请重新输入
10140=请输入长度为6-13个字符的密码
10141=你已被强制下线！


10150=改房间名称已存在
10151=场景名不能为空
10152=控制场景失败

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

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

 ZigbeeApp/Shared/Common/CommonPage.cs

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

 ZigbeeApp/Shared/Common/Device.cs

 ZigbeeApp/Shared/Common/Room.cs

 ZigbeeApp/Shared/Common/SceneUI.cs

 ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll

Binary files differ

 ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll

Binary files differ

 ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll

Binary files differ

 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll

Binary files differ

 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll

Binary files differ

 ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs

 ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs

@@ -282,6 +282,23 @@
        /// <param name="mouseEventArgs"></param>
        private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
        {
            if (CheckAccount(account) == false)
            {
                return;
            }
            //先判断2次密码输入是否一致
            if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
            {
                errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
                return;
            }

            if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
            {
                errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
                return;
            }

            (sender as Button).Enable = (sender as Button).IsSelected = false;
            CommonPage.Loading.Start();
            try
@@ -347,6 +364,35 @@
                CommonPage.Loading.Hide();
            }
        }


        /// <summary>
        /// CheckAccount
        /// </summary>
        /// <param name="accountStr"></param>
        /// <returns></returns>
        private bool CheckAccount(string accountStr)
        {
            errorBtn.Text = string.Empty;
            if (phoneEmailForm.SelectedEmail.IsSelected)
            {
                if (AccountLogic.Instance.CheckEmail(accountStr) == false)
                {
                    errorBtn.TextID = R.MyInternationalizationString.TheEmailError;
                    return false;
                }
            }
            else
            {
                if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false)
                {
                    errorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
                    return false;
                }
            }
            return true;
        }

        #endregion

        #region ◆ 确认修改__________________________
@@ -358,13 +404,23 @@
        /// <param name="mouseEventArgs"></param>
        private async void Reset(object sender,MouseEventArgs mouseEventArgs)
        {

            if (CheckAccount(account) == false)
            {
                return;
            }
            //先判断2次密码输入是否一致
            if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
            {
                var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.TwoPasswordInconsistency), Language.StringByID(R.MyInternationalizationString.Confrim));
                alert.Show();
                errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
                return;
            }
            if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
            {
                errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
                return;
            }
           
            CommonPage.Loading.Start();
            try
            {

 ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs

@@ -76,6 +76,24 @@
                var regex = new Regex(CommonPage.PhoneForForeignRegexStr);
                return regex.IsMatch(phone);
            }
        }

        #endregion

        #region ◆ 密码____________________________

        /// <summary>
        /// 检查密码长度合法性
        /// </summary>
        /// <param name="password"></param>
        /// <returns></returns>
        public bool CheckPwdLength(string password)
        {
            if (password.Trim().Length >= 6 && password.Trim().Length <= 13)
            {
                return true;
            }
            return false;
        }

        #endregion

 ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs

@@ -395,10 +395,11 @@

                            var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                            var homes = await House.GetHomeLists();

                            //启动ZigBee

                            ZigBee.Common.Application.Init();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            //启动ZigBee

                            ZigBee.Common.Application.Init();

                            Shared.Common.Room.InitAllRoom();
                            Application.RunOnMainThread(() =>
                            {
@@ -544,10 +545,10 @@
                                    });
                                    var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                                    var homes = await House.GetHomeLists();

                                    //启动ZigBee

                                    ZigBee.Common.Application.Init();
                                    //刷新个人中心的内存及线程
                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                                    //启动ZigBee

                                    ZigBee.Common.Application.Init();
                                    Shared.Common.Room.InitAllRoom();
                                    Application.RunOnMainThread(() =>
                                    {

 ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs

@@ -319,10 +319,11 @@
                        Config.Instance.Save();
                        var resultRegID = await CommonPage.Instance.PushRegID();
                        var homes = await House.GetHomeLists();

                        //启动ZigBee

                        ZigBee.Common.Application.Init();
    
                        //刷新个人中心的内存及线程
                        await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                        //启动ZigBee

                        ZigBee.Common.Application.Init();

                        Shared.Common.Room.InitAllRoom();
                        Application.RunOnMainThread(() =>

 ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs

@@ -82,7 +82,6 @@
            //AddBody
            AddBodyView();


            //bind
            BindEvent();
        }
@@ -225,11 +224,11 @@
            }
            pwdRow = new PwdRowForm();
            pwdRow.Init(accountCodeFrameLayout, 29, 196);
            //pwdRow.PasswrodET.TextChangeEventHandler += Account_TextChange;
            pwdRow.PasswrodET.TextChangeEventHandler += Code_TextChange;

            pwdComfireRow = new PwdRowForm();
            pwdComfireRow.Init(accountCodeFrameLayout, 29, 363);
            //pwdComfireRow.PasswrodET.TextChangeEventHandler += Account_TextChange;
            pwdComfireRow.PasswrodET.TextChangeEventHandler += Code_TextChange;
            pwdComfireRow.SetPlaceholdText(Language.StringByID(R.MyInternationalizationString.PleaseComfirePWD));

            codeRow = new CodeForRegisterRowForm();
@@ -251,6 +250,7 @@
            phoneEmailForm.SelectedEmail.MouseUpEventHandler += SelectPhoneOrEmail_MouseUpEvent;
            registerBtn.MouseUpEventHandler += Register;
            loginByAccountPWDBtn.MouseUpEventHandler += LoginByPWD;
            codeRow.VerificationCodeET.TextChangeEventHandler += Code_TextChange;
        }
        #endregion

@@ -262,6 +262,23 @@
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private async void Register(object sender, MouseEventArgs mouseEventArgs)
        {
            if (CheckAccount(account) == false)
            {
                return;
            }
            //先判断2次密码输入是否一致
            if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
            {
                errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
                return;
            }

            if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
            {
                errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
                return;
            }

            CommonPage.Loading.Start();
            try
            {
@@ -350,12 +367,10 @@
            errorBtn.Text = string.Empty;
            if ((sender as EditText).Text.Trim().Length > 0)
            {
                //IsRightAccount = true;
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
            }
            else
            {
                //IsRightAccount = false;
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
            }
            account = (sender as EditText).Text.Trim();
@@ -369,7 +384,7 @@
        private void Code_TextChange(object sender, string mouseEventArgs)
        {
            errorBtn.Text = string.Empty;
            if ((sender as EditText).Text.Trim().Length > 0)
            if (codeRow.VerificationCodeET.Text.Trim().Length > 0 && account.Trim().Length > 0 && pwdRow.PasswrodET.Text.Trim().Length > 0 && pwdComfireRow.PasswrodET.Text.Trim().Length > 0)
            {
                registerBtn.Enable = registerBtn.IsSelected = true;
            }
@@ -389,15 +404,23 @@
        /// <param name="mouseEventArgs"></param>
        private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
        {
            (sender as Button).Enable = (sender as Button).IsSelected = false;
            if (CheckAccount(account) == false)
            {
                return;
            }
            //先判断2次密码输入是否一致
            if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
            { 
                var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.TwoPasswordInconsistency), Language.StringByID(R.MyInternationalizationString.Confrim));
                alert.Show();
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
                errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
                return;
            }

            if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
            {
                errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
                return;
            }

            CommonPage.Loading.Start();
            (sender as Button).Enable = (sender as Button).IsSelected = false;
            try
@@ -465,6 +488,34 @@
                CommonPage.Loading.Hide();
            }
        }

        /// <summary>
        /// CheckAccount
        /// </summary>
        /// <param name="accountStr"></param>
        /// <returns></returns>
        private bool CheckAccount(string accountStr)
        {
            errorBtn.Text = string.Empty;
            if (phoneEmailForm.SelectedEmail.IsSelected)
            {
                if (AccountLogic.Instance.CheckEmail(accountStr) == false)
                {
                    errorBtn.TextID = R.MyInternationalizationString.TheEmailError;
                    return false;
                }
            }
            else
            {
                if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false)
                {
                    errorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
                    return false;
                }
            }
            return true;
        }

        #endregion
    }
}

 ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs

@@ -118,9 +118,11 @@
                                    }
                                    //登录成功
                                    var homes = await House.GetHomeLists();

                                    ZigBee.Common.Application.Init();
                      
                                    //刷新个人中心的内存及线程
                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                                    //启动ZigBee
                                    ZigBee.Common.Application.Init();

                                    Shared.Common.Room.InitAllRoom();


 ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs

@@ -290,7 +290,7 @@

            AccountET = new EditText()
            {
                X = Application.GetRealWidth(236),
                X = Application.GetRealWidth(222),
                Width = Application.GetRealWidth(700),
                Height = Application.GetRealHeight(Button_Height),
                Gravity = Gravity.CenterVertical,
@@ -313,6 +313,7 @@
            accountFL.AddChidren(accountLine);
        }
    }


    public class EmailLoginRowForm : FrameLayout
    {
@@ -354,7 +355,7 @@

            AccountET = new EditText()
            {
                X = Application.GetRealWidth(193),
                X = Application.GetRealWidth(222),
                Width = Application.GetRealWidth(700),
                Height = Application.GetRealHeight(Button_Height),
                Gravity = Gravity.CenterVertical,
@@ -481,7 +482,7 @@

            VerificationCodeET = new EditText()
            {
                X = Application.GetRealWidth(236),
                X = Application.GetRealWidth(222),
                Width = Application.GetRealWidth(350),
                Height = Application.GetRealHeight(Button_Height),
                Gravity = Gravity.CenterVertical,
@@ -870,7 +871,7 @@

            VerificationCodeET = new EditText()
            {
                X = Application.GetRealWidth(236),
                X = Application.GetRealWidth(222),
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(Button_Height),
                Gravity = Gravity.CenterVertical,

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

@@ -1744,9 +1744,9 @@
        #region ◆ 自动化__________________________

        /// <summary>
        /// 自动化
        /// 自动化功能代码入口
        /// </summary>
        private async void ShowAutotion()
        private  void ShowAutotion()
        {



            functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;

@@ -1760,7 +1760,7 @@
                Y = Application.GetRealHeight(30),
            };
            functionSceneAutoBodyView.AddChidren(bjFrameLayout);
            bjFrameLayout.SetCornerWithSameRadius(25, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
            bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
            var sigBtn = new Button
            {
                Width = Application.GetMinRealAverage(84),
@@ -1806,7 +1806,7 @@
            };
            functionSceneAutoBodyView.AddChidren(scenehorizontalScrol);

            var logicScrolView = new VerticalScrolViewLayout
            var logicScrolView = new VerticalRefreshLayout//VerticalScrolViewLayout
            {
                Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
@@ -1815,8 +1815,7 @@
                Y = scenehorizontalScrol.Bottom,
            };
            functionSceneAutoBodyView.AddChidren(logicScrolView);
            logicScrolView.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);

            logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);

            recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -1907,7 +1906,24 @@
                logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
                Automationview(logicScrolView);
            };
            logicScrolView.BeginHeaderRefreshingAction += () =>
            {
                //重新刷新logic列表
                Common.Logic.LogicList.Clear();
                Read(logicScrolView);
                //关闭刷新View；
                logicScrolView.EndHeaderRefreshing();
            };

            Read(logicScrolView);

        }
        /// <summary>
        /// 读取自动化列表数据；
        /// </summary>
        /// <param name="logicScrolView"></param>
        private async void Read(VerticalRefreshLayout logicScrolView)
        {
            CommonPage.Loading.Start();
            if (Common.Logic.LogicList.Count == 0)
            {
@@ -1932,12 +1948,11 @@
            CommonPage.Loading.Hide();
            
        }

        /// <summary>
        /// 自动化列表界面
        /// 加载自动化列表界面
        /// </summary>
        /// <param name="refresview">Refresview.</param>
        private async void Automationview(VerticalScrolViewLayout refresview)
        private async void Automationview(VerticalRefreshLayout refresview)
        {
            refresview.RemoveAll();
            foreach (var logic in Common.Logic.LogicList)
@@ -2066,7 +2081,7 @@

        }
        /// <summary>
        /// 显示图标的颜色
        /// 显示自动化输出功能模块图标的颜色
        /// </summary>
        /// <param name="logic"></param>
        /// <param name="logicRowlayout"></param>
@@ -2465,6 +2480,7 @@
                }
            }
        }

        #endregion

        #region ◆ 控制状态_________________________

 ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs

@@ -972,7 +972,6 @@
                            {
                                if (modifyRoom != curRoom)
                                {
                                   
                                    modifyRoom.SceneUIList.Remove(modifySceneUI);
                                    modifyRoom.SceneUIFilePathList.Remove(modifySceneUI.FileName);
                                    curRoom.SceneUIList.Add(modifySceneUI);

 ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs

@@ -302,6 +302,7 @@
                };
                functionSceneBodyView.AddChidren(deviceListScrolView);
                tempFunctionTypeBtn = new FunctionButton();
                tempFunctionTypeBtn.Init("","");

                EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
                {

 ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs

 ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs

@@ -20,7 +20,6 @@
        public void Show(int isInt=0, bool edit=false)
        {
            

            #region  最上面的布局代码
            var topRowLayout = new RowLayout
            {
@@ -79,7 +78,6 @@
            };
            this.AddChidren(middle);


            var blancolor = new FrameLayout
            {
                Width = Application.GetMinRealAverage(200),
@@ -131,7 +129,6 @@
            middle.AddChidren(PickerViewfra);
            PickerViewfra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
            

            var mUIPickerView = new UIPickerView
            {
                Y = Application.GetRealHeight(50),
@@ -172,11 +169,13 @@
                }

                else

                {


                    var minutevalue1 = timevalue / 60;

                    var secondvalue1 = timevalue % 60;

                    //更新最新状态

                    mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);

                }

                value = timevalue;
            }
            string selectde = "";
@@ -188,7 +187,6 @@
                selectde = "yes";

            };


            var btnsave = new Button
            {
@@ -242,6 +240,7 @@
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });
            };

        }
    }
}

 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs

old mode 100755
new mode 100644
@@ -27,6 +27,7 @@
        public void Show()
        {

     
            UserView.HomePage.Instance.ScrollEnabled = false;
            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
            #region  最上面的布局代码
@@ -1238,6 +1239,7 @@
                                        Width = Application.GetRealWidth(600),
                                        TextAlignment = TextAlignment.CenterLeft,
                                        TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                        TextSize=14,
                                    };
                                    timeoutrowlayout.AddChidren(btntimeout);


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -86,6 +86,7 @@
                    {
                        ///从列表移除当前门锁全部的旧数据；
                        Send.LockList.Remove(Send.LockList[i]);
                        i--;
                    }
                }
                Read();
@@ -125,7 +126,7 @@
        /// </summary>
        public void UserAllView(string macport)
        {

            middle.RemoveAll();
            for (int i = 0; i < Send.LockList.Count; i++)
            {
                var user = Send.LockList[i];

 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs

@@ -632,7 +632,6 @@
                                                case 21:
                                                case 22:
                                                    {
                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/doormagnetism.png";
                                                        if (intvalue == "1")
                                                        {
                                                            devicestatus.TextID = MyInternationalizationString.logicopen;
@@ -664,7 +663,6 @@
                                                    break;
                                                case 40:
                                                    {
                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/smoke.png";
                                                        if (intvalue == "1")
                                                        {
                                                            devicestatus.TextID = MyInternationalizationString.smokescreen;
@@ -674,7 +672,6 @@
                                                    break;
                                                case 42:
                                                    {
                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
                                                        if (intvalue == "1")
                                                        {
                                                            devicestatus.TextID = MyInternationalizationString.waterleakage;
@@ -687,7 +684,6 @@
                                                    break;
                                                case 43:
                                                    {
                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/gas.png";
                                                        if (intvalue == "1")
                                                        {
                                                            devicestatus.TextID = MyInternationalizationString.gas;
@@ -697,7 +693,6 @@
                                                    break;
                                                case 277:
                                                    {
                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
                                                        if (intvalue == "1")
                                                        {
                                                            devicestatus.TextID = MyInternationalizationString.callthepolice;
@@ -707,7 +702,6 @@
                                                    break;
                                                default:
                                                    {
                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/infraredsensor.png";
                                                        if (intvalue == "1")
                                                        {
                                                            devicestatus.TextID = MyInternationalizationString.callthepolice;

 ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs

@@ -18,7 +18,6 @@
        VerticalRefreshLayout middle;
        CommonDevice common;
        Dictionary<string, string> editdeviceConditionsInfo;

        public void Show(CommonDevice commondevice, Dictionary<string, string> editdeviceConditions = null)
        {
            common = commondevice;
@@ -92,6 +91,7 @@
                    {
                        ///从列表移除当前门锁全部的旧数据；
                        Send.LockList.Remove(Send.LockList[i]);
                        i--;
                    }
                }
                Read();
@@ -133,7 +133,7 @@
        /// <param name="macport"></param>
        public void UserList(string macport)
        {

            middle.RemoveAll();
            foreach (var user in Send.LockList)
            {
                if (user.DoorLockMacPort != macport)

 ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs

 ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs

@@ -278,6 +278,7 @@
                

                tempFunctionTypeBtn = new FunctionButton();
                tempFunctionTypeBtn.Init("", "");

                foreach (var deviceType in Common.Room.AllRoomDeviceTypeList)
                {

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs

@@ -30,20 +30,18 @@
                else { this.SetClickStatu(); }

            }

        }



        /// <summary>

        /// 是否是长按状态

        /// 圆角度

        /// </summary>

        private bool isLongClick = false;

        public int RadiusEx

        {

            set { this.Radius = (uint)Application.GetRealHeight(value); }

        }



        /// <summary>

        /// 控件的点击事件(自定义封装事件,此事件被认可为执行按钮按下事件,受CanClick属性控制)

        /// </summary>

        public Action<Button, MouseEventArgs> ButtonClickEvent = null;

        /// <summary>

        /// (★当前不要使用★)控件的长按事件,当事件为null时,代表长按结束(自定义封装事件,此事件被认可为执行按钮长按事件,受CanClick属性控制)

        /// </summary>

        public Action<Button, MouseEventArgs> ButtonLongClickEvent = null;

        /// <summary>

        /// 控件的按下事件(自定义封装事件,此事件被认可为执行按钮按下事件,受CanClick属性控制)

        /// </summary>

@@ -68,8 +66,6 @@
            this.MouseUpEventHandler += ButtonBase_MouseUpEventHandler;

            //按下事件

            this.MouseDownEventHandler += ButtonBase_MouseDownEventHandler;

            //长按事件

            this.MouseLongEventHandler += ButtonBase_MouseLongEventHandler;

        }



        /// <summary>

@@ -146,15 +142,7 @@


                try

                {

                    if (this.isLongClick == false)

                    {

                        this.ButtonClickEvent(this, e);

                    }

                    else if (ButtonLongClickEvent != null)

                    {

                        //长按结束

                        this.ButtonLongClickEvent(this, null);

                    }

                }

                catch (Exception ex)

                {

@@ -165,8 +153,6 @@
                    HdlLogLogic.Current.WriteLog(ex);

                }

            }

            //状态还原

            this.isLongClick = false;

        }



        #endregion

@@ -180,9 +166,6 @@
        /// <param name="e"></param>

        private void ButtonBase_MouseDownEventHandler(object sender, MouseEventArgs e)

        {

            //还原状态

            this.isLongClick = false;



            if (CanClick == false || this.ButtonDownClickEvent == null)

            {

                //不能点击

@@ -200,45 +183,6 @@
                alert.Show();

                //Log出力

                HdlLogLogic.Current.WriteLog(ex);

            }

        }



        #endregion



        #region ■ 长按事件___________________________



        /// <summary>

        /// 长按事件

        /// </summary>

        /// <param name="sender"></param>

        /// <param name="e"></param>

        private void ButtonBase_MouseLongEventHandler(object sender, MouseEventArgs e)

        {

            //长按状态

            this.isLongClick = true;



            if (ButtonLongClickEvent == null)

            {

                this.MouseLongEventHandler -= ButtonBase_MouseLongEventHandler;

                return;

            }

            if (CanClick == true)

            {

                //Log出力

                this.WriteLog(1);



                try

                {

                    this.ButtonLongClickEvent(this, e);

                }

                catch (Exception ex)

                {

                    //出现未知错误

                    var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));

                    alert.Show();

                    //Log出力

                    HdlLogLogic.Current.WriteLog(ex);

                }

            }

        }



@@ -271,7 +215,6 @@
        {

            ButtonClickEvent = null;

            ButtonDownClickEvent = null;

            ButtonLongClickEvent = null;



            base.RemoveFromParent();

        }


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomClickButton.cs

@@ -29,6 +29,7 @@
            this.Gravity = Gravity.CenterHorizontal;

            this.Radius = (uint)Application.GetRealHeight(128) / 2;
            this.TextSize = 16;
            this.IsBold = true;
        }

    }

}


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomLeftClickButton.cs

@@ -42,14 +42,14 @@
        /// <param name="i_width">宽度,真实值</param>

        /// <param name="i_height">高度,真实值</param>

        /// <param name="i_radius">圆角度(只对安卓有效)</param>

        public BottomLeftClickButton(int i_width, int i_height, uint i_radius = 8)

        public BottomLeftClickButton(int i_width, int i_height, int i_radius = 17)

        {

            this.Height = i_height;

            this.Width = i_width;

            this.Gravity = Gravity.BottomLeft;



#if Android

            this.Radius = i_radius;

            this.RadiusEx = i_radius;

#endif

        }




 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomRightClickButton.cs

@@ -42,14 +42,14 @@
        /// <param name="i_width">宽度,真实值</param>

        /// <param name="i_height">高度,真实值</param>

        /// <param name="i_radius">圆角度(只对安卓有效)</param>

        public BottomRightClickButton(int i_width, int i_height, uint i_radius = 8)

        public BottomRightClickButton(int i_width, int i_height, int i_radius = 17)

        {

            this.Height = i_height;

            this.Width = i_width;

            this.Gravity = Gravity.BottomRight;



#if Android

            this.Radius = i_radius;

            this.RadiusEx = i_radius;

#endif

        }



@@ -72,6 +72,7 @@
            this.AddChidren(btnBomTemp, ChidrenBindMode.BindEventOnly);

            //确认按钮

            this.btnConfirm = new NormalViewControl(this.Width - Application.GetRealWidth(10), Application.GetRealHeight(60), false);

            btnConfirm.IsBold = true;

            btnConfirm.Gravity = Gravity.Center;

            btnConfirm.TextColor = UserCenterColor.Current.White;

            btnConfirm.Text = i_text;

@@ -100,6 +101,7 @@
#if iOS

            //确认按钮

            this.btnConfirm = new NormalClickButton(this.Width, this.Height, false);

            btnConfirm.IsBold = true;

            btnConfirm.Gravity = Gravity.BottomRight;

            btnConfirm.TextColor = UserCenterColor.Current.White;

            btnConfirm.Text = i_text;


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs

@@ -94,7 +94,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Gravity = Gravity.CenterHorizontal;

            frameBack.Y = Application.GetRealHeight(683);

            frameBack.Radius = 6;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frameBack);



            //进度显示文本

@@ -116,7 +116,6 @@
            this.btnProgressBar = new FrameLayout();

            btnProgressBar.Width = 0;

            btnProgressBar.Height = btnProRow.Height;

            btnProgressBar.Radius = btnProRow.Radius;

            btnProgressBar.BackgroundColor = 0xfffb744a;

            btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;

            btnProRow.AddChidren(btnProgressBar);

@@ -131,7 +130,7 @@
            var btnProgressPic = new PicViewControl(84, 60);

            btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";

            frameProgress.AddChidren(btnProgressPic);

            this.btnProgressView = new NormalViewControl(84, 32, true);

            this.btnProgressView = new NormalViewControl(84, 45, true);

            btnProgressView.TextSize = 10;

            btnProgressView.TextAlignment = TextAlignment.Center;

            btnProgressView.Text = "0%";


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswGestureInputControl.cs

@@ -49,6 +49,7 @@
            btnTitle.TextAlignment = TextAlignment.Center;

            btnTitle.TextSize = 18;

            btnTitle.Text = i_title;

            btnTitle.IsBold = true;

        }



        /// <summary>


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs

@@ -83,6 +83,7 @@
            this.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);

            this.btnTitle = new NormalViewControl(Application.CurrentWidth, Application.GetRealWidth(75), false);

            btnTitle.Text = i_title;

            btnTitle.IsBold = true;

        }



        /// <summary>


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs

@@ -53,7 +53,7 @@
        {

            this.frameTable = new FrameLayout();

            frameTable.Gravity = Gravity.CenterHorizontal;

            frameTable.Radius = 8;

            frameTable.Radius = (uint)Application.GetRealHeight(17);

            frameTable.Height= Application.GetRealHeight(260);

            frameTable.Width = Application.GetRealWidth(968);

            frameTable.BackgroundColor = UserCenterColor.Current.White;


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs

@@ -54,21 +54,21 @@
            this.frameTable = new FrameLayout();

            frameTable.Height = this.Height;

            frameTable.Width = this.Width;

            frameTable.Radius = 20;

            frameTable.Radius = (uint)Application.GetRealHeight(58);

            frameTable.BackgroundColor = UserCenterColor.Current.White;

            this.AddChidren(frameTable);



            //右上圆角背景

            var btnTopRight = new NormalViewControl(150, 60, true);

            btnTopRight.BackgroundColor = UserCenterColor.Current.White;

            btnTopRight.Radius = 6;

            btnTopRight.RadiusEx = 17;

            this.AddChidren(btnTopRight);

            btnTopRight.X = this.Width - btnTopRight.Width;



            //左下圆角背景

            var btnBottomRight = new NormalViewControl(150, 60, true);

            btnBottomRight.BackgroundColor = UserCenterColor.Current.White;

            btnBottomRight.Radius = 6;

            btnBottomRight.RadiusEx = 17;

            this.AddChidren(btnBottomRight);

            btnBottomRight.Y = this.Height - btnBottomRight.Height;




 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs

@@ -38,7 +38,7 @@
            this.Width = Application.GetRealWidth(968);

            this.Gravity = Gravity.CenterHorizontal;

            this.BackgroundColor = UserCenterColor.Current.White;

            this.Radius = 8;

            this.Radius = (uint)Application.GetRealHeight(17);

        }



        /// <summary>


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs

@@ -56,6 +56,7 @@
            var btnScene = new NormalViewControl(frameScene.Width, Application.GetRealHeight(63), false);

            btnScene.Text = btnTemp.Text;

            btnScene.TextSize = 16;

            btnScene.IsBold = true;

            btnScene.TextColor = UserCenterColor.Current.TextColor2;

            frameScene.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);

            //底线

@@ -98,8 +99,10 @@
                this.m_nowSelectIndex = 1;



                btnScene.TextSize = 16;

                btnScene.IsBold = true;

                btnScene.TextColor = UserCenterColor.Current.TextColor2;

                btnFunc.TextSize = 14;

                btnFunc.IsBold = false;

                btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnSceneLine.Visible = true;

                btnFuncLine.Visible = false;

@@ -117,8 +120,10 @@
                this.m_nowSelectIndex = 2;



                btnScene.TextSize = 14;

                btnScene.IsBold = false;

                btnScene.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnFunc.TextSize = 16;

                btnFunc.IsBold = true;

                btnFunc.TextColor = UserCenterColor.Current.TextColor2;

                btnFuncLine.Visible = true;

                btnSceneLine.Visible = false;


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs

@@ -60,7 +60,7 @@
            this.Width = Application.GetRealWidth(width);
            this.Height = Application.GetRealHeight(height);

            this.Gravity = Gravity.CenterHorizontal;

            this.Radius = 6;
            this.Radius = (uint)Application.GetRealHeight(17);
            this.BackgroundColor = 0xfff8f7f7;
        }


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs

@@ -79,7 +79,7 @@
            frameTable.Height = Application.GetRealHeight(RowHeight * rowCount);

            frameTable.BackgroundColor = UserCenterColor.Current.White;

            frameTable.BorderColor = UserCenterColor.Current.Transparent;

            frameTable.Radius = 6;

            frameTable.Radius = (uint)Application.GetRealHeight(17);

            this.AddChidren(frameTable);



            if (titleText != null)

@@ -104,7 +104,7 @@
                //拥有标题

                listView.Y = Application.GetRealHeight(RowHeight);

            }

            listView.Radius = frameTable.Radius;

            listView.Radius = (uint)Application.GetRealHeight(17);

            frameTable.AddChidren(listView);



            //三角形图标


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs

@@ -64,7 +64,7 @@
                frameCode.X = i * Application.GetRealWidth(115 + 49);

                frameCode.Width = Application.GetRealWidth(115);

                frameCode.Height = Application.GetRealHeight(104);

                frameCode.Radius = 6;

                frameCode.Radius = (uint)Application.GetRealHeight(17);

                frameCode.BorderWidth = 1;

                frameCode.BorderColor = UserCenterColor.Current.TextFrameColor;

                this.AddChidren(frameCode);


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs

@@ -94,7 +94,6 @@
            btnDeviceRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;

            btnDeviceRoom.TextSize = 12;

            btnDeviceRoom.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnDeviceRoom.Text = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);

            frameTable.AddChidren(btnDeviceRoom, ChidrenBindMode.BindEventOnly);



            //底线


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs

@@ -39,6 +39,13 @@
        /// 子控件Y轴偏移量(共通定义而已)

        /// </summary>

        public int chidrenYaxis = 0;

        /// <summary>

        /// 圆角度

        /// </summary>

        public int RadiusEx

        {

            set { this.Radius = (uint)Application.GetRealHeight(value); }

        }



        #endregion



 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs

@@ -104,7 +104,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Y = Application.GetRealHeight(706);

            frameBack.Gravity = Gravity.CenterHorizontal;

            frameBack.Radius = 8;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            frameMain.AddChidren(frameBack);

            //标题

            var btnTitle = new NormalViewControl(frameBack.Width, Application.GetRealHeight(65), false);

@@ -193,7 +193,7 @@
            frameConfirm.Height = Application.GetRealHeight(127);

            frameConfirm.Width = frameBack.Width;

            frameConfirm.Gravity = Gravity.BottomCenter;

            frameConfirm.Radius = 8;

            frameConfirm.RadiusEx = 17;

            frameConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;

            frameBack.AddChidren(frameConfirm);

            //把上圆角覆盖为方角


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs

@@ -68,7 +68,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Y = Application.GetRealHeight(691);

            frameBack.Gravity = Gravity.CenterHorizontal;

            frameBack.Radius = 8;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            this.AddChidren(frameBack);

            //标题信息

            this.btnTitle = new NormalViewControl(frameBack.Width, Application.GetRealHeight(65), false);

@@ -86,7 +86,7 @@
            frameText.Gravity = Gravity.CenterHorizontal;

            frameText.BorderColor = 0xff676767;

            frameText.BorderWidth = 1;

            frameText.Radius = 8;

            frameText.Radius = (uint)Application.GetRealHeight(17);

            frameBack.AddChidren(frameText);

            //输入框

            this.txtInput = new TextInputControl(frameText.Width - Application.GetRealWidth(20), frameText.Height, false);


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs

@@ -50,7 +50,7 @@
            var frameBack = new FrameLayout();
            frameBack.Width = Application.GetRealWidth(850);
            frameBack.Height = Application.GetRealHeight(1342);
            frameBack.Radius = 6;
            frameBack.Radius = (uint)Application.GetRealHeight(17);
            frameBack.BackgroundColor = UserCenterColor.Current.White;
            frameBack.Gravity = Gravity.CenterHorizontal;
            frameBack.Y = Application.GetRealHeight(328);
@@ -59,7 +59,7 @@
            this.listView = new VerticalListControl(3);
            listView.Y = Application.GetRealHeight(164 - 11);
            listView.Height = frameBack.Height - Application.GetRealHeight(164 - 11);
            listView.Radius = frameBack.Radius;

            listView.Radius = (uint)Application.GetRealHeight(17);

            frameBack.AddChidren(listView);



            //请选择区号

@@ -300,7 +300,7 @@
                //桌布控件

                this.Width = Application.GetRealWidth(458);

                this.Height = Application.GetRealHeight(104);

                this.Radius = 6;

                this.Radius = (uint)Application.GetRealHeight(17);

                this.BorderColor = 0xffbfc1c2;

                this.BorderWidth = (uint)Application.GetMinRealAverage(3);

            }


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs

@@ -103,6 +103,8 @@
            //标题
            var txttitle = new TopLayoutTitleControl();
            topFrameLayout.AddChidren(txttitle);
            //粗体
            txttitle.IsBold = true;
            topFrameLayout.AddTag("txtTitle", txttitle);
        }



 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomMenuSelectForm.cs

@@ -59,7 +59,7 @@
            //菜单的桌布控件

            this.frameMenuTable = new FrameLayout();

            frameMenuTable.Gravity = Gravity.CenterHorizontal;

            frameMenuTable.Radius = 12;

            frameMenuTable.Radius = (uint)Application.GetRealHeight(35);

            frameMenuTable.Width = Application.GetRealWidth(1034);

            frameMenuTable.Height = this.menuHeight * menuCount;

            frameMenuTable.BackgroundColor = UserCenterColor.Current.White;

@@ -69,7 +69,7 @@
            var frameCancel = new FrameLayout();

            frameCancel.Y = frameAnimateTable.Height - this.menuHeight - Application.GetRealHeight(23);

            frameCancel.Gravity = Gravity.CenterHorizontal;

            frameCancel.Radius = 12;

            frameCancel.Radius = (uint)Application.GetRealHeight(35);

            frameCancel.Width = Application.GetRealWidth(1034);

            frameCancel.Height = this.menuHeight;

            frameCancel.BackgroundColor = UserCenterColor.Current.White;


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/NumberPswInputDialogForm.cs

@@ -48,7 +48,7 @@
            frameBack.Width = Application.GetRealWidth(965);

            frameBack.Height = Application.GetRealHeight(1584);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Radius = 6;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frameBack);



            //密码输入控件


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs

@@ -43,7 +43,7 @@
            frameBack.Width = Application.GetRealWidth(965);

            frameBack.Height = Application.GetRealHeight(1486);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Radius = 8;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frameBack);



            //手势验证控件


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs

@@ -43,7 +43,7 @@
            frameBack.Width = Application.GetRealWidth(965);

            frameBack.Height = Application.GetRealHeight(1711);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Radius = 8;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frameBack);



            //密码输入控件


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

@@ -639,12 +639,15 @@
                return false;

            }



            if (listFile.Contains(DirNameResourse.ShowOptionMenuFile) == true)

            //检测

            string checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.ShowOptionMenuFile + UserCenterResourse.UserInfo.Account);

            if (listFile.Contains(checkKeys) == true)

            {

                //显示主页隐藏菜单(Debug用)

                UserCenterResourse.HideOption.CenterHideMenu = 1;

            }

            if (listFile.Contains(DirNameResourse.DetailedLogFile) == true)

            checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.DetailedLogFile + UserCenterResourse.UserInfo.Account);

            if (listFile.Contains(checkKeys) == true)

            {

                //出力详细Log(Debug用)

                UserCenterResourse.HideOption.DetailedLog = 1;


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

@@ -223,7 +223,7 @@
            foreach (var data in result.delDeviceBindResponseData.RemoveBindList)

            {

                //0:成功  1:设备不在绑定列表中 ，也可以代表成功

                if (data.Result == 0 || data.Result == 1)

                if (data.Result == 0 || data.Result == 1 || data.Result == 5)

                {

                    return true;

                }

@@ -235,8 +235,8 @@
                    this.ShowErrorMsg(msg);

                    return false;

                }

                //4：未知，由节点设备反馈发送“Bind/BindResult”主题消息确定是否成功

                else if (data.Result == 4)

                //2：未知，由节点设备反馈发送“Bind/BindResult”主题消息确定是否成功

                else if (data.Result == 2)

                {

                    if (result.removeBindResultResponseData == null)

                    {

@@ -329,8 +329,8 @@
                    msg += Language.StringByID(R.MyInternationalizationString.uOtherBindTargetsIsDelettingPleaseWait);

                    this.ShowErrorMsg(msg);

                }

                //4：未知，由节点设备反馈发送“Bind/BindResult”主题消息确定是否成功

                else if (data.Result == 4)

                //2：未知，由节点设备反馈发送“Bind/BindResult”主题消息确定是否成功

                else if (data.Result == 2)

                {

                    if (result.removeBindResultResponseData == null)

                    {


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

@@ -58,29 +58,29 @@
            }



            //保存协调器的nv分区组网信息

            bool result = this.SaveNVFile(realGateway);

            if (result == false)

            {

                //如果上传失败的话，就把它删除

                await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);

                //关闭进度条

                ProgressFormBar.Current.Close();

                return;

            }

            //bool result = this.SaveNVFile(realGateway);

            //if (result == false)

            //{

            //    //如果上传失败的话，就把它删除

            //    await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);

            //    //关闭进度条

            //    ProgressFormBar.Current.Close();

            //    return;

            //}



            //打开协调器串口发送功能

            result = this.OpenZbMsComSend(realGateway);

            if (result == false)

            {

                //如果上传失败的话，就把它删除

                await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);

                //关闭进度条

                ProgressFormBar.Current.Close();

                return;

            }

            //result = this.OpenZbMsComSend(realGateway);

            //if (result == false)

            //{

            //    //如果上传失败的话，就把它删除

            //    await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);

            //    //关闭进度条

            //    ProgressFormBar.Current.Close();

            //    return;

            //}



            //开始上传数据

            result = this.StartUpLoadData(realGateway, backupClassId);

            bool result = this.StartUpLoadData(realGateway, backupClassId);

            if (result == false)

            {

                //如果上传失败的话，就把它删除

@@ -342,23 +342,23 @@
                return false;

            }



            //恢复协调器nv分区的组网信息

            result = this.RestoreGatewayNV(realGateway);

            if (result == false)

            {

                //关闭进度条

                ProgressFormBar.Current.Close();

                return false;

            }

            ////恢复协调器nv分区的组网信息

            //result = this.RestoreGatewayNV(realGateway);

            //if (result == false)

            //{

            //    //关闭进度条

            //    ProgressFormBar.Current.Close();

            //    return false;

            //}



            //打开协调器串口发送功能

            result = this.OpenZbMsComSend(realGateway);

            if (result == false)

            {

                //关闭进度条

                ProgressFormBar.Current.Close();

                return false;

            }

            //result = this.OpenZbMsComSend(realGateway);

            //if (result == false)

            //{

            //    //关闭进度条

            //    ProgressFormBar.Current.Close();

            //    return false;

            //}



            //重启网关系统

            result = this.GatewayReboot(realGateway);


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

@@ -693,15 +693,15 @@
                bool result = await this.SetHomeIdToGateway(realWay, string.Empty);

                if (result == false)

                {

                    //网关解绑失败

                    //网关解绑失败  不理它,因为网关可以按按键强制搜索得到

                    string msg = Language.StringByID(R.MyInternationalizationString.uGatewayUnBindFail);

                    this.ShowErrorMsg(msg);

                    return false;

                    //this.ShowErrorMsg(msg);

                    //return false;

                }

            }



            //删除云端的网关

            await Phone.UserCenter.HdlGatewayLogic.Current.DeleteDataBaseGateway(zbGatewayID);

            await this.DeleteDataBaseGateway(zbGatewayID);



            //删除网关文件
            this.DeleteGatewayFile(zbGatewayID);
@@ -2245,7 +2245,7 @@
            //获取控制主人账号的Token

            Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();



            List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord" };

            List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotSetAgain" };



            bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);

            if (result == false)


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

@@ -101,7 +101,7 @@
            {

                fileName += "Log";

            }

            fileName = UserCenterLogic.EncryptPassword("4^Olh_3f", fileName);

            fileName = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, fileName);

            return fileName;

        }

        #endregion


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

old mode 100755
new mode 100644
@@ -56,7 +56,12 @@
            get

            {

#if iOS

                return string.Empty;

                string ssiD = Shared.WiimuUPnP.SSID;
                if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))
                {
                    ssiD = ssiD.Substring(1, ssiD.Length - 2);
                }

                return ssiD;

#endif

#if Android

                string ssiD = null;

@@ -278,10 +283,10 @@
        {

            if (hdlWiFi == null)

            {

                Com.Mediatek.Elian.ElianNative.LoadLib();

                var result2 = Com.Mediatek.Elian.ElianNative.LoadLib();

                //初始化Wi-Fi配网

                this.hdlWiFi = new Com.Mediatek.Elian.ElianNative();

                var value = hdlWiFi.InitSmartConnection(null, 1, 0);

                var value = hdlWiFi.InitSmartConnection(null, 1, 1);

            }

            //开始Wi-Fi配网

            var result = hdlWiFi.StartSmartConnection(wifiName, wifiPsw, p2);

@@ -297,6 +302,7 @@
            {

                //停止Wi-Fi配网

                var result = hdlWiFi.StopSmartConnection();

                hdlWiFi = null;

            }

        }

#endif

@@ -308,10 +314,10 @@
        /// <param name="wifiPsw">wifi密码</param>

        /// <param name="p2">我也不知道这个是什么东西</param>

        /// <returns></returns>

        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "1")

        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "")

        {

            //初始化Wi-Fi连接

            Com.Mediatek.Elian.ElianNative.InitSmartConnection(null, 1, 1);

            Com.Mediatek.Elian.ElianNative.InitSmartConnection("1", 1, 1);

            //开始Wi-Fi连接

            var result = Com.Mediatek.Elian.ElianNative.StartSmartConnection(wifiName, wifiPsw, p2);

            return true;


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

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

        public static string EncryptPassword(string keys, string strPsw)

        {

            try

            {

            if (strPsw == string.Empty)

            {

                return strPsw;

@@ -1248,7 +1250,9 @@
            {

                ret.AppendFormat("{0:X2}", b);

            }

            return ret.ToString();

                return ret.ToString().ToLower();

            }

            catch { return strPsw; }

        }



        /// <summary>

@@ -1257,6 +1261,8 @@
        /// <param name="strPsw"></param>

        /// <returns></returns>

        public static string DecryptPassword(string keys, string strPsw)

        {

            try

        {

            if (strPsw == string.Empty)

            {

@@ -1282,6 +1288,8 @@


            return System.Text.Encoding.Default.GetString(ms.ToArray());

        }

            catch { return strPsw; }

        }

        #endregion



        #region ■ 文件保存和读取_____________________


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs

@@ -122,11 +122,11 @@
        /// <summary>

        /// 显示功能菜单的【标识文件】

        /// </summary>

        public const string ShowOptionMenuFile = "eaf5efcca1be2f4cb0ff3dea79df755f5886beb3bf7aed1b";

        public const string ShowOptionMenuFile = "ShowOptionMenuFile";

        /// <summary>

        /// 详细Log处理的【标识文件】

        /// </summary>

        public const string DetailedLogFile = "ceec8cfdbe5e8112755cba32c1b081f9";

        public const string DetailedLogFile = "DetailedLogFile";

        /// <summary>

        /// 功能备份的名字  这个东西不加密

        /// </summary>


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs

@@ -39,5 +39,9 @@
        /// 隐匿配置

        /// </summary>
        public static HideOptionInfo HideOption = new HideOptionInfo();
        /// <summary>

        /// 文件加密秘钥

        /// </summary>
        public const string FileEncryptKey = "4^Olh_3f";
    }
}

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

@@ -51,7 +51,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Gravity = Gravity.CenterHorizontal;

            frameBack.Y = Application.GetRealHeight(683);

            frameBack.Radius = 6;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frameBack);



            //进度显示文本

@@ -74,7 +74,6 @@
            var btnProgressBar = new FrameLayout();

            btnProgressBar.Width = 0;

            btnProgressBar.Height = btnProRow.Height;

            btnProgressBar.Radius = btnProRow.Radius;

            btnProgressBar.BackgroundColor = 0xfffb744a;

            btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;

            btnProRow.AddChidren(btnProgressBar);

@@ -89,7 +88,7 @@
            var btnProgressPic = new PicViewControl(84, 60);

            btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";

            frameProgress.AddChidren(btnProgressPic);

            var btnProgressView = new NormalViewControl(84, 32, true);

            var btnProgressView = new NormalViewControl(84, 45, true);

            btnProgressView.TextSize = 10;

            btnProgressView.TextAlignment = TextAlignment.Center;

            btnProgressView.Text = "0%";


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

@@ -118,7 +118,6 @@
            this.btnProgressBar = new FrameLayout();

            btnProgressBar.Width = 0;

            btnProgressBar.Height = btnProRow.Height;

            btnProgressBar.Radius = btnProRow.Radius;

            btnProgressBar.BackgroundColor = 0xfffb744a;

            btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;

            btnProRow.AddChidren(btnProgressBar);


 ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs

@@ -306,7 +306,7 @@
        private NormalViewControl InitUserSelectButton(bool select)

        {

            var btnContr = new NormalViewControl(207, 63, true);

            btnContr.Radius = 6;

            btnContr.RadiusEx = 17;

            btnContr.TextAlignment = TextAlignment.Center;

            if (select == false)

            {

@@ -367,7 +367,7 @@
        private NormalViewControl InitLockSelectButton(bool select)

        {

            var btnContr = new NormalViewControl(207, 63, true);

            btnContr.Radius = 6;

            btnContr.RadiusEx = 17;

            btnContr.TextAlignment = TextAlignment.Center;

            if (select == false)

            {


 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs

@@ -513,13 +513,14 @@
            }

            //节能模式修改(他们说随便一个回路就行)

            result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);

            this.CloseProgressBar();

            if (result == false)

            {

                this.CloseProgressBar();

                return;

            }

            //设置按键面板指定端点的【指示灯开关颜色】的信息

            result = await HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);

            this.CloseProgressBar();

            if (result == false)

            {

                return;


 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs

@@ -374,7 +374,7 @@
            var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);

            btnIcon.Name = "btn" + device.DeviceEpoint;

            btnIcon.Gravity = Gravity.Center;

            btnIcon.Radius = 6;

            btnIcon.RadiusEx = 16;

            btnIcon.BorderWidth = 2;

            btnIcon.BorderColor = 0xff979797;

            frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);


 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs

@@ -181,7 +181,7 @@


                var btnIcon = new IconViewControl(60);

                btnIcon.Gravity = Gravity.Center;

                btnIcon.Radius = (uint)btnIcon.IconSize;

                btnIcon.Radius = (uint)btnIcon.IconSize / 2;

                btnFrame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);



                if (dataColor != null)


 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs

@@ -433,7 +433,7 @@
            var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);

            btnIcon.Name = "btn" + device.DeviceEpoint;

            btnIcon.Gravity = Gravity.Center;

            btnIcon.Radius = 6;

            btnIcon.RadiusEx = 16;

            btnIcon.BorderWidth = 2;

            btnIcon.BorderColor = 0xff979797;

            frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);


 ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs

@@ -66,10 +66,6 @@
            var frameBack = new FrameLayout();

            frameBack.Height = Application.GetRealHeight(204);

            bodyFrameLayout.AddChidren(frameBack);

            var scrolContr = new HorizontalScrolViewLayout();

            scrolContr.Gravity = Gravity.CenterVertical;

            scrolContr.Height = frameBack.Height;

            frameBack.AddChidren(scrolContr);



            //桌布控件

            this.frameTable = new FrameLayout();

@@ -77,12 +73,44 @@
            frameTable.Height = bodyFrameLayout.Height - frameBack.Height;

            bodyFrameLayout.AddChidren(frameTable);



            //其他

            var tempRoom = new Common.Room();

            tempRoom.Name = Language.StringByID(R.MyInternationalizationString.uOther);

            foreach (var mainKeys in this.listEsixtDevice)

            {

                var device = Common.LocalDevice.Current.GetDevice(mainKeys);

                if (device == null)

                {

                    continue;

                }

                //这个手机弄弄,那个手机弄弄的情况下,

                //采用后备操作 -> 新建一个临时房间对象出来

                if (Common.Room.CurrentRoom.GetRoomByDevice(device) == null)

                {

                    tempRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(device));

                }

            }



            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                if (dicRoom.ContainsKey(nowSelectFloorId) == true && dicRoom[nowSelectFloorId].Count > 0)

                {

                    //初始化房间控件

                    this.InitRoomControl(scrolContr, dicRoom[nowSelectFloorId]);

                    var listRoom = new List<Common.Room>();

                    listRoom.AddRange(dicRoom[nowSelectFloorId]);

                    if (tempRoom.DeviceUIList.Count > 0)

                    {

                        //显示新建的临时房间对象

                        listRoom.Add(tempRoom);

                    }

                    var roomContr = new RoomDeviceGroupMenuControl(listRoom);

                    frameBack.AddChidren(roomContr);

                    roomContr.SelectRoomEvent += (myRoom) =>

                    {

                        //初始化设备行

                        this.InitDeviceControl(myRoom);

                    };

                    roomContr.InitControl();



                    //确定按钮

                    var btnOk = new BottomClickButton();

@@ -139,6 +167,17 @@
            {

                return;

            }

            int indexTemp = 1;

            foreach (var floorId in dicRoom.Keys)

            {

                if (dicFloor.ContainsKey(floorId) == false)

                {

                    //这是多台手机瞎搞之后出现的后备补救措施

                    dicFloor[floorId] = Language.StringByID(R.MyInternationalizationString.uOther) + indexTemp;

                    indexTemp++;

                }

            }



            var btnIconContr = new MostRightIconControl(69, 69);

            btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";

            topFrameLayout.AddChidren(btnIconContr);

@@ -175,88 +214,6 @@
                }

            };

        }

        #endregion



        #region ■ 初始化房间控件_____________________



        /// <summary>

        /// 初始化房间控件

        /// </summary>

        /// <param name="scrolContr">容器</param>

        /// <param name="listRoom">房间列表</param>

        private void InitRoomControl(HorizontalScrolViewLayout scrolContr, List<Common.Room> listRoom)

        {

            string oldRoomId = listRoom[0].Id;

            FrameLayoutControl oldFrameBack = null;

            NormalViewControl oldBtnText = null;



            //弄个空的进去占位置

            var frameTemp = new FrameLayout();

            frameTemp.Height = scrolContr.Height;

            frameTemp.Width = ControlCommonResourse.XXLeft / 2;

            scrolContr.AddChidren(frameTemp);



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

            {

                var room = listRoom[i];

                //带图片的

                var frameBack = new FrameLayoutControl();

                frameBack.UseClickStatu = false;

                frameBack.Gravity = Gravity.Center;

                frameBack.Height = Application.GetRealHeight(159);

                frameBack.Width = Application.GetRealWidth(255);

                if (i == 0)

                {

                    frameBack.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";

                    oldFrameBack = frameBack;

                }

                else

                {

                    frameBack.BackgroundImagePath = "Item/RoomIconBackground.png";

                }

                scrolContr.AddChidren(frameBack);

                //文字

                var btnText = new NormalViewControl(frameBack.Width - (int)(frameBack.Height * 0.47), frameBack.Height, false);

                btnText.Gravity = Gravity.CenterHorizontal;

                btnText.Text = room.Name;

                btnText.TextSize = 12;

                btnText.TextAlignment = TextAlignment.Center;

                if (i == 0)

                {

                    btnText.TextColor = UserCenterColor.Current.White;

                    oldBtnText = btnText;

                }

                else

                {

                    btnText.TextColor = UserCenterColor.Current.TextGrayColor1;

                }

                frameBack.AddChidren(btnText, ChidrenBindMode.BindEventOnly);



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

                {

                    if (oldRoomId == room.Id)

                    {

                        //同一个东西

                        return;

                    }

                    oldRoomId = room.Id;



                    //状态变更

                    frameBack.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";

                    btnText.TextColor = UserCenterColor.Current.White;



                    oldFrameBack.BackgroundImagePath = "Item/RoomIconBackground.png";

                    oldBtnText.TextColor = UserCenterColor.Current.TextGrayColor1;

                    oldFrameBack = frameBack;

                    oldBtnText = btnText;

                    //初始化设备行

                    this.InitDeviceControl(room);

                };

            }

            //初始化设备行

            this.InitDeviceControl(listRoom[0]);

        }



        #endregion



        #region ■ 初始化设备控件_____________________

@@ -303,7 +260,7 @@
                var btnIcon = rowDevice.AddLeftIcon(81);

                Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);

                //设备名称

                var btnName = rowDevice.AddLeftCaption(Common.LocalDevice.Current.GetDeviceEpointName(device), 600);

                var btnName = rowDevice.AddLeftCaption(Common.LocalDevice.Current.GetDeviceEpointName(device), 700);

                btnName.TextSize = 15;

                //选择

                var btnSelect = rowDevice.AddMostRightEmptyIcon(58, 58);


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs

@@ -72,88 +72,5 @@
                });

            };
        }



        /// <summary>

        /// 菜单控件

        /// </summary>

        private class SearchWirelessMenuControl : DialogCommonForm

        {

            /// <summary>

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

            /// </summary>

            public void ShowForm()

            {

                var frameBack1 = new FrameLayoutControl();

                frameBack1.UseClickStatu = false;

                frameBack1.Y = Application.GetRealHeight(1420);

                frameBack1.Gravity = Gravity.CenterHorizontal;

                frameBack1.Radius = 12;

                frameBack1.Width = Application.GetRealWidth(1034);

                frameBack1.Height = Application.GetRealHeight(300);

                frameBack1.BackgroundColor = UserCenterColor.Current.White;

                bodyFrameLayout.AddChidren(frameBack1);



                //UDP模式(推荐)

                var btnUdp = new NormalViewControl(900, 156, true);

                btnUdp.Gravity = Gravity.CenterHorizontal;

                btnUdp.TextAlignment = TextAlignment.Center;

                btnUdp.TextColor = 0xff0075ff;

                btnUdp.TextSize = 17;

                btnUdp.TextID = R.MyInternationalizationString.uUdpModeRecommend;

                frameBack1.AddChidren(btnUdp, ChidrenBindMode.NotBind);

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

                {

                    //关闭界面

                    this.CloseForm();

                    var form = new WirelessUdpDirectionForm();

                    form.AddForm();

                };



                //线

                var btnLine = new NormalViewControl(frameBack1.Width, ControlCommonResourse.BottomLineHeight, false);

                btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

                btnLine.Y = btnUdp.Bottom;

                frameBack1.AddChidren(btnLine, ChidrenBindMode.NotBind);

                //AP模式

                var btnAp = new NormalViewControl(900, 144, true);

                btnAp.Y = btnLine.Bottom;

                btnAp.Gravity = Gravity.CenterHorizontal;

                btnAp.TextAlignment = TextAlignment.Center;

                btnAp.TextColor = 0xff0075ff;

                btnAp.TextSize = 17;

                btnAp.TextID = R.MyInternationalizationString.uApMode;

                frameBack1.AddChidren(btnAp, ChidrenBindMode.NotBind);

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

                {

                    //关闭界面

                    this.CloseForm();

                    var form = new WirelessApDirection1Form();

                    form.AddForm();

                };



                var frameBack2 = new FrameLayoutControl();

                frameBack2.UseClickStatu = false;

                frameBack2.Y = frameBack1.Bottom + Application.GetRealHeight(23);

                frameBack2.Gravity = Gravity.CenterHorizontal;

                frameBack2.Radius = 12;

                frameBack2.Width = Application.GetRealWidth(1034);

                frameBack2.Height = Application.GetRealHeight(156);

                frameBack2.BackgroundColor = UserCenterColor.Current.White;

                bodyFrameLayout.AddChidren(frameBack2);

                //取消

                var btnCancel = new NormalViewControl(900, 156, true);

                btnCancel.Gravity = Gravity.CenterHorizontal;

                btnCancel.TextAlignment = TextAlignment.Center;

                btnCancel.TextColor = 0xff0075ff;

                btnCancel.TextSize = 17;

                btnCancel.TextID = R.MyInternationalizationString.uCancel;

                frameBack2.AddChidren(btnCancel, ChidrenBindMode.NotBind);

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

                {

                    //关闭界面

                    this.CloseForm();

                };

            }

        }
    }
}

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs

@@ -160,6 +160,7 @@
            frameback.BackgroundImagePath = "Item/BottomButtonGround.png";

            bodyFrameLayout.AddChidren(frameback);

            var btnReDo = new NormalViewControl(300, 65, true);

            btnReDo.IsBold = true;

            btnReDo.TextColor = UserCenterColor.Current.White;

            btnReDo.TextSize = 16;

            btnReDo.Y = Application.GetRealHeight(49);


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs

@@ -154,6 +154,7 @@
            frameback.BackgroundImagePath = "Item/BottomButtonGround.png";

            bodyFrameLayout.AddChidren(frameback);

            var btnReDo = new NormalViewControl(300, 65, true);

            btnReDo.IsBold = true;

            btnReDo.TextColor = UserCenterColor.Current.White;

            btnReDo.TextSize = 16;

            btnReDo.Y = Application.GetRealHeight(49);


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs

@@ -156,6 +156,7 @@
            frameback.BackgroundImagePath = "Item/BottomButtonGround.png";

            bodyFrameLayout.AddChidren(frameback);

            var btnReDo = new NormalViewControl(300, 65, true);

            btnReDo.IsBold = true;

            btnReDo.TextColor = UserCenterColor.Current.White;

            btnReDo.TextSize = 16;

            btnReDo.Y = Application.GetRealHeight(49);

@@ -246,7 +247,7 @@
                //计时时间

                int timeCount = 0;

                //超时时间

                int timeOut = 120;

                int timeOut = 240;

                while (btnGwImage.Parent != null)

                {

                    timeCount++;


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs

@@ -28,15 +28,17 @@
                //打开进度条

                this.ShowProgressBar();

                var ssid = HdlWifiLogic.Current.SSID;

                //关闭进度条

                this.CloseProgressBar();

                if (ssid == null)

                {

                    //获取网络SSID失败

                    string msg = Language.StringByID(R.MyInternationalizationString.uGetSsidFail);

                    this.ShowMassage(ShowMsgType.Error, msg);

                    this.ShowMassage(ShowMsgType.Tip, msg);

                    //关闭进度条

                    this.CloseProgressBar(ShowReLoadMode.YES);

                    return;

                }

                //关闭进度条

                this.CloseProgressBar();



                HdlThreadLogic.Current.RunMain(() =>

                {

@@ -122,7 +124,7 @@
                    return;

                }

                //开始Wi-Fi配网

                HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "1");

                HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "");

                var form = new WirelessUdpSearchForm();

                this.AddFromAndRemoveNowForm(form);

            };


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs

@@ -51,6 +51,7 @@


            //添加智能网关成功

            var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(85), false);

            btnMsg.IsBold = true;

            btnMsg.Y = Application.GetRealHeight(732);

            btnMsg.TextAlignment = TextAlignment.Center;

            btnMsg.TextSize = 20;

@@ -67,6 +68,7 @@
            frameAdd.BackgroundImagePath = "Item/BottomButtonGround.png";

            bodyFrameLayout.AddChidren(frameAdd);

            var btnAdd = new NormalViewControl(300, 65, true);

            btnAdd.IsBold = true;

            btnAdd.TextColor = UserCenterColor.Current.White;

            btnAdd.TextSize = 16;

            btnAdd.Y = Application.GetRealHeight(49);


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs

@@ -73,7 +73,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Gravity = Gravity.CenterHorizontal;

            frameBack.Y = Application.GetRealHeight(683);

            frameBack.Radius = 6;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frameBack);



            //进度显示文本

@@ -96,7 +96,6 @@
            var btnProgressBar = new FrameLayout();

            btnProgressBar.Width = 0;

            btnProgressBar.Height = btnProRow.Height;

            btnProgressBar.Radius = btnProRow.Radius;

            btnProgressBar.BackgroundColor = 0xfffb744a;

            btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;

            btnProRow.AddChidren(btnProgressBar);

@@ -111,7 +110,7 @@
            var btnProgressPic = new PicViewControl(84, 60);

            btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";

            frameProgress.AddChidren(btnProgressPic);

            var btnProgressView = new NormalViewControl(84, 32, true);

            var btnProgressView = new NormalViewControl(84, 45, true);

            btnProgressView.TextSize = 10;

            btnProgressView.TextAlignment = TextAlignment.Center;

            btnProgressView.Text = "0%";


 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs

@@ -69,6 +69,7 @@
            frameback.BackgroundImagePath = "Item/BottomButtonGround.png";

            bodyFrameLayout.AddChidren(frameback);

            var btnBackup = new NormalViewControl(400, 65, true);

            btnBackup.IsBold = true;

            btnBackup.TextColor = UserCenterColor.Current.White;

            btnBackup.TextSize = 16;

            btnBackup.Y = Application.GetRealHeight(49);


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

@@ -120,6 +120,11 @@
                //发送定位命令

                HdlGatewayLogic.Current.SetFixedPositionCommand(i_gateway);

            };

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

            {

                var form = new GatewayManage.GatewayInfoEditorForm();

                form.AddForm(i_gateway);

            };

        }



        #endregion


 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs

@@ -69,6 +69,7 @@


            //成员ID

            var btnUserId = new NormalViewControl(800, 50, true);

            btnUserId.IsBold = true;

            btnUserId.Y = Application.GetRealHeight(472);

            btnUserId.Gravity = Gravity.CenterHorizontal;

            btnUserId.Text = memberResult.Account;

@@ -78,6 +79,7 @@


            //昵称

            var btnName = new NormalViewControl(800, 55, true);

            btnName.IsBold = true;

            btnName.Y = Application.GetRealHeight(541);

            btnName.Gravity = Gravity.CenterHorizontal;

            btnName.TextAlignment = TextAlignment.Center;

@@ -93,6 +95,7 @@
                strMsg = string.Format(strMsg, "\r\n");

            }

            var btnmsg = new NormalViewControl(800, 100, true);

            btnmsg.IsBold = true;

            btnmsg.Y = Application.GetRealHeight(913);

            btnmsg.TextSize = 12;

            btnmsg.Text = strMsg;


 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs

@@ -52,7 +52,7 @@
            frame.Height = Application.GetRealHeight(1097);

            frame.BackgroundColor = UserCenterColor.Current.White;

            frame.Gravity = Gravity.Center;

            frame.Radius = 6;

            frame.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frame);



            //用户图标

@@ -60,6 +60,7 @@
            var btnUserIcon = new ImageView();

            btnUserIcon.Height = Application.GetMinRealAverage(207);

            btnUserIcon.Width = Application.GetMinRealAverage(207);

            btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;

            btnUserIcon.Y = Application.GetRealHeight(104);

            btnUserIcon.Gravity = Gravity.CenterHorizontal;

            if (System.IO.File.Exists(iconPath) == true)

@@ -74,6 +75,7 @@


            //昵称

            var btnName = new NormalViewControl(frame.Width, Application.GetRealHeight(55), false);

            btnName.IsBold = true;

            btnName.TextAlignment = TextAlignment.Center;

            btnName.Y = Application.GetRealHeight(334);

            btnName.TextColor = UserCenterColor.Current.TextColor2;

@@ -96,6 +98,7 @@


            //家族成员添加成功

            var btnSuccess = new NormalViewControl(frame.Width, Application.GetRealHeight(82), false);

            btnSuccess.IsBold = true;

            btnSuccess.Y = Application.GetRealHeight(547);

            btnSuccess.TextAlignment = TextAlignment.Center;

            btnSuccess.TextID = R.MyInternationalizationString.uAddMemberSuccess;


 ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs

@@ -43,18 +43,30 @@
            frame.Height = Application.GetRealHeight(1097);

            frame.BackgroundColor = UserCenterColor.Current.White;

            frame.Gravity = Gravity.Center;

            frame.Radius = 6;

            frame.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frame);



            //用户图标

            var btnUserIcon = new PicViewControl(207, 207);
            string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfo.DistributedMark + ".png");

            var btnUserIcon = new ImageView();

            btnUserIcon.Height = Application.GetMinRealAverage(207);

            btnUserIcon.Width = Application.GetMinRealAverage(207);

            btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
            btnUserIcon.Y = Application.GetRealHeight(104);
            btnUserIcon.Gravity = Gravity.CenterHorizontal;

            btnUserIcon.UnSelectedImagePath = "Center/Admin.png";
            if (System.IO.File.Exists(iconPath) == true)

            {

                btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);

            }

            else

            {

                btnUserIcon.ImagePath = "Center/Admin.png";

            }
            frame.AddChidren(btnUserIcon);



            //昵称

            var btnName = new NormalViewControl(frame.Width, Application.GetRealHeight(55), false);

            btnName.IsBold = true;
            btnName.TextAlignment = TextAlignment.Center;
            btnName.Y = Application.GetRealHeight(334);
            btnName.TextColor = UserCenterColor.Current.TextColor2;
@@ -84,6 +96,7 @@


            

            var btnMsg = new NormalViewControl(frame.Width, Application.GetRealHeight(81), false);

            btnMsg.IsBold = true;

            if (memberInfo.AccountType == 1)

            {

                //授权成功!


 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs

@@ -102,6 +102,7 @@
            btnErrorMsg.TextAlignment = TextAlignment.Center;

            btnErrorMsg.TextColor = 0xfff75858;

            btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;

            btnErrorMsg.IsBold = true;

            bodyFrameLayout.AddChidren(btnErrorMsg);

            btnErrorMsg.Visible = false;




 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs

@@ -119,6 +119,7 @@
            btnErrorMsg.Y = Application.GetRealHeight(677);

            btnErrorMsg.TextAlignment = TextAlignment.Center;

            btnErrorMsg.TextColor = 0xfff75858;

            btnErrorMsg.IsBold = true;

            btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;

            bodyFrameLayout.AddChidren(btnErrorMsg);

            btnErrorMsg.Visible = false;


 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs

@@ -95,6 +95,7 @@
            btnErrorMsg.TextAlignment = TextAlignment.Center;

            btnErrorMsg.TextColor = 0xfff75858;

            btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;

            btnErrorMsg.IsBold = true;

            bodyFrameLayout.AddChidren(btnErrorMsg);

            btnErrorMsg.Visible = false;




 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs

@@ -108,6 +108,7 @@
            btnErrorMsg.TextAlignment = TextAlignment.Center;

            btnErrorMsg.TextColor = 0xfff75858;

            btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;

            btnErrorMsg.IsBold = true;

            bodyFrameLayout.AddChidren(btnErrorMsg);

            btnErrorMsg.Visible = false;




 ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs

@@ -130,6 +130,7 @@
            msgControl.Y = Application.GetRealHeight(582);

            msgControl.TextAlignment = TextAlignment.Center;

            msgControl.TextColor = 0xfff75858;

            msgControl.IsBold = true;

            bodyFrameLayout.AddChidren(msgControl);



            //确认修改


 ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs

@@ -81,7 +81,7 @@
            var btnCode = new NormalViewControl(302, 127, true);

            btnCode.X = rowPhone.Right + Application.GetRealWidth(35);

            btnCode.Y = Application.GetRealHeight(23);

            btnCode.Radius = 4;

            btnCode.RadiusEx = 12;

            btnCode.TextID = R.MyInternationalizationString.uGetVerificationCode;

            btnCode.TextColor = UserCenterColor.Current.White;

            btnCode.BackgroundColor = UserCenterColor.Current.TextOrangeColor;


 ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs

@@ -81,7 +81,7 @@
            var btnCode = new NormalViewControl(302, 127, true);

            btnCode.X = rowPhone.Right + Application.GetRealWidth(35);

            btnCode.Y = Application.GetRealHeight(23);

            btnCode.Radius = 4;

            btnCode.RadiusEx = 12;

            btnCode.TextID = R.MyInternationalizationString.uGetVerificationCode;

            btnCode.TextColor = UserCenterColor.Current.White;

            btnCode.BackgroundColor = UserCenterColor.Current.TextOrangeColor;


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

@@ -60,11 +60,11 @@
            framePic.Width = Application.GetMinRealAverage(887);

            framePic.Height = Application.GetMinRealAverage(444);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Radius = 8;

            framePic.Radius = (uint)Application.GetRealHeight(17);

            framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;

            bodyFrameLayout.AddChidren(framePic);

            var btnPic = new ImageView();

            btnPic.Radius = 8;

            btnPic.Radius = (uint)Application.GetRealHeight(17);

            btnPic.ImagePath = "RoomIcon/0.JPG";

            framePic.AddChidren(btnPic);

            btnPic.MouseUpEventHandler += (sender, e) =>


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

@@ -65,11 +65,11 @@
            framePic.Width = Application.GetMinRealAverage(887);

            framePic.Height = Application.GetMinRealAverage(444);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Radius = 8;

            framePic.Radius = (uint)Application.GetRealHeight(17);

            framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;

            bodyFrameLayout.AddChidren(framePic);

            var btnPic = new ImageView();

            btnPic.Radius = 8;

            btnPic.Radius = (uint)Application.GetRealHeight(17);

            framePic.AddChidren(btnPic);

            if (this.editorRoom.BackgroundImageType == 0)

            {


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

@@ -17,10 +17,6 @@
        /// </summary>

        private Common.Room lookRoom = null;

        /// <summary>

        /// 当前选择的分支，1：场景  2：功能

        /// </summary>

        private int nowSelectIndex = 1;

        /// <summary>

        /// 桌布控件

        /// </summary>

        private FrameLayout frameTable = null;

@@ -52,17 +48,14 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            //初始化分支控件

            this.InitSwitchControl();



            //初始化桌布控件

            this.frameTable = new FrameLayout();

            frameTable.Y = Application.GetRealHeight(187);

            frameTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);

            bodyFrameLayout.AddChidren(frameTable);



            //显示场景列表

            this.ShowSceneList();

            //初始化分支控件

            this.InitSwitchControl();

        }



        /// <summary>

@@ -70,93 +63,23 @@
        /// </summary>

        private void InitSwitchControl()

        {

            var btnTemp = new NormalViewControl(10, 10, false);

            btnTemp.TextID = R.MyInternationalizationString.uScence;



            //场景框(点击范围有点小，需要扩大它的点击范围)

            var frameScene = new FrameLayoutControl();

            frameScene.UseClickStatu = false;

            frameScene.Height = Application.GetRealHeight(90);

            frameScene.Width = btnTemp.GetRealWidthByText(16);

            frameScene.X = ControlCommonResourse.XXLeft;

            frameScene.Y = Application.GetRealHeight(40);

            bodyFrameLayout.AddChidren(frameScene);

            //场景

            var btnScene = new NormalViewControl(frameScene.Width, Application.GetRealHeight(63), false);

            btnScene.Text = btnTemp.Text;

            btnScene.TextSize = 16;

            btnScene.TextColor = UserCenterColor.Current.TextColor2;

            frameScene.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);

            //底线

            var btnSceneLine = new NormalViewControl(40, 10, true);

            btnSceneLine.Y = btnScene.Bottom + Application.GetRealHeight(14);

            btnSceneLine.X = btnScene.X + btnScene.Width / 2 - Application.GetRealWidth(40) / 2;

            btnSceneLine.Radius = (uint)Application.GetRealHeight(10) / 2;

            btnSceneLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

            frameScene.AddChidren(btnSceneLine, ChidrenBindMode.BindEventOnly);



            btnTemp.TextID = R.MyInternationalizationString.uFunction;

            //功能框(点击范围有点小，需要扩大它的点击范围)

            var frameFunc = new FrameLayoutControl();

            frameFunc.UseClickStatu = false;

            frameFunc.Height = Application.GetRealHeight(90);

            frameFunc.Width = btnTemp.GetRealWidthByText(16);

            frameFunc.X = frameScene.Right + Application.GetRealWidth(58);

            frameFunc.Y = Application.GetRealHeight(40);

            bodyFrameLayout.AddChidren(frameFunc);

            //功能

            var btnFunc = new NormalViewControl(frameFunc.Width, Application.GetRealHeight(63), false);

            btnFunc.Text = btnTemp.Text;

            btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;

            frameFunc.AddChidren(btnFunc, ChidrenBindMode.BindEventOnly);

            //底线

            var btnFuncLine = new NormalViewControl(40, 10, true);

            btnFuncLine.Y = btnFunc.Bottom + Application.GetRealHeight(14);

            btnFuncLine.X = btnFunc.X + btnFunc.Width / 2 - Application.GetRealWidth(40) / 2;

            btnFuncLine.Radius = (uint)Application.GetRealHeight(10) / 2;

            btnFuncLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

            frameFunc.AddChidren(btnFuncLine, ChidrenBindMode.BindEventOnly);

            btnFuncLine.Visible = false;



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

            var tabControl = new SceneFunctionSwitchControl();

            tabControl.Y = Application.GetRealHeight(40);

            bodyFrameLayout.AddChidren(tabControl);

            tabControl.SelectTabEvent += (tabIndex) =>

            {

                //场景分支选择

                if (this.nowSelectIndex == 1)

                if (tabIndex == 1)

                {

                    return;

                }

                this.nowSelectIndex = 1;



                btnScene.TextSize = 16;

                btnScene.TextColor = UserCenterColor.Current.TextColor2;

                btnFunc.TextSize = 14;

                btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnSceneLine.Visible = true;

                btnFuncLine.Visible = false;



                //显示场景列表

                this.ShowSceneList();

            };



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

            {

                //功能分支选择

                if (this.nowSelectIndex == 2)

                {

                    return;

                }

                this.nowSelectIndex = 2;



                btnScene.TextSize = 14;

                btnScene.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnFunc.TextSize = 16;

                btnFunc.TextColor = UserCenterColor.Current.TextColor2;

                btnFuncLine.Visible = true;

                btnSceneLine.Visible = false;



                else

                {

                //显示功能列表

                this.ShowFunctionList();

                }

            };

            tabControl.InitControl();

        }



        #endregion

@@ -195,14 +118,14 @@
                    btnPic.Width = Application.GetRealWidth(844);

                    btnPic.Height = Application.GetRealHeight(420);

                    btnPic.ImagePath = data.IconPath;

                    btnPic.Radius = 8;

                    btnPic.Radius = (uint)Application.GetRealHeight(17);

                    frameContr.AddChidren(btnPic);



                    var btnName = new NormalViewControl(251, 282, true);

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Y = Application.GetRealHeight(58);

                    btnName.BackgroundColor = 0xff333333;

                    btnName.Radius = 8;

                    btnName.RadiusEx = 17;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

@@ -240,7 +163,7 @@
                frameBack.BackgroundColor = UserCenterColor.Current.White;

                frameBack.Width = bodyFrameLayout.Width;

                frameBack.Height = Application.GetRealHeight(1650);

                frameBack.Radius = 20;

                frameBack.Radius = (uint)Application.GetRealHeight(58);

                frameTable.AddChidren(frameBack);



                var listView = new VerticalListControl(23);

@@ -392,9 +315,10 @@
        {

            HdlThreadLogic.Current.RunThread(() =>

            {

                var listCheck = new HashSet<string>();

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

                {

                    if (listView == null)

                    if (listView.Parent == null)

                    {

                        return;

                    }

@@ -403,14 +327,12 @@
                    var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>

                     {

                         string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);

                         if (listView.Parent == null)

                         if (listView.Parent == null || dicData.ContainsKey(mainkeys) == false || listCheck.Contains(mainkeys) == true)

                         {

                             return;

                         }

                         if (listView == null || dicData.ContainsKey(mainkeys) == false)

                         {

                             return;

                         }

                         listCheck.Add(mainkeys);



                         var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);

                         if (localDevice != null && localDevice.IsOnline != device.IsOnline)

                         {


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

@@ -365,15 +365,15 @@
                                listDeleteFile.Add(Common.Room.Lists[i].FileName);

                            }

                        }

                        //删除房间

                        foreach (string fileName in listDeleteFile)

                        {

                            Common.Room.CurrentRoom.Remove(fileName);

                        }

                        //如果当前选择的房间是删除对象的话

                        if (Common.Room.CurrentRoom.FloorId == keys)

                        {

                            Common.Room.CurrentRoom = Common.Room.Lists[0];

                        }

                        //删除房间

                        foreach (string fileName in listDeleteFile)

                        {

                            Common.Room.CurrentRoom.Remove(fileName);

                        }

                        Common.Config.Instance.Home.Save();

                        //保存顺序

@@ -414,8 +414,15 @@
            }

            //请输入楼层名称

            dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInputFloorName));

            if (Common.Config.Instance.Home.FloorDics.ContainsKey(keys) == true)

            {

                dialogForm.Text = Common.Config.Instance.Home.FloorDics[keys];

                floorName = Common.Config.Instance.Home.FloorDics[keys];

            }

            else

            {

            dialogForm.Text = floorName;



            }

            //按下确认按钮

            dialogForm.ComfirmClickEvent += ((textValue) =>

            {


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

@@ -86,6 +86,7 @@
            btnPassword.TextSize = 24;

            btnPassword.TextColor = 0xfffc744b;

            btnPassword.Text = i_password;

            btnPassword.IsBold = true;

            frameback.AddChidren(btnPassword);



            //初始化列表控件


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

@@ -97,6 +97,7 @@


            //初始化【信息通知】的行

            var row4 = new FrameRowControl(listView.rowSpace / 2);

            row4.UseClickStatu = false;

            listView.AddChidren(row4);

            row4.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uInformationPush), 500);

            //开关图标


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

@@ -69,7 +69,7 @@
            frameBack.Height = Application.GetRealHeight(1300);

            frameBack.Y = Application.GetRealHeight(444);

            frameBack.BackgroundColor = 0xa1ffffff;

            frameBack.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            frameBack.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            bodyFrameLayout.AddChidren(frameBack);



            //桌布控件

@@ -117,6 +117,7 @@
            btnSensor.TextSize = 16;

            btnSensor.TextAlignment = TextAlignment.Center;

            btnSensor.TextColor = UserCenterColor.Current.TextColor2;

            btnSensor.IsBold = true;

            frameSensor.AddChidren(btnSensor, ChidrenBindMode.BindEventOnly);

            //底线

            var btnSensorLine = new NormalViewControl(40, 10, true);

@@ -132,8 +133,10 @@
                //字体大小和颜色变更

                btnSensor.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnSensor.TextSize = 14;

                btnSensor.IsBold = false;

                btnLog.TextColor = UserCenterColor.Current.TextColor2;

                btnLog.TextSize = 16;

                btnLog.IsBold = true;



                btnLogLine.Visible = true;

                btnSensorLine.Visible = false;

@@ -150,8 +153,10 @@
                //字体大小和颜色变更

                btnSensor.TextColor = UserCenterColor.Current.TextColor2;

                btnSensor.TextSize = 16;

                btnSensor.IsBold = true;

                btnLog.TextColor = UserCenterColor.Current.TextGrayColor3;

                btnLog.TextSize = 14;

                btnLog.IsBold = false;



                btnLogLine.Visible = false;

                btnSensorLine.Visible = true;


 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs

@@ -207,14 +207,14 @@
                    btnPic.Width = Application.GetRealWidth(844);

                    btnPic.Height = Application.GetRealHeight(420);

                    btnPic.ImagePath = data.IconPath;

                    btnPic.Radius = 8;

                    btnPic.Radius = (uint)Application.GetRealHeight(17);

                    frameContr.AddChidren(btnPic, ChidrenBindMode.BindEventOnly);



                    var btnName = new NormalViewControl(251, 282, true);

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Y = Application.GetRealHeight(58);

                    btnName.BackgroundColor = 0xff333333;

                    btnName.Radius = 8;

                    btnName.RadiusEx = 17;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

@@ -253,6 +253,8 @@
                        }

                    };

                }

                //调整一下高度

                listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(185));

            });

        }



@@ -285,7 +287,7 @@
                    frameBack.BackgroundColor = UserCenterColor.Current.White;

                    frameBack.Width = bodyFrameLayout.Width;

                    frameBack.Height = Application.GetRealHeight(1650);

                    frameBack.Radius = 20;

                    frameBack.Radius = (uint)Application.GetRealHeight(58);

                    frameDeviceTable.AddChidren(frameBack);



                    var listView = new VerticalListControl(23);

@@ -382,6 +384,9 @@
                    }

                };

            }



            //列表自己有个23的Y轴坐标

            listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23), Application.GetRealHeight(300 - 23));

        }



        #endregion


 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs

@@ -190,14 +190,14 @@
                    btnPic.Width = Application.GetRealWidth(844);

                    btnPic.Height = Application.GetRealHeight(420);

                    btnPic.ImagePath = data.IconPath;

                    btnPic.Radius = 8;

                    btnPic.Radius = (uint)Application.GetRealHeight(17);

                    frameContr.AddChidren(btnPic);



                    var btnName = new NormalViewControl(251, 282, true);

                    btnName.X = ControlCommonResourse.XXLeft;

                    btnName.Y = Application.GetRealHeight(58);

                    btnName.BackgroundColor = 0xff333333;

                    btnName.Radius = 8;

                    btnName.RadiusEx = 17;

                    btnName.Text = data.Name;

                    btnName.TextSize = 15;

                    btnName.TextColor = UserCenterColor.Current.White;

@@ -270,7 +270,7 @@
                    frameBack.BackgroundColor = UserCenterColor.Current.White;

                    frameBack.Width = bodyFrameLayout.Width;

                    frameBack.Height = Application.GetRealHeight(1650);

                    frameBack.Radius = 20;

                    frameBack.Radius = (uint)Application.GetRealHeight(58);

                    frameDeviceTable.AddChidren(frameBack);



                    var listView = new VerticalListControl(23);


 ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs

@@ -25,7 +25,7 @@
        /// </summary>
        private void InitMiddleFrame()
        {

            uint roundHeigth = 6;

            uint roundHeigth = (uint)Application.GetRealHeight(17);



            //背景框

            var frameBack = new FrameLayout();

@@ -73,6 +73,7 @@
            frameBack.AddChidren(btnIcon);

            //用户名

            var btnUser = new NormalViewControl(frameBack.Width, Application.GetRealHeight(46), false);

            btnUser.IsBold = true;

            btnUser.Y = Application.GetRealHeight(147);

            btnUser.Text = UserCenterResourse.UserInfo.UserName;

            btnUser.TextAlignment = TextAlignment.Center;


 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs

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

    public class UserInformationForm : EditorCommonForm

    {

        /// <summary>

        /// 中部桌布控件

        /// </summary>

        private FrameLayout frameMiddleBack = null;



        #region ■ 初始化_____________________________



        /// <summary>

@@ -70,16 +75,23 @@
        /// </summary>

        private void InitMiddleBodyFrame()

        {

            var frameBack = new FrameLayout();

            frameBack.Y = Application.GetRealHeight(363);

            frameBack.Height = Application.GetRealHeight(1008);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            bodyFrameLayout.AddChidren(frameBack);

            if (this.frameMiddleBack == null)

            {

                frameMiddleBack = new FrameLayout();

                frameMiddleBack.Y = Application.GetRealHeight(363);

                frameMiddleBack.Height = Application.GetRealHeight(1008);

                frameMiddleBack.BackgroundColor = UserCenterColor.Current.White;

                bodyFrameLayout.AddChidren(frameMiddleBack);

            }

            else

            {

                frameMiddleBack.RemoveAll();

            }



            var listMidFrame = new FrameListControl(12);

            listMidFrame.Y = Application.GetRealHeight(11);

            listMidFrame.Height = Application.GetRealHeight(1008 - 11);

            frameBack.AddChidren(listMidFrame);

            frameMiddleBack.AddChidren(listMidFrame);



            var rowName = new FrameRowControl(listMidFrame.rowSpace / 2);

            //关闭点击状态

@@ -134,6 +146,7 @@
            rowEmail.AddRightArrow();

            //邮箱

            var btnEmail = rowEmail.AddMostRightView(UserCenterResourse.UserInfo.Email, 500);

            btnEmail.IsBold = true;

            if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Email) == true)

            {

                //未设置,请绑定

@@ -163,6 +176,7 @@
            rowPhone.AddRightArrow();

            //手机号

            var btnPhone = rowPhone.AddMostRightView(UserCenterResourse.UserInfo.Phone, 500);

            btnPhone.IsBold = true;

            if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Phone) == true)

            {

                //未设置,请绑定

@@ -196,7 +210,8 @@
            //添加向右图标

            rowOther.AddRightArrow();

            //微信、QQ

            rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChatAndQQ), 500);

            var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChatAndQQ), 500);

            btnQQ.IsBold = true;

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

            {

                var form = new OtherParty.OtherPartyAccountMenuForm();

@@ -212,7 +227,8 @@
            //添加向右图标

            rowSysPsw.AddRightArrow();

            //去修改

            rowSysPsw.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGotoEditor), 350);

            var btnPsw = rowSysPsw.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGotoEditor), 350);

            btnPsw.IsBold = true;

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

            {

                var form = new Password.EditorAccountPasswordForm();

@@ -226,7 +242,8 @@
            //添加向右图标

            rowSecond.AddRightArrow();

            //密码、手势、指纹

            rowSecond.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uPasswordGestureFingerPrint), 400);

            var btnSecand = rowSecond.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uPasswordGestureFingerPrint), 400);

            btnSecand.IsBold = true;

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

            {

                var form = new SecondAuthenticationForm();

@@ -404,8 +421,8 @@
        /// </summary>

        public override int FormActionAgainEvent()

        {

            //重新刷新界面

            this.ShowForm();

            //初始化中部的信息

            this.InitMiddleBodyFrame();



            return 1;

        }


 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs

@@ -95,7 +95,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;

            frameBack.Y = Application.GetRealHeight(380);

            frameBack.Gravity = Gravity.CenterHorizontal;

            frameBack.Radius = 12;

            frameBack.Radius = (uint)Application.GetRealHeight(29);

            frameBack.Width = bodyFrameLayout.Width - Application.GetRealWidth(29 * 2);

            frameBack.Height = bodyFrameLayout.Height - Application.GetRealHeight(380) + Application.GetRealHeight(100);

            bodyFrameLayout.AddChidren(frameBack);

@@ -147,6 +147,7 @@


            //用户昵称

            this.btnUserName = new NormalViewControl(605, 60, true);

            btnUserName.IsBold = true;

            btnUserName.X = btnUserIcon.Right + Application.GetRealWidth(5);

            btnUserName.Y = Application.GetRealHeight(43);

            if (UserCenterResourse.UserInfo != null)

@@ -190,7 +191,7 @@
                frameMainMenuBack.Gravity = Gravity.CenterHorizontal;

                frameMainMenuBack.Height = Application.GetRealHeight(371);

                frameMainMenuBack.Width = frameWhite.Width - Application.GetRealWidth(29 * 2);

                frameMainMenuBack.Radius = 10;

                frameMainMenuBack.Radius = (uint)Application.GetRealHeight(17);

                frameMainMenuBack.BackgroundColor = UserCenterColor.Current.White;

                frameWhite.AddChidren(frameMainMenuBack);

            }


 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

@@ -63,10 +63,10 @@
                        {
                            //登录成功
                            var homes = await House.GetHomeLists();

                            //启动ZigBee

                            ZigBee.Common.Application.Init();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            //启动ZigBee

                            ZigBee.Common.Application.Init();

                            Room.InitAllRoom();

@@ -94,11 +94,10 @@
                        {
                            //登录成功
                            var homes = await House.GetHomeLists();

                            //启动ZigBee

                            ZigBee.Common.Application.Init();

                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            //启动ZigBee

                            ZigBee.Common.Application.Init();

                            Room.InitAllRoom();


 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -426,7 +426,6 @@
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Floor.png"
            };
            topFrameLayout.AddChidren(floor);

            floorBtn = new Button
            {
@@ -438,7 +437,13 @@
                TextColor = ZigbeeColor.Current.GXCTextColor,
                Text = Config.Instance.Home.GetCurrentFloorName
            };

            if(Config.Instance.Home.FloorDics.Count>0)
            {
                topFrameLayout.AddChidren(floor);
            topFrameLayout.AddChidren(floorBtn);
            }


            var messageBtn = new Button()
            {
@@ -640,9 +645,9 @@
                };
                AddChidren(roomPageView);
                //与屏幕边框的边距
                roomPageView.RowPadding = Application.GetRealWidth(181);
                roomPageView.TCBJ = Application.GetRealWidth(181);
                //两个page之间的间距
                roomPageView.PagePadding = Application.GetRealWidth(69);
                roomPageView.JMBJ = Application.GetRealWidth(69);

                //当前房间
                //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;

 ZigbeeApp/Shared/Phone/UserView/UserPage.cs

 ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs

@@ -22,6 +22,10 @@
        /// 新发现的网关通知
        /// </summary>
        public static Action<ZigBee.Device.ZbGateway> NewGateWayAction;
        /// <summary>

        /// 上一次的住宅ID

        /// </summary>
        private static string oldHomeID = string.Empty;

        public static void Init()
        {
@@ -35,7 +39,6 @@
            {
                var gateWayList = new List<ZbGateway> { };
                var searchCount = 6;
                var oldHomeID = string.Empty;
                var broadBytes = new byte[44];// byteHomeId[0] ,//H
                broadBytes[0] = 0xfe;
                broadBytes[1] = 0x29;
@@ -326,6 +329,14 @@
            { IsBackground = true }.Start();
        }

        /// <summary>

        /// 重新搜索,注意：调用该方法,则促使全部网关的mqtt全部断开,然后重新搜索(可能会有1秒延迟)

        /// </summary>
        public static void ReSearch()

        {

            //为了那么多少万分之一的几率,这里设置成别的另一类的值

            oldHomeID = "**";

        }

        /// <summary>
        /// 接收处理UDP数据包

 ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs

 ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs

@@ -637,7 +637,7 @@
            /// 0：移除成功（该状态只适用用于跨网关绑定、绑定场景、失效设备（设备已经从网关的设备列表中删除）。同网关设备间的解除绑定需要节点设备的确认成功信息，不会直接反馈成功。）
            ///<para>1：失败，设备不在绑定列表中</para>
            ///<para>3：失败，在等待节点设备确认是否解除绑定成功（当网关还在等待某节点设备确认是否解除绑定成功的反馈信息时，客户端再次发送解除绑定该节点设备的指令，将反馈该状态。）</para>
            ///<para>4：未知，由节点设备反馈发送“Bind/RemoveBindResult”主题消息确定是否成功。</para>
            ///<para>2：未知，由节点设备反馈发送“Bind/RemoveBindResult”主题消息确定是否成功。</para>
            /// </summary>
            public int Result;


 ZigbeeApp/Shared/R.cs

old mode 100644
new mode 100755
@@ -586,6 +586,7 @@
        public const int Favorite = 10001;



        /// <summary>
        /// 手机号
        /// </summary>
@@ -651,7 +652,7 @@
        /// </summary>
        public const int Confrim = 10115;
        /// <summary>
        /// 该账号已注册，可直接登录
        /// 该用户已存在，可直接登录
        /// </summary>
        public const int AccountHasBeenRegistered = 10116;
        /// <summary>
@@ -659,11 +660,11 @@
        /// </summary>
        public const int PARAMETEROREMPTY = 10117;
        /// <summary>
        /// 两次密码不一致
        /// 确认密码不一致，请重新输入
        /// </summary>
        public const int TwoPasswordInconsistency = 10118;
        /// <summary>
        /// 验证码错误
        /// 验证码错误，请重新输入
        /// </summary>
        public const int VALIDCODEANDPHONENOEQUAL = 10119;
        /// <summary>
@@ -747,6 +748,10 @@
        /// </summary>
        public const int ThePhoneError = 10139;
        /// <summary>
        /// 请输入长度为6-13个字符的密码
        /// </summary>
        public const int ThePWDLengthError = 10140;
        /// <summary>
        /// 你已被强制下线！
        /// </summary>
        public const int YouHaveBeenSignOut = 10141;