fix cornerRadius

app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java

@@ -177,7 +177,7 @@ public class FastSearchActivity extends BaseActivity {
         });
 
         mGridView.setHasFixedSize(true);
-        mGridView.setLayoutManager(new V7GridLayoutManager(this.mContext, 5));
+        mGridView.setLayoutManager(new V7GridLayoutManager(this.mContext, 4));
 
         searchAdapter = new FastSearchAdapter();
         mGridView.setAdapter(searchAdapter);
@@ -206,7 +206,7 @@ public class FastSearchActivity extends BaseActivity {
         });
 
 
-        mGridViewFilter.setLayoutManager(new V7GridLayoutManager(this.mContext, 5));
+        mGridViewFilter.setLayoutManager(new V7GridLayoutManager(this.mContext, 4));
         searchAdapterFilter = new FastSearchAdapter();
         mGridViewFilter.setAdapter(searchAdapterFilter);
         searchAdapterFilter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {

app/src/main/java/com/github/tvbox/osc/ui/adapter/FastSearchAdapter.java

@@ -38,7 +38,7 @@ public class FastSearchAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHol
                     .load(item.pic)
                     .transform(new RoundTransformation(MD5.string2MD5(item.pic))
                             .centerCorp(true)
-                            .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 336))
+                            .override(AutoSizeUtils.mm2px(mContext, ImgUtil.defaultWidth), AutoSizeUtils.mm2px(mContext, ImgUtil.defaultHeight))
                             .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
                     .placeholder(R.drawable.img_loading_placeholder)
                     .noFade()

app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java

@@ -120,8 +120,8 @@ public class GridAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHolder> {
         helper.setText(R.id.tvActor, item.actor);
         ImageView ivThumb = helper.getView(R.id.ivThumb);
 
-        int newWidth = 240;
-        int newHeight = 336;
+        int newWidth = ImgUtil.defaultWidth;
+        int newHeight = ImgUtil.defaultHeight;
         if(style!=null){
             newWidth = defaultWidth;
             newHeight = (int)(newWidth / style.ratio);
@@ -156,9 +156,9 @@ public class GridAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHolder> {
      * 根据传入的 style 动态设置 ImageView 的高度：高度 = 宽度 / ratio
      */
     private void applyStyleToImage(final ImageView ivThumb) {
-        ViewGroup container = (ViewGroup) ivThumb.getParent();
-        int width = defaultWidth;
         if(style!=null){
+            ViewGroup container = (ViewGroup) ivThumb.getParent();
+            int width = defaultWidth;
             int height = (int) (width / style.ratio);
             ViewGroup.LayoutParams containerParams = container.getLayoutParams();
             containerParams.height = AutoSizeUtils.mm2px(mContext, height); // 高度

app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java

@@ -66,7 +66,7 @@ public class HistoryAdapter extends BaseQuickAdapter<VodInfo, BaseViewHolder> {
                     .load(DefaultConfig.checkReplaceProxy(item.pic))
                     .transform(new RoundTransformation(MD5.string2MD5(item.pic))
                             .centerCorp(true)
-                            .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 336))
+                            .override(AutoSizeUtils.mm2px(mContext, ImgUtil.defaultWidth), AutoSizeUtils.mm2px(mContext, ImgUtil.defaultHeight))
                             .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
                     .placeholder(R.drawable.img_loading_placeholder)
                     .noFade()

app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java

@@ -74,7 +74,7 @@ public class HomeHotVodAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHol
                         .load(DefaultConfig.checkReplaceProxy(item.pic))
                         .transform(new RoundTransformation(MD5.string2MD5(item.pic))
                                 .centerCorp(true)
-                                .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 336))
+                                .override(AutoSizeUtils.mm2px(mContext, ImgUtil.defaultWidth), AutoSizeUtils.mm2px(mContext, ImgUtil.defaultHeight))
                                 .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
                         .placeholder(R.drawable.img_loading_placeholder)
                         .noFade()

app/src/main/java/com/github/tvbox/osc/ui/adapter/SearchAdapter.java

@@ -42,7 +42,7 @@ public class SearchAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHolder>
                         .load(item.pic)
                         .transform(new RoundTransformation(MD5.string2MD5(item.pic))
                                 .centerCorp(true)
-                                .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 336))
+                                .override(AutoSizeUtils.mm2px(mContext, ImgUtil.defaultWidth), AutoSizeUtils.mm2px(mContext, ImgUtil.defaultHeight))
                                 .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
                         .placeholder(R.drawable.img_loading_placeholder)
                         .noFade()

app/src/main/java/com/github/tvbox/osc/util/EpgNameFuzzyMatch.java

@@ -26,7 +26,7 @@ public class EpgNameFuzzyMatch {
     public static void init() {
         if(epgNameDoc != null)
             return;
-
+        Gson gson = new Gson();
         try {
             AssetManager assetManager = App.getInstance().getAssets(); //获得assets资源管理器（assets中的文件无法直接访问，可以使用AssetManager访问）
             InputStreamReader inputStreamReader = new InputStreamReader(assetManager.open("Roinlong_Epg.json"),"UTF-8"); //使用IO流读取json文件内容
@@ -39,7 +39,7 @@ public class EpgNameFuzzyMatch {
             br.close();
             inputStreamReader.close();
             if(!builder.toString().isEmpty()){
-                JsonObject  jsonObj =  new Gson().fromJson(builder.toString(), (Type)JsonObject.class);// 从builder中读取了json中的数据。
+                JsonObject  jsonObj =  gson.fromJson(builder.toString(), (Type)JsonObject.class);// 从builder中读取了json中的数据。
                 //  JSONObject testJson = new JSONObject(builder.toString()); // 从builder中读取了json中的数据。
                 epgNameDoc = jsonObj;
                 hasAddData(epgNameDoc);
@@ -59,7 +59,7 @@ public class EpgNameFuzzyMatch {
                 JSONObject returnedData = new JSONObject();
                 try {
                     String pageStr = response.body();
-                    JsonObject infoJson = new Gson().fromJson(pageStr, (Type)JsonObject.class);
+                    JsonObject infoJson = gson.fromJson(pageStr, (Type)JsonObject.class);
                     epgNameDoc = infoJson;
                     hasAddData(epgNameDoc);
                     return;

app/src/main/java/com/github/tvbox/osc/util/ImgUtil.java

@@ -27,6 +27,8 @@ public class ImgUtil {
     public static boolean isBase64Image(String picUrl) {
         return picUrl.startsWith("data:image");
     }
+    public static int defaultWidth = 244;
+    public static int defaultHeight = 320;
 
     public static Bitmap decodeBase64ToBitmap(String base64Str) {
         // 去掉 Base64 数据的头部前缀，例如 "data:image/png;base64,"
@@ -36,13 +38,13 @@ public class ImgUtil {
     }
 
     public static Drawable createTextDrawable(String text) {
-        if(text.isEmpty())text="J";
+        if(text.isEmpty())text="TVBox";
         text=text.substring(0, 1);
         // 如果缓存中已存在，直接返回
         if (drawableCache.containsKey(text)) {
             return drawableCache.get(text);
         }
-        int width = 150, height = 200; // 设定图片大小
+        int width = 180, height = 240; // 设定图片大小
         int randomColor = getRandomColor();
         float cornerRadius = AutoSizeUtils.mm2px(App.getInstance(), 5); // 圆角半径