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

测试修改

Browse Source
This commit is contained in:
18401019693 2022-11-18 17:28:42 +08:00
parent 9fa0109c2e
commit 1346a1de52
6 changed files with 67 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.gradle
View File

@ -5,7 +5,7 @@ ext {
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 31, targetSdkVersion : 31,
versionCode : 302, versionCode : 302,
versionName : "6.4.4" versionName : "6.4.5"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式 //正式
@ -25,7 +25,7 @@ ext {
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false // true表示谷歌支付 false
isGooglePlay : false, isGooglePlay : true,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true isUploadLog : true
] ]

24
live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
View File

@ -8,7 +8,6 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.provider.MediaStore; import android.provider.MediaStore;
import androidx.annotation.RequiresApi;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -22,19 +21,21 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import androidx.annotation.RequiresApi;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants; import com.yunbao.common.Constants;
import com.yunbao.common.HtmlConfig; import com.yunbao.common.HtmlConfig;
import com.yunbao.common.R; import com.yunbao.common.R;
import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.L; import com.yunbao.common.utils.L;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil; import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.live.dialog.LiveUserDialogFragment; import com.yunbao.live.dialog.LiveUserDialogFragment;
import com.yunbao.live.http.LiveHttpUtil; import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter; import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
@ -168,7 +169,6 @@ public class WebViewActivityMedal extends AbsActivity {
} }
} }
private LiveRoomCheckLivePresenter mCheckLivePresenter;
private void gotoLive(final String live_id) { private void gotoLive(final String live_id) {
LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() { LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
@ -177,22 +177,10 @@ public class WebViewActivityMedal extends AbsActivity {
if (code == 0 && info.length > 0) { if (code == 0 && info.length > 0) {
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
if (mCheckLivePresenter == null) { LiveAudienceActivity.forward(mContext, liveBean, 0, 0, "", 0, 0);
mCheckLivePresenter = new LiveRoomCheckLivePresenter(mContext, new LiveRoomCheckLivePresenter.ActionListener() {
@Override
public void onLiveRoomChanged(LiveBean liveBean, int liveType, int liveTypeVal, int liveSdk) {
if (liveBean == null) {
return;
}
LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
}
});
}
mCheckLivePresenter.checkLive(liveBean);
} else { } else {
RouteUtil.forwardUserHome(mContext, live_id,0);
RouteUtil.forwardUserHome(mContext, String.valueOf(live_id), 0);
} }
} }
}); });

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

