合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

old mode 100644
new mode 100755
@@ -91,6 +91,11 @@
                //数据异常

                return;

            }

            if (this.Parent == null)

            {

                return;

            }



            HdlThreadLogic.Current.RunMain(() =>

            {

                //清空

@@ -268,7 +273,8 @@
            var btnTime = rowControl.frameTable.AddMostRightView("", 200, 50);

            btnTime.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnTime.Y = btnMsg.Bottom + Application.GetRealHeight(12);

            btnTime.Text = Convert.ToDateTime(recordInfo.CreatedOnUtc).ToString("HH：mm");

            var convertTime = UserCenterLogic.ConvertUtcTimeToLocalTime(recordInfo.CreatedOnUtc);

            btnTime.Text = convertTime.ToString("HH：mm");

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

            //底线

            if (addLine == true)