Merge branch 'CJL-NEW'

wxr

2020-12-07 b12e4aff6b46327e0e92c3295a4a04434c2ea4ec

 HDL_ON/Common/ImageUtlis.cs

@@ -1,11 +1,6 @@
using System;
using Shared;
using HDL_ON;
using HDL_ON.UI.CSS;
using HDL_ON.DAL.Server;
using HDL_ON.UI;
using System.Threading;
using HDL_ON.Entity;

namespace HDL_ON
{
@@ -106,7 +101,7 @@
                    {
                        imageView.ImageBytes = null;
                        imageView.ImagePath = imageKey;
                        Utlis.WriteLine("imageKey 加载本地图片成功");
                        //Utlis.WriteLine("imageKey 加载本地图片成功");
                    }
                }
                else
@@ -118,7 +113,7 @@
                        if (imageView != null)
                        {
                            imageView.ImageBytes = FileUtils.ReadFile(imageKey);
                            Utlis.WriteLine("imageKey 加载自定义缓存图片成功");
                            //Utlis.WriteLine("imageKey 加载自定义缓存图片成功");
                        }
                    }
                    else
@@ -136,14 +131,14 @@
                                    if (imageView != null)
                                    {
                                        imageView.ImageBytes = imageBytes;
                                        Utlis.WriteLine("imageKey 加载云端下载图片成功");
                                        //Utlis.WriteLine("imageKey 加载云端下载图片成功");
                                    }
                                });
                            }
                            else
                            {
                                //2.4 下载是否，是否使用默认图片
                                Utlis.WriteLine("imageKey 加载云端图片失败");
                                //Utlis.WriteLine("imageKey 加载云端图片失败");
                            }
                        });
                    }
@@ -177,7 +172,7 @@
                    {
                        //imageView.ImageBytes = null;
                        frameLayout.BackgroundImagePath = imageKey;
                        Utlis.WriteLine("imageKey 加载本地图片成功");
                        //Utlis.WriteLine("imageKey 加载本地图片成功");
                    }
                }
                else
@@ -189,7 +184,7 @@
                        if (frameLayout != null)
                        {
                            frameLayout.BackgroundImagePath = imageKey;
                            Utlis.WriteLine("imageKey 加载自定义缓存图片成功");
                            //Utlis.WriteLine("imageKey 加载自定义缓存图片成功");
                        }
                    }
                    else
@@ -207,14 +202,14 @@
                                    if (frameLayout != null)
                                    {
                                        frameLayout.BackgroundImagePath = imageKey;
                                        Utlis.WriteLine("imageKey 加载云端下载图片成功");
                                        //Utlis.WriteLine("imageKey 加载云端下载图片成功");
                                    }
                                });
                            }
                            else
                            {
                                //2.4 下载是否，是否使用默认图片
                                Utlis.WriteLine("imageKey 加载云端图片失败");
                                //Utlis.WriteLine("imageKey 加载云端图片失败");
                            }
                        });
                    }