暂存方案1

2023-04-18 11:03:07 +08:00
parent 32e3584fef
commit f913248fa1
10 changed files with 149 additions and 20 deletions
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -7,6 +7,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.Dialog;
 import android.app.NotificationChannel;
 import android.app.PendingIntent;
@@ -17,11 +18,14 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
+import android.transition.ChangeBounds;
 import android.util.Log;
 import android.view.Display;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -29,6 +33,7 @@ import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+import androidx.core.app.ActivityCompat;
 import androidx.viewpager.widget.ViewPager;

 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -70,6 +75,7 @@ import com.yunbao.common.event.MessageIMEvent;
 import com.yunbao.common.event.NoviceInstructorEvent;
 import com.yunbao.common.event.RongIMConnectionStatusEvent;
 import com.yunbao.common.event.UpdateTablePointMe;
+import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
@@ -86,6 +92,7 @@ import com.yunbao.common.utils.LocationUtil;
 import com.yunbao.common.utils.ProcessResultUtil;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.ToastUtils;
 import com.yunbao.common.utils.VersionUtil;
@@ -193,9 +200,18 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
        return R.layout.activity_main;
    }

+    @Override
+    protected void create() {
+        super.create();
+        getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
+        ChangeBounds bounds = new ChangeBounds();
+        bounds.setDuration(1000);
+        getWindow().setSharedElementEnterTransition(bounds);
+    }

    @Override
    protected void main() {
+        ActivityCompat.postponeEnterTransition(this);
        ConversationIMListManager.get(this);
        //在请求一下这个接口给我后台版本号
        CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
@@ -312,9 +328,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene

            @Override
            public void onPageSelected(int position) {
-                if(mTabButtonGroup.getCurPosition()!=position){
-                    System.err.println("重连IM:"+IMLoginManager.isLogin(mContext));
-                    if(!IMLoginManager.isLogin(mContext)){
+                if (mTabButtonGroup.getCurPosition() != position) {
+                    System.err.println("重连IM:" + IMLoginManager.isLogin(mContext));
+                    if (!IMLoginManager.isLogin(mContext)) {
                        //IMLoginManager.get(mContext).setupLoginUser();
                        RouteUtil.forwardLoginInvalid("登錄失效");
                        return;
@@ -828,7 +844,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene

                        Log.e("--->", list.get(j).getGiftname() + list.get(j).getSwf());

-                        GiftCacheUtil.getFile(MainActivity.this,Constants.GIF_GIFT_PREFIX + list.get(j).getId(), list.get(j).getSwf(), "0", new CommonCallback<File>() {
+                        GiftCacheUtil.getFile(MainActivity.this, Constants.GIF_GIFT_PREFIX + list.get(j).getId(), list.get(j).getSwf(), "0", new CommonCallback<File>() {
                            @Override
                            public void callback(File bean) {

@@ -869,7 +885,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene

                        Log.e("tx", id);

-                        GiftCacheUtil.getFile(MainActivity.this,Constants.GIF_CAR_PREFIX + id, url1, "0", new CommonCallback<File>() {
+                        GiftCacheUtil.getFile(MainActivity.this, Constants.GIF_CAR_PREFIX + id, url1, "0", new CommonCallback<File>() {
                            @Override
                            public void callback(File bean) {
 //                              Log.e("111",bean.getPath()+"是");
@@ -990,6 +1006,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene

    private void loadPageData(int position, boolean needlLoadData) {
        if (mViewHolders == null) {
+            ToastUtil.showDebug("Holders为空");
            return;
        }

--- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
@@ -1,12 +1,16 @@
 package com.yunbao.main.views;

 import android.animation.ObjectAnimator;
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Outline;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -14,6 +18,8 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.widget.ImageView;

+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
 import androidx.core.content.FileProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -21,6 +27,13 @@ import androidx.recyclerview.widget.RecyclerView;

 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.DrawableImageViewTarget;
+import com.bumptech.glide.request.target.Target;
 import com.ms.banner.Banner;
 import com.ms.banner.listener.OnBannerClickListener;
 import com.yunbao.common.CommonAppConfig;
@@ -35,12 +48,14 @@ import com.yunbao.common.bean.LiveClassBean;
 import com.yunbao.common.bean.WeekListBean;
 import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.custom.ItemDecoration;
+import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ShareUtil;
+import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.CustomViewHolder;
 import com.yunbao.live.event.LiveRoomChangeEvent;
@@ -315,7 +330,47 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
            }
        });
        mBanner.setClipToOutline(true);
+        String adUrl = ((Activity) mContext).getIntent().getStringExtra("ad_url");
+        ImageView ad = headView.findViewById(R.id.ad_img);
+        ToastUtil.showDebug(adUrl);
+        if (StringUtil.isEmpty(adUrl)) {
+            ad.setVisibility(View.GONE);
+        } else {
+            //ImgLoader.display(mContext, adUrl, ad);
+            Glide.with(mContext)
+                    .load(adUrl)
+                    .listener(new RequestListener<Drawable>() {
+                        @Override
+                        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
+                            ToastUtil.showDebug("加载失败");
+                            ActivityCompat.startPostponedEnterTransition((Activity) mContext);
+                            return false;
+                        }

+                        @Override
+                        public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
+                            ToastUtil.showDebug("加载完成");
+                            ActivityCompat.startPostponedEnterTransition((Activity) mContext);
+                            return false;
+                        }
+                    })
+                  /*  .addListener(new RequestListener<Drawable>() {
+                        @Override
+                        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
+                            ActivityCompat.startPostponedEnterTransition((Activity) mContext);
+                            return false;
+                        }
+
+                        @Override
+                        public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
+                            ActivityCompat.startPostponedEnterTransition((Activity) mContext);
+                            return false;
+                        }
+                    })*/
+                    .error(R.mipmap.ic_launcher)
+                    .into(new DrawableImageViewTarget(ad));
+
+        }
    }


@@ -361,6 +416,9 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
            return;
        }
        mBannerShowed = true;
+        BannerBean tmp = mBannerList.get(0);
+        mBannerList.set(0, mBannerList.get(2));
+        mBannerList.set(2, tmp);
        mBanner.setAutoPlay(true)
                .setPages(mBannerList, new CustomViewHolder())
                .setDelayTime(3000)
--- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
@@ -1,19 +1,13 @@
 package com.yunbao.main.views;

 import android.content.Context;
-import android.content.Intent;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;

 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.WordUtil;
-import com.yunbao.live.dialog.LiveAnchorSayPopDialog;
-import com.yunbao.live.dialog.LiveRobotSettingDialogFragment;
 import com.yunbao.main.R;
-import com.yunbao.main.activity.MainActivity;
-import com.yunbao.main.activity.TestActivity;

 /**
 * Created by cxf on 2018/9/22.
--- a/main/src/main/res/layout/activity_main.xml
+++ b/main/src/main/res/layout/activity_main.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/mainSlideMenu"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
@@ -10,6 +11,23 @@
    app:slideMode="left"
    app:slidePadding="60dp">

-    <include layout="@layout/view_homemain" />
+    <include
+        android:id="@+id/include2"
+        layout="@layout/view_homemain"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />

-</LinearLayout>
+    <ImageView
+        android:id="@+id/imageView9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@tools:sample/avatars" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/main/src/main/res/layout/item_main_home_live_head.xml
+++ b/main/src/main/res/layout/item_main_home_live_head.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/top_group"
    android:layout_width="match_parent"
    android:layout_height="135dp"
@@ -9,21 +10,35 @@
    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginLeft="3dp">
+        >
+

        <com.ms.banner.Banner
            android:id="@+id/banner"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginLeft="3dp"
+
            android:layout_marginBottom="5dp"
            app:delay_time="3000"
            app:indicator_drawable_selected="@drawable/bg_home_indicator_selected"
            app:indicator_drawable_unselected="@drawable/bg_home_indicator_unselected"
            app:indicator_height="8dp"
            app:indicator_margin="6dp"
-            app:indicator_width="8dp" />
+            app:indicator_width="8dp">

+        </com.ms.banner.Banner>
+
+        <ImageView
+            android:id="@+id/ad_img"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="110dp"
+            android:layout_marginBottom="5dp"
+            android:layout_marginTop="5dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/bg_tmp_s"
+            android:transitionName="ad_img_0" />
    </RelativeLayout>