billyyoyo 6 lat temu
rodzic
commit
c7532234fd

+ 28 - 17
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -1727,19 +1727,22 @@ public class ViewUtil {
             AdHelper.stat(advertising.getAd_id(), 1);
             if (advertising.isImage()) {
                 RequestBuilder<Drawable> builder = Glide.with(activity).load(advertising.getAd_img());
-//                if (TextUtils.isEmpty(advertising.getName())) {//没有标题时 去掉下面的边距 并给图片左下理右下添加图角
-                    builder.apply(new RequestOptions().transform(new RoundedCornersTransformation(activity.getResources().getDimensionPixelSize(R.dimen.content_padding_36), 0, RoundedCornersTransformation.CornerType.BOTTOM)));
-                    dialog_center_ll.setPadding(0, activity.getResources().getDimensionPixelSize(R.dimen.content_padding_54), 0, 0);
-                    ViewGroup parent = (ViewGroup) dialog_center_ll.getParent();
-                    ((FrameLayout.LayoutParams) parent.getLayoutParams()).setMargins(0, 0, 0, 0);
-                    Window win = dialog.getWindow();
-                    win.getDecorView().setPadding(0, 0, 0, 0);
-                    WindowManager.LayoutParams lp = win.getAttributes();
-                    lp.width = WindowManager.LayoutParams.MATCH_PARENT;
-                    lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-                    win.setAttributes(lp);
-//                }
+                builder.apply(new RequestOptions().transform(new RoundedCornersTransformation(activity.getResources().getDimensionPixelSize(R.dimen.content_padding_36), 0, RoundedCornersTransformation.CornerType.BOTTOM)));
                 builder.into(ad_iv);
+                if(advertising.getAd_img().toLowerCase().endsWith("gif")){
+                    ViewUtil.setGif(ad_iv, advertising.getAd_img());
+                } else {
+                    ViewUtil.setImage(ad_iv, advertising.getAd_img());
+                }
+                dialog_center_ll.setPadding(0, activity.getResources().getDimensionPixelSize(R.dimen.content_padding_54), 0, 0);
+                ViewGroup parent = (ViewGroup) dialog_center_ll.getParent();
+                ((FrameLayout.LayoutParams) parent.getLayoutParams()).setMargins(0, 0, 0, 0);
+                Window win = dialog.getWindow();
+                win.getDecorView().setPadding(0, 0, 0, 0);
+                WindowManager.LayoutParams lp = win.getAttributes();
+                lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+                lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                win.setAttributes(lp);
                 ad_video_view.setVisibility(View.GONE);
             } else {
                 Uri uri = Uri.parse(advertising.getAd_img());
@@ -1796,11 +1799,11 @@ public class ViewUtil {
             });
             setVisibility(ad_flag, advertising.getUser_type() == 2);
 //            if (TextUtils.isEmpty(advertising.getName())) {
-                ViewUtil.setVisibility(ad_msg, false);
-                //3.4.7添加 -- 不显示标题栏,不显示背景 start
-                ViewUtil.setVisibility(dialog_title, false);
-                dialog_center_ll.setBackgroundColor(Color.TRANSPARENT);
-                //3.4.7添加 -- 不显示标题栏,不显示背景 end
+            ViewUtil.setVisibility(ad_msg, false);
+            //3.4.7添加 -- 不显示标题栏,不显示背景 start
+            ViewUtil.setVisibility(dialog_title, false);
+            dialog_center_ll.setBackgroundColor(Color.TRANSPARENT);
+            //3.4.7添加 -- 不显示标题栏,不显示背景 end
 //            } else {
 //                ad_msg.setText(advertising.getName());
 //            }
@@ -2021,6 +2024,14 @@ public class ViewUtil {
                 .into(imageView);
     }
 
+    public static void setGif(ImageView imageView, String url) {
+        GlideApp.with(imageView)
+                .asGif()
+                .load(url)
+                .format(DecodeFormat.PREFER_ARGB_8888)
+                .into(imageView);
+    }
+
     public static void setImage(ImageView imageView, Object object) {
         if (imageView != null) {
             if (object instanceof String) {

+ 4 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActWebShareImage.java

@@ -108,7 +108,7 @@ public class ActWebShareImage extends BaseUMActivity {
     }
 
     private void init() {
-        gridLayoutManager = new GridLayoutManager(this, 5);
+        gridLayoutManager = new GridLayoutManager(this, 4);
         ask_share_list.setLayoutManager(gridLayoutManager);
         final List<String> list = ListUtil.emptyList();
         final List<Integer> imgList = ListUtil.emptyList();
@@ -116,12 +116,15 @@ public class ActWebShareImage extends BaseUMActivity {
         list.add(ShareLinkConfig.WX);
         list.add(ShareLinkConfig.QQ);
         list.add(ShareLinkConfig.WEIXIN_CIRCLE);
+        list.add(ShareLinkConfig.QZONE);
         imgList.add(R.mipmap.share_wx);
         imgList.add(R.mipmap.share_qq);
         imgList.add(R.mipmap.share_weixin_circle);
+        imgList.add(R.mipmap.share_qzone);
         nameList.add("微信");
         nameList.add("QQ好友");
         nameList.add("朋友圈");
+        nameList.add("QQ空间");
 //        list.add(0, ShareLinkConfig.FACE_TO_FACE);
 //        list.add(0, ShareLinkConfig.FACE_TO_FACE);
 //        list.add(ShareLinkConfig.COPY_SHARE_LINK);