测试修改

2022-11-18 17:28:42 +08:00 · 2022-11-18 17:28:42 +08:00 · 1346a1de52
commit 1346a1de52
parent 9fa0109c2e
6 changed files with 67 additions and 84 deletions
--- a/config.gradle
+++ b/config.gradle
@ -5,7 +5,7 @@ ext {
            minSdkVersion    : 21,
            targetSdkVersion : 31,
            versionCode      : 302,
-            versionName      : "6.4.4"
+            versionName      : "6.4.5"
    ]
    manifestPlaceholders = [
            //正式
@ -25,7 +25,7 @@ ext {
            baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",

 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
            //是否上报异常日志
            isUploadLog      :  true
    ]
--- a/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
+++ b/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
@ -8,7 +8,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
@ -22,19 +21,21 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;

+import androidx.annotation.RequiresApi;
+
 import com.alibaba.fastjson.JSON;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.HtmlConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.activity.AbsActivity;
+import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
-import com.yunbao.common.bean.LiveBean;
 import com.yunbao.live.dialog.LiveUserDialogFragment;
 import com.yunbao.live.http.LiveHttpUtil;
 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) {
        LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
@ -177,22 +177,10 @@ public class WebViewActivityMedal extends AbsActivity {
                if (code == 0 && info.length > 0) {
                    LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);

-                    if (mCheckLivePresenter == null) {
-                        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);
+                    LiveAudienceActivity.forward(mContext, liveBean, 0, 0, "", 0, 0);
                } else {
-                    RouteUtil.forwardUserHome(mContext, live_id,0);
+
+                    RouteUtil.forwardUserHome(mContext, String.valueOf(live_id), 0);
                }
            }
        });
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@ -42,7 +42,6 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.jakewharton.rxbinding3.view.RxView;
 import com.lzf.easyfloat.EasyFloat;
-import com.lzf.easyfloat.interfaces.OnPermissionResult;
 import com.lzf.easyfloat.permission.PermissionUtils;
 import com.tencent.imsdk.v2.V2TIMCallback;
 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.floatingview.APPEasyFloat;
 import com.yunbao.common.views.weight.LiveFloatView;
-import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.http.LiveHttpConsts;
 import com.yunbao.live.http.LiveHttpUtil;
@ -204,7 +202,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
        CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
            @Override
            public void callback(ConfigBean bean) {
-                if(bean==null){
+                if (bean == null) {
                    return;
                }
                //是否需要老用户回归弹窗
@ -630,9 +628,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
 //        });

    public void mainClick(View v) {
-        ViewClicksAntiShake.clicksAntiShake(v, new ViewClicksAntiShake.ViewClicksCallBack() {
-            @Override
-            public void onViewClicks() {
+
        if (!canClick()) {
            return;
        }
@ -647,8 +643,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
        } 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("sign_day", obj.getString("sign_day"));
                        fragment.setArguments(bundle);
-                        if(!getSupportFragmentManager().isStateSaved()) {
+                        if (!getSupportFragmentManager().isStateSaved()) {
                            fragment.show(getSupportFragmentManager(), "SigninDialog");
                        }
                    }
@ -938,6 +933,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
            mMainHomeCommunityViewHolder.loadNewUrl();
        }
    }
+
    @Override
    public void onBackPressed() {
        if (isTabClose && isWebClose) {
--- a/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
@ -23,10 +23,9 @@ import com.yunbao.common.custom.MyRadioButton;
 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.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
-import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.main.R;
 import com.yunbao.main.bean.ListBean;

@ -69,7 +68,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
        mItemClickListener = new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-                ViewClicksAntiShake.clicksAntiShake(v, () -> {
+
                Object tag = v.getTag();
                if (tag != null && mOnItemClickListener != null) {
                    ListBean model = (ListBean) tag;
@ -80,14 +79,14 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
                    }

                }
-                });
+

            }
        };
        mFollowClickListener1 = new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-                ViewClicksAntiShake.clicksAntiShake(v, () -> {
+
                if (!canClick()) {
                    return;
                }
@ -96,14 +95,14 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
                    final ListBean bean = (ListBean) tag;
                    CommonHttpUtil.setAttention(bean.getUid(), null);
                }
-                });
+

            }
        };
        mFollowClickListener2 = new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-                ViewClicksAntiShake.clicksAntiShake(v, () -> {
+
                if (!canClick()) {
                    return;
                }
@ -113,7 +112,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
                    final ListBean bean = mList.get(position);
                    CommonHttpUtil.setAttention(bean.getUid(), null);
                }
-                });
+

            }
        };
@ -288,7 +287,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
                                public void onComplete(SVGAVideoEntity videoItem) {
                                    SVGADrawable drawable = new SVGADrawable(videoItem);
                                    svga1.setImageDrawable(drawable);
-                                    SVGAViewUtils.playEndClear(svga1,false);
+                                    SVGAViewUtils.playEndClear(svga1, false);
                                }

                                @Override
@ -365,7 +364,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
                                public void onComplete(SVGAVideoEntity videoItem) {
                                    SVGADrawable drawable = new SVGADrawable(videoItem);
                                    svga2.setImageDrawable(drawable);
-                                    SVGAViewUtils.playEndClear(svga2,false);
+                                    SVGAViewUtils.playEndClear(svga2, false);
                                }

                                @Override
@ -441,7 +440,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
                                public void onComplete(SVGAVideoEntity videoItem) {
                                    SVGADrawable drawable = new SVGADrawable(videoItem);
                                    svga3.setImageDrawable(drawable);
-                                    SVGAViewUtils.playEndClear(svga3,false);
+                                    SVGAViewUtils.playEndClear(svga3, false);
                                }

                                @Override
@ -544,7 +543,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
                                public void onComplete(SVGAVideoEntity videoItem) {
                                    SVGADrawable drawable = new SVGADrawable(videoItem);
                                    svga.setImageDrawable(drawable);
-                                    SVGAViewUtils.playEndClear(svga,false);
+                                    SVGAViewUtils.playEndClear(svga, false);
                                }

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

            }
        };
--- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
@ -452,7 +452,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi

    @Override
    public void onClick(View v) {
-        ViewClicksAntiShake.clicksAntiShake(v, () -> {
+
            int i = v.getId();
            if (i == R.id.lt_name) {
                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();
                ZhuangBanActivity.forward(mContext, url, false);
            }
-        });
+