合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs

@@ -39,6 +39,7 @@
        Action action;
        string modifyDeviceName = "";
        bool IsModifyName = true;
        public Action<string> devicNameAction;
        #endregion

        /// <summary>

@@ -62,7 +63,6 @@

        public void MidFrameLayoutContent()
        {

            var MidTopFrameLayout = new FrameLayout()
            {
                X = Application.GetRealWidth(449),
@@ -166,47 +166,49 @@
                    btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
                    btnNextFrameLayout.X = Application.GetRealWidth(233);
                    btnNext.Text = doorLock.DeviceName;
                    var btnDeviceNameEditText = new Button()
                    var btnDeviceNameEditText = new EditText()
                    {
                        Width = Application.GetRealWidth(789 - 58),
                        Height = Application.GetRealHeight(58),
                        X = Application.GetRealWidth(46),
                        Width = Application.GetRealWidth(731),
                        Height = Application.GetRealHeight(58),
                        TextColor = ZigbeeColor.Current.XMGray3,
                        PlaceholderTextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                        TextAlignment = TextAlignment.CenterLeft,
                        TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                        Text = doorLock.DeviceName
                        Text = string.IsNullOrEmpty(doorLock.DeviceName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : doorLock.DeviceName,
                    };
                    btnNextFrameLayout.AddChidren(btnDeviceNameEditText);
                    //btnDeviceNameEditText.TextChangeEventHandler += (sender, e) =>
                    //{
                    //    modifyDeviceName = btnDeviceNameEditText.Text;
                    //};
                    //Action<Shared.View> actionEdit = async (obj) =>
                    // {
                    //     try
                    //     {
                    //         Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                    //         var doorLockDeviceList = new List<CommonDevice> { };
                    //         doorLockDeviceList.Add(doorLock);
                    //         var result = await Common.LocalDevice.Current.ReMacName(doorLockDeviceList, btnDeviceNameEditText.Text);
                    //         if (result)
                    //         {
                    //             IsModifyName = false;
                    //         }
                    //         else
                    //         {
                    //             IsModifyName = true;
                    //         }
                    //     }
                    //     catch { }
                    //     finally
                    //     {
                    //         Application.RunOnMainThread(() =>
                    //         {
                    //             CommonPage.Loading.Hide();
                    //         });
                    //     }
                    // };
                    // btnDeviceNameEditText.EditorEnterAction += actionEdit;

                    btnDeviceNameEditText.TextChangeEventHandler += (sender, e) =>
                    {
                        modifyDeviceName = btnDeviceNameEditText.Text;
                    };
                    Action<Shared.View> actionEdit = async (obj) =>
                     {
                         try
                         {
                             Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                             var doorLockDeviceList = new List<CommonDevice> { };
                             doorLockDeviceList.Add(doorLock);
                             var result = await Common.LocalDevice.Current.ReMacName(doorLockDeviceList, btnDeviceNameEditText.Text);
                             if (result)
                             {
                                 IsModifyName = false;
                             }
                             else
                             {
                                 IsModifyName = true;
                             }
                         }
                         catch { }
                         finally
                         {
                             Application.RunOnMainThread(() =>
                             {
                                 CommonPage.Loading.Hide();
                             });
                         }
                     };
                    btnDeviceNameEditText.EditorEnterAction += actionEdit;

                    btnLine.Visible = true;
                    btnLine.Y = Application.GetRealHeight(303);
@@ -380,43 +382,53 @@
            }

            //保存
            //var btnFinifh = new Button()
            //{
            //    Width = Application.GetRealWidth(907),
            //    Height = Application.GetRealHeight(127),
            //    Y = Application.GetRealHeight(1472),
            //    Gravity = Gravity.CenterHorizontal,
            //    Radius = (uint)Application.GetRealHeight(127) / 2,
            //    TextID = R.MyInternationalizationString.Save,
            //    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
            //    TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
            //    TextSize = 16,
            //};
            //this.midFrameLayout.AddChidren(btnFinifh);
            //btnFinish.MouseUpEventHandler += (sender, e) =>
            //{
            //    System.Threading.Tasks.Task.Run(async () =>
            //    {
            //        Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
            //        try
            //        {
            //            if (IsModifyName)
            //            {
            //                var doorLockDeviceList = new List<CommonDevice> { };
            //                doorLockDeviceList.Add(doorLock);
            //                await Common.LocalDevice.Current.ReMacName(doorLockDeviceList, modifyDeviceName);
            //            }
            //        }
            //        catch { }
            //        finally
            //        {
            //            Application.RunOnMainThread(() =>
            //            {
            //                CommonPage.Loading.Hide();
            //            });
            //        }
            //    });
            //};
            var btnFinifh = new Button()
            {
                Width = Application.GetRealWidth(907),
                Height = Application.GetRealHeight(127),
                Y = Application.GetRealHeight(1472),
                Gravity = Gravity.CenterHorizontal,
                Radius = (uint)Application.GetRealHeight(127) / 2,
                TextID = R.MyInternationalizationString.Save,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                TextSize = 16,
            };
            this.midFrameLayout.AddChidren(btnFinifh);
            btnFinifh.MouseUpEventHandler += (sender, e) =>
            {
                System.Threading.Tasks.Task.Run(async () =>
                {
                    Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                    try
                    {
                        if (IsModifyName)
                        {
                            var doorLockDeviceList = new List<CommonDevice> { };
                            doorLockDeviceList.Add(doorLock);
                            var result = await Common.LocalDevice.Current.ReMacName(doorLockDeviceList, modifyDeviceName);
                            if (result)
                            {
                                if (devicNameAction != null)
                                {
                                    devicNameAction(modifyDeviceName);
                                }
                            }
                        }
                    }
                    catch (Exception ex)
                    {
                        var mess = ex.Message;
                    }
                    finally
                    {
                        Application.RunOnMainThread(() =>
                        {
                            CommonPage.Loading.Hide();
                        });
                    }
                });
            };
        }

        #region ◆ 接口实现__________________________