@ -42,7 +42,6 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.jakewharton.rxbinding3.view.RxView; import com.jakewharton.rxbinding3.view.RxView;
import com.lzf.easyfloat.EasyFloat; import com.lzf.easyfloat.EasyFloat;
import com.lzf.easyfloat.interfaces.OnPermissionResult;
import com.lzf.easyfloat.permission.PermissionUtils; import com.lzf.easyfloat.permission.PermissionUtils;
import com.tencent.imsdk.v2.V2TIMCallback; import com.tencent.imsdk.v2.V2TIMCallback;
import com.tencent.imsdk.v2.V2TIMManager; import com.tencent.imsdk.v2.V2TIMManager;
@ -91,7 +90,6 @@ import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.common.views.floatingview.APPEasyFloat; import com.yunbao.common.views.floatingview.APPEasyFloat;
import com.yunbao.common.views.weight.LiveFloatView; import com.yunbao.common.views.weight.LiveFloatView;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.live.http.LiveHttpConsts; import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil; import com.yunbao.live.http.LiveHttpUtil;
@ -204,7 +202,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() { CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
@Override @Override
public void callback(ConfigBean bean) { public void callback(ConfigBean bean) {
if(bean==null){ if (bean == null) {
return; return;
} }
//是否需要老用户回归弹窗 //是否需要老用户回归弹窗
@ -630,25 +628,22 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
// }); // });
public void mainClick(View v) { public void mainClick(View v) {
ViewClicksAntiShake.clicksAntiShake(v, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override if (!canClick()) {
public void onViewClicks() { return;
if (!canClick()) { }
return; int i = v.getId();
} if (i == R.id.btn_start) {
int i = v.getId(); showStartDialog();
if (i == R.id.btn_start) { } else if (i == R.id.btn_search) {
showStartDialog(); SearchActivity.forward(mContext);
} else if (i == R.id.btn_search) { } else if (i == R.id.btn_follow) {
SearchActivity.forward(mContext); //关注
} else if (i == R.id.btn_follow) { FollowActivity.forward(mContext, CommonAppConfig.getInstance().getUid(), 0);
//关注 } else if (i == R.id.img_trophy) {
FollowActivity.forward(mContext, CommonAppConfig.getInstance().getUid(), 0); MainListActivity.forward(mContext, 0);
} else if (i == R.id.img_trophy) { }
MainListActivity.forward(mContext, 0);
}
}
});
} }
@ -731,7 +726,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
bundle.putString("send_exp", obj.getString("send_exp")); bundle.putString("send_exp", obj.getString("send_exp"));
bundle.putString("sign_day", obj.getString("sign_day")); bundle.putString("sign_day", obj.getString("sign_day"));
fragment.setArguments(bundle); fragment.setArguments(bundle);
if(!getSupportFragmentManager().isStateSaved()) { if (!getSupportFragmentManager().isStateSaved()) {
fragment.show(getSupportFragmentManager(), "SigninDialog"); fragment.show(getSupportFragmentManager(), "SigninDialog");
} }
} }
@ -938,6 +933,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
mMainHomeCommunityViewHolder.loadNewUrl(); mMainHomeCommunityViewHolder.loadNewUrl();
} }
} }
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (isTabClose && isWebClose) { if (isTabClose && isWebClose) {

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

@ -23,10 +23,9 @@ import com.yunbao.common.custom.MyRadioButton;
import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.utils.CommonIconUtil; import com.yunbao.common.utils.CommonIconUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil; import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.bean.ListBean; import com.yunbao.main.bean.ListBean;
@ -69,51 +68,51 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
mItemClickListener = new View.OnClickListener() { mItemClickListener = new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
ViewClicksAntiShake.clicksAntiShake(v, () -> {
Object tag = v.getTag();
if (tag != null && mOnItemClickListener != null) {
ListBean model = (ListBean) tag;
if (model.isHide()) {
ToastUtil.show(R.string.can_not_go);
} else {
mOnItemClickListener.onItemClick(model, 0);
}
Object tag = v.getTag();
if (tag != null && mOnItemClickListener != null) {
ListBean model = (ListBean) tag;
if (model.isHide()) {
ToastUtil.show(R.string.can_not_go);
} else {
mOnItemClickListener.onItemClick(model, 0);
} }
});
}
} }
}; };
mFollowClickListener1 = new View.OnClickListener() { mFollowClickListener1 = new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
ViewClicksAntiShake.clicksAntiShake(v, () -> {
if (!canClick()) { if (!canClick()) {
return; return;
} }
Object tag = v.getTag(); Object tag = v.getTag();
if (tag != null) { if (tag != null) {
final ListBean bean = (ListBean) tag; final ListBean bean = (ListBean) tag;
CommonHttpUtil.setAttention(bean.getUid(), null); CommonHttpUtil.setAttention(bean.getUid(), null);
} }
});
} }
}; };
mFollowClickListener2 = new View.OnClickListener() { mFollowClickListener2 = new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
ViewClicksAntiShake.clicksAntiShake(v, () -> {
if (!canClick()) { if (!canClick()) {
return; return;
} }
Object tag = v.getTag(); Object tag = v.getTag();
if (tag != null) { if (tag != null) {
final int position = (int) tag; final int position = (int) tag;
final ListBean bean = mList.get(position); final ListBean bean = mList.get(position);
CommonHttpUtil.setAttention(bean.getUid(), null); CommonHttpUtil.setAttention(bean.getUid(), null);
} }
});
} }
}; };
@ -288,7 +287,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) { public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem); SVGADrawable drawable = new SVGADrawable(videoItem);
svga1.setImageDrawable(drawable); svga1.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(svga1,false); SVGAViewUtils.playEndClear(svga1, false);
} }
@Override @Override
@ -365,7 +364,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) { public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem); SVGADrawable drawable = new SVGADrawable(videoItem);
svga2.setImageDrawable(drawable); svga2.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(svga2,false); SVGAViewUtils.playEndClear(svga2, false);
} }
@Override @Override
@ -441,7 +440,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) { public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem); SVGADrawable drawable = new SVGADrawable(videoItem);
svga3.setImageDrawable(drawable); svga3.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(svga3,false); SVGAViewUtils.playEndClear(svga3, false);
} }
@Override @Override
@ -544,7 +543,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) { public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem); SVGADrawable drawable = new SVGADrawable(videoItem);
svga.setImageDrawable(drawable); svga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(svga,false); SVGAViewUtils.playEndClear(svga, false);
} }
@Override @Override

4
main/src/main/java/com/yunbao/main/adapter/SettingAdapter.java
View File

@ -45,7 +45,7 @@ public class SettingAdapter extends RecyclerView.Adapter {
mOnClickListener = new View.OnClickListener() { mOnClickListener = new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
ViewClicksAntiShake.clicksAntiShake(v, () -> {
Object tag = v.getTag(); Object tag = v.getTag();
if (tag != null) { if (tag != null) {
int position = (int) tag; int position = (int) tag;
@ -54,7 +54,7 @@ public class SettingAdapter extends RecyclerView.Adapter {
mOnItemClickListener.onItemClick(bean, position); mOnItemClickListener.onItemClick(bean, position);
} }
} }
});
} }
}; };

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

@ -452,7 +452,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
@Override @Override
public void onClick(View v) { public void onClick(View v) {
ViewClicksAntiShake.clicksAntiShake(v, () -> {
int i = v.getId(); int i = v.getId();
if (i == R.id.lt_name) { if (i == R.id.lt_name) {
mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
@ -477,7 +477,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid(); String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid();
ZhuangBanActivity.forward(mContext, url, false); ZhuangBanActivity.forward(mContext, url, false);
} }
});