请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -187,24 +187,17 @@
            listView.AddChidren(rowLayout);



            //备份名字

            var txtText = rowLayout.frameTable.AddLeftCaption(fileInfo.BackupName, 700, 60);

            txtText.TextSize = 15;

            txtText.Y = Application.GetRealHeight(12) + rowLayout.chidrenYaxis;

            rowLayout.frameTable.AddChidren(txtText, ChidrenBindMode.BindEventOnly);

            var txtText = rowLayout.frameTable.AddTopView(fileInfo.BackupName, 700);

            if (isAuto == true)

            {

                txtText.TextID = R.MyInternationalizationString.uAutoBackup;

            }



            //时间 2019-11-11T11:31:01

            var btnTime = rowLayout.frameTable.AddLeftCaption("", 600, 50, true);

            btnTime.Y = Application.GetRealHeight(72) + rowLayout.chidrenYaxis;

            btnTime.TextSize = 12;

            btnTime.TextColor = UserCenterColor.Current.TextGrayColor1;

            rowLayout.frameTable.AddChidren(btnTime, ChidrenBindMode.BindEventOnly);

            var btnTime = rowLayout.frameTable.AddBottomView("", 600);

            if (fileInfo.CreatedOnUtc.Length >= 19)

            {

                btnTime.Text = fileInfo.CreatedOnUtc.Replace("-", ".").Replace("T", " ");

                btnTime.Text = UserCenterLogic.ConvertUtcTimeToLocalTime(fileInfo.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm:ss");

            }

            //底线

            if (addLine == true)

@@ -326,8 +319,8 @@


            //编辑备份

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));

            //请输入备注名称

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

            //请输入备份名称

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

            dialogForm.Text = fileInfo.BackupName;



            //按下确认按钮