Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -76,29 +76,11 @@
                this.AddNormalRowControl("Socket链接", 400, ZigBee.Common.Application.FindGateWaySocket.busSocket.Connected == true ? "true" : "false", 400);

            }



            int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;

            int count = ZbGateway.GateWayList.Count;

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

            listView.AddChidren(row1);

            row1.UseClickStatu = false;

            row1.AddLeftCaption("本地网关", 400);

            if (count > 0)

            {

                row1.UseClickStatu = true;

                row1.AddRightArrow();

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

                {

                    var form = new HideOptionGatewayListForm();

                    form.AddForm(1);

                };

            }

            row1.AddMostRightView(count + "个", 400);

            row1.AddBottomLine();



            count = ZigBee.Device.ZbGateway.GateWayList.Count;

            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

            row1.UseClickStatu = false;

            row1.AddLeftCaption("缓存中的网关", 400);

            row1.AddLeftCaption("广播到的网关", 400);

            if (count > 0)

            {

                row1.UseClickStatu = true;

@@ -126,36 +108,6 @@
                form.AddForm();

            };



#if Android

            row1 = new FrameRowControl(listView.rowSpace / 2);

            row1.UseClickStatu = false;

            listView.AddChidren(row1);

            row1.AddLeftCaption("GBS定位", 500);

            row1.AddBottomLine();

            var btnGbsSwitch = row1.AddMostRightSwitchIcon();

            string checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);

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

            {

                btnGbsSwitch.IsSelected = true;

            }

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

            {

                this.ShowMassage(ShowMsgType.Confirm, "注意:开启或者关闭此功能会重启App", () =>

                {

                    btnGbsSwitch.IsSelected = !btnGbsSwitch.IsSelected;

                    if (btnGbsSwitch.IsSelected == true)

                    {

                        var file = System.IO.File.Create(checkFile);

                        file.Close();

                    }

                    else

                    {

                        System.IO.File.Delete(checkFile);

                    }

                    HDLUtils.RestartApp();

                });

            };

#endif

            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

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

@@ -167,6 +119,82 @@
                form.AddForm();

            };



            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

            row1.AddLeftCaption("收集发送和接收的数据", 600);

            row1.AddBottomLine();

            var btnSwitchLog = row1.AddMostRightSwitchIcon();

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

            {

                if (btnSwitchLog.IsSelected == false)

                {

                    this.ShowMassage(ShowMsgType.Confirm, "是否打开记录发送及接收数据的记录?", () =>

                    {

                        btnSwitchLog.IsSelected = true;

                        HdlFileLogic.Current.DeleteFile(DirNameResourse.SendAndReceveDataLog);

                        UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 1;

                    });

                }

                else

                {

                    UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;

                    btnSwitchLog.IsSelected = false;

                    var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SendAndReceveDataLog);

                    if (txtvalue != null)

                    {

                        var form = new HideOptionFileContentForm();

                        form.AddForm(string.Empty);



                        form.SetTextContent(txtvalue);

                    }

                }

            };



            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

            row1.AddLeftCaption("SocketReceive", 600);

            row1.AddBottomLine();

            var btnSocketReceiveLog = row1.AddMostRightSwitchIcon();

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

            {

                if (btnSocketReceiveLog.IsSelected == false)

                {

                    this.ShowMassage(ShowMsgType.Confirm, "是否打开记录SocketReceive的记录?", () =>

                    {

                        btnSocketReceiveLog.IsSelected = true;

                        HdlFileLogic.Current.DeleteFile(DirNameResourse.SocketReceiveDataLog);

                        UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 1;

                    });

                }

                else

                {

                    UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;

                    btnSocketReceiveLog.IsSelected = false;

                    var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SocketReceiveDataLog);

                    if (txtvalue != null)

                    {

                        var form = new HideOptionFileContentForm();

                        form.AddForm(string.Empty);



                        form.SetTextContent(txtvalue);

                    }

                }

            };



            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

            row1.AddLeftCaption("重新初始化Socket", 600);

            row1.AddRightArrow();

            row1.AddBottomLine();

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

            {

                this.ShowMassage(ShowMsgType.Confirm, "是否重新初始化Socket对象?", () =>

                {

                    ZigBee.Common.Application.FindGateWaySocket.Stop();

                    ZigBee.Common.Application.FindGateWaySocket.Start();

                    this.ShowMassage(ShowMsgType.Tip, "初始化完成");

                });

            };



            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

@@ -176,9 +204,9 @@
            {

                this.ShowMassage(ShowMsgType.Confirm, "是否上传Log文件", () =>

                {

                    HdlThreadLogic.Current.RunThread(async () =>

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        await HdlBackupLogic.Current.UpLoadLogBackup();

                        HdlBackupLogic.Current.UpLoadLogBackup();

                    });

                });

            };

@@ -283,8 +311,10 @@
        /// </summary>

        public override void CloseFormBefore()

        {

            Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest = null;

            UserCenterResourse.DicReceiveGatewayTest = null;

            UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;

            UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;

            UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;



            base.CloseFormBefore();

        }