yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18142669586
2022-09-27 14:53:40 +08:00
parent 9e527d6a5d 44c6e5e4cd
commit cadbf53086
261 changed files with 679 additions and 10016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/build.gradle
View File

@@ -65,12 +65,14 @@ repositories {
dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation fileTree(include: ['*.jar'], dir: 'libs')
compileOnly files('../libs/beautysdk-202202241203.aar')
compileOnly files('../libs/library-release.aar')
//直播
api project(':live')
//短视频
api project(':video')
api project(':common')
api project(':FaceUnity')
//api project(':FaceUnity')//新娱美颜
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.4.0'
annotationProcessor rootProject.ext.dependencies["arouter-compiler"]

6
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -141,7 +141,7 @@ import kotlin.Unit;
@Route(path = RouteUtil.PATH_MAIN)
public class MainActivity extends AbsActivity implements MainAppBarLayoutListener {
public static RelativeLayout rt_main_tab;
public RelativeLayout rt_main_tab;
private ViewGroup mRootView;
private TabButtonGroup mTabButtonGroup;
private ViewPager mViewPager;
@@ -320,7 +320,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
RongIMClient.init(this, RongcloudIMManager.RONG_IM_KEY, true);
// RTCLib 初始化
RCRTCConfig.Builder config = RCRTCConfig.Builder.create();
config.enableEncoderTexture(false);
//config.enableEncoderTexture(false);//新娱美颜 需要关闭这个
RCRTCEngine.getInstance().init(MainActivity.this, config.build());
//推送跳直播间
if (getIntent().getStringExtra("liveid") != null) {
@@ -1120,7 +1120,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
mMainHomeCommunityViewHolder.mValueCallback2 = null;
}
public static void isClose(String isClose) {
public void isClose(String isClose) {
if ("0".equals(isClose)) {
isTabClose = true;
rt_main_tab.setVisibility(View.INVISIBLE);

3
main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java
View File

@@ -46,6 +46,7 @@ import com.yunbao.common.utils.DeviceUtils;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.activity.LiveAudienceActivity;
@@ -145,7 +146,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
guidSvga.setImageDrawable(drawable);
guidSvga.startAnimation();
SVGAViewUtils.playEndClear(guidSvga);
}
@Override

3
main/src/main/java/com/yunbao/main/activity/RewardActivity.java
View File

@@ -46,6 +46,7 @@ import com.yunbao.common.utils.GifCacheUtil;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
@@ -223,7 +224,7 @@ public class RewardActivity extends AbsActivity {
SVGADrawable drawable = new SVGADrawable(videoItem);
svga.setImageDrawable(drawable);
svga.setLoops(1);
svga.startAnimation();
SVGAViewUtils.playEndClear(svga);
}
@Override

21
main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
View File

@@ -33,11 +33,14 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.GifCacheUtil;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
@@ -211,8 +214,7 @@ public class ZhuangBanActivity extends AbsActivity {
SVGADrawable drawable = new SVGADrawable(videoItem);
svga.setImageDrawable(drawable);
svga.setLoops(1);
svga.startAnimation();
SVGAViewUtils.playEndClear(svga);
}
@Override
@@ -301,6 +303,21 @@ public class ZhuangBanActivity extends AbsActivity {
mContext.startActivity(intent);
}
/**
* 设置超皇字体颜色
*
* @param startColor 渐变色
* @param endColor 渐变色
* @param contentColor 内容颜色
*/
@JavascriptInterface
public void androidSetColor(String startColor, String endColor, String contentColor) {
IMLoginModel model = IMLoginManager.get(mContext).getUserInfo();
model.setStartColor("#"+startColor)
.setEndColor("#"+endColor)
.setContentColor("#"+contentColor);
IMLoginManager.get(mContext).upDataUserInfo(model);
}
}
private void openImageChooserActivity(ValueCallback<Uri> valueCallback) {

3
main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
View File

@@ -28,6 +28,7 @@ import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.WeekListBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.live.bean.LiveBean;
import com.yunbao.main.R;
import com.yunbao.main.views.MainHomeLiveItemViewHolder;
@@ -205,7 +206,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
week_svga.setImageDrawable(drawable);
week_svga.startAnimation();
SVGAViewUtils.playEndClear(week_svga);
Log.e("MainHomeLiveAdapter", position + " ***************" + "onComplete");
}

7
main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
View File

@@ -24,6 +24,7 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.utils.CommonIconUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.main.R;
@@ -287,7 +288,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
svga1.setImageDrawable(drawable);
svga1.startAnimation();
SVGAViewUtils.playEndClear(svga1);
}
@Override
@@ -362,7 +363,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
svga2.setImageDrawable(drawable);
svga2.startAnimation();
SVGAViewUtils.playEndClear(svga2);
}
@Override
@@ -437,7 +438,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
svga3.setImageDrawable(drawable);
svga3.startAnimation();
SVGAViewUtils.playEndClear(svga3);
}
@Override

17
main/src/main/java/com/yunbao/main/views/FloatBannerView.java
View File

@@ -35,6 +35,9 @@ public class FloatBannerView extends FrameLayout {
private Handler bannerHandler = new Handler();
private int index = 0;
private String Uid;
//小图标没必要用高清原图，压缩至x32可以节约内存
private final int iconWidth=32;
private final int iconHeight=32;
public FloatBannerView(Context context) {
super(context);
@@ -76,9 +79,9 @@ public class FloatBannerView extends FrameLayout {
}
list.clear();
list.addAll(mList);
ImgLoader.displayAvatar(getContext(), list.get(0).getAvatar(), clipImage3);
ImgLoader.displayAvatar(getContext(), list.get(1).getAvatar(), clipImage2);
ImgLoader.displayAvatar(getContext(), list.get(2).getAvatar(), clipImage1);
ImgLoader.displayAvatar(getContext(), list.get(0).getAvatar(), clipImage3,iconWidth,iconHeight);
ImgLoader.displayAvatar(getContext(), list.get(1).getAvatar(), clipImage2,iconWidth,iconHeight);
ImgLoader.displayAvatar(getContext(), list.get(2).getAvatar(), clipImage1,iconWidth,iconHeight);
bannerHandler.post(mFlipRunnable);
});
@@ -107,8 +110,8 @@ public class FloatBannerView extends FrameLayout {
float targetX = bannerLayout2.getX() - bannerLayout3.getX();
float targetY = bannerLayout2.getY() - bannerLayout3.getY();
bannerLayout3.setVisibility(GONE);
ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage3);
ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage2);
ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage3,iconWidth,iconHeight);
ImgLoader.displayAvatar(getContext(), list.get(next).getAvatar(), clipImage2,iconWidth,iconHeight);
TranslateAnimation animationTranslate = new TranslateAnimation(0, -targetX / 1.2f, 0, -targetY / 1.2f);
ScaleAnimation scaleAnimation = new ScaleAnimation(1f, 1.2f, 1f, 1.2f);
AnimationSet animationSet1 = new AnimationSet(true);
@@ -122,7 +125,7 @@ public class FloatBannerView extends FrameLayout {
public void onAnimationStart(Animation animation) {
int show = finalNext + 1;
ImgLoader.displayAvatar(getContext(), list.get(show >= list.size() ? 0 : show).getAvatar(), clipImage1);
ImgLoader.displayAvatar(getContext(), list.get(show >= list.size() ? 0 : show).getAvatar(), clipImage1,iconWidth,iconHeight);
}
@Override
@@ -154,7 +157,7 @@ public class FloatBannerView extends FrameLayout {
@Override
public void onAnimationEnd(Animation animation) {
ImgLoader.displayAvatar(getContext(), list.get(finalNext).getAvatar(), clipImage4);
ImgLoader.displayAvatar(getContext(), list.get(finalNext).getAvatar(), clipImage4,iconWidth,iconHeight);
index = index + 1;
bannerHandler.postDelayed(mFlipRunnable, delayMillis);
bannerLayout3.clearAnimation();

4
main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
View File

@@ -255,7 +255,9 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
@JavascriptInterface
public void isCloseNavigation(String isClose) {
MainActivity.isClose(isClose);
if(nowMainActivity!=null) {
nowMainActivity.isClose(isClose);
}
}
@JavascriptInterface

2
main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java
View File

@@ -76,7 +76,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
.load(bean.getContent_pic_size_three())
.into(liveType);
}
ImgLoader.display(itemView.getContext(), bean.getThumb(), mCover);
ImgLoader.display(itemView.getContext(), bean.getThumb(), mCover,300,300);
bgs.setVisibility(View.VISIBLE);
pkico.setVisibility(View.GONE);
pkAvatar.setVisibility(View.GONE);

3
main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java
View File

@@ -18,6 +18,7 @@ import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yunbao.common.bean.WeekListBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.live.bean.LiveBean;
import com.yunbao.main.R;
@@ -66,7 +67,7 @@ public class MainHomeLiveWeekItemViewHolder<T> extends RecyclerView.ViewHolder {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
weekSvga.setImageDrawable(drawable);
weekSvga.startAnimation();
SVGAViewUtils.playEndClear(weekSvga);
weekSvga.setClearsAfterStop(false);
}

3
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@@ -39,6 +39,7 @@ import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -312,7 +313,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
gift_svga.setImageDrawable(drawable);
gift_svga.startAnimation();
SVGAViewUtils.playEndClear(gift_svga);
}
@Override

3
main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java
View File

@@ -29,6 +29,7 @@ import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.live.activity.LiveRecordActivity;
import com.yunbao.live.activity.RoomManageActivity;
@@ -266,7 +267,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
gift_svga.setImageDrawable(drawable);
gift_svga.startAnimation();
SVGAViewUtils.playEndClear(gift_svga);
}
@Override

3
main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java
View File

@@ -42,6 +42,7 @@ import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.CommonIconUtil;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
@@ -467,7 +468,7 @@ public class UserHomeViewHolder2 extends AbsLivePageViewHolder implements LiveSh
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
gift_svga.setImageDrawable(drawable);
gift_svga.startAnimation();
SVGAViewUtils.playEndClear(gift_svga);
}
@Override

BIN
main/src/main/res/mipmap-mdpi/jindou.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 MiB

BIN
main/src/main/res/mipmap-xxhdpi/img_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 428 KiB

After

Width:  |  Height:  |  Size: 144 KiB

BIN
main/src/main/res/mipmap-xxhdpi/img_news_instructor_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 313 KiB

After

Width:  |  Height:  |  Size: 133 KiB

BIN
main/src/main/res/mipmap-xxhdpi/img_news_online.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
main/src/main/res/mipmap-xxhdpi/img_search_empty.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 309 KiB

After

Width:  |  Height:  |  Size: 77 KiB