修复测试反馈内容

新增临时需求：banner点进礼物墙新增临时需求：主播下播后显示违规内容(未接入接口）合并潘多拉修复问题
2024-07-30 10:29:34 +08:00
parent 516a068c25
commit 9ae6fedd8d
40 changed files with 592 additions and 366 deletions
--- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
@@ -14,6 +14,8 @@ import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Paint;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -92,6 +94,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.main.R;
 import com.yunbao.main.dialog.LoginTipsDialog;
 import com.yunbao.main.http.MainHttpUtil;
@@ -137,6 +140,20 @@ public class EntryActivity extends AppCompatActivity {

    private WebView webview;
    private WebSettings webSettings;
+    private View webViewLayout;
+    private View webBack;
+
+
+    @Override
+    public Resources getResources() {
+        Resources res = super.getResources();
+        Configuration config = new Configuration();
+        config.setToDefaults();
+        config.locale = IMLoginManager.get(this).getLocaleLanguage();
+        res.updateConfiguration(config, res.getDisplayMetrics());
+        return res;
+    }
+

    @Subscribe(threadMode = ThreadMode.MAIN)
    public void close(String str) {
@@ -225,7 +242,9 @@ public class EntryActivity extends AppCompatActivity {
        btn_tip1.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
        btn_tip1.getPaint().setAntiAlias(true);

-        webview = (WebView) findViewById(R.id.webview);
+        webview = findViewById(R.id.webview);
+        webViewLayout = findViewById(R.id.webview_container);
+        webBack = findViewById(R.id.btn_back1);
        initView();
        btn_tip1.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -377,11 +396,22 @@ public class EntryActivity extends AppCompatActivity {
                }
            }
        });
+        ViewClicksAntiShake.clicksAntiShake(webBack, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                webViewLayout.setVisibility(View.GONE);
+            }
+        });
    }

-    private void verfiy(int loginType){
+    private void verfiy(int loginType) {
        this.loginType = loginType;
-        webview.setVisibility(View.VISIBLE);
+        webViewLayout.setVisibility(View.VISIBLE);
+        // 开启js支持
+        webSettings.setJavaScriptEnabled(true);
+        webview.addJavascriptInterface(new JsBridge(), "jsBridge");
+// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
+        webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
    }

    private int loginType;  // 1:facebook 2:google 3:twitter 4:Line
@@ -429,7 +459,7 @@ public class EntryActivity extends AppCompatActivity {
            runOnUiThread(new Runnable() {
                @Override
                public void run() {
-                    webview.setVisibility(View.GONE);
+                    webViewLayout.setVisibility(View.GONE);
                    //跳转
                    todo();
                }
@@ -451,11 +481,7 @@ public class EntryActivity extends AppCompatActivity {
                return true;
            }
        });
-// 开启js支持
-        webSettings.setJavaScriptEnabled(true);
-        webview.addJavascriptInterface(new JsBridge(), "jsBridge");
-// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
-        webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
+
    }


--- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
@@ -29,6 +29,8 @@ 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.dialog.GiftWallDialog;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
@@ -211,7 +213,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                    });
                } else {
                    pp = 0;
-                    if(select==0){
+                    if (select == 0) {
                        select = list.get(0).getId();
                    }
                    MainHttpUtil.getClassLive(select, p, callback);
@@ -409,8 +411,8 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                    liveBean.setParams(gotoRoomKey);
                    new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
                        @Override
-                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
-                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal),isSw);
+                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
+                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal), isSw);
                        }

                        @Override
@@ -467,6 +469,10 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                                        WebViewActivity.forward(mContext, link, true, false);
                                    } else if ("home_page_banner_battle".equals(link)) {
                                        RouteUtil.forwardBattlePass();
+                                    } else if ("home_page_banner_giftwall".equals(link)) {
+                                        new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",
+                                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(),null
+                                                , false).setFullWindows(true).setTab2(true).showDialog();
                                    } else {
                                        gotoLive(link);
                                    }
@@ -504,7 +510,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                        }
                        new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
                            @Override
-                            public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
+                            public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {

                                if (LiveRoomViewHolder.mHandler != null) {
                                    LiveRoomViewHolder.mHandler.removeCallbacksAndMessages(null);
@@ -516,7 +522,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                                    }
                                    EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
                                } else {
-                                    RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk),isSw);
+                                    RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk), isSw);
                                }
                            }

--- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
@@ -69,8 +69,8 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
                    @Override
                    public void run() {
                        new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",
-                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(),null
-                                , false).setFullWindows(true).showDialog();
+                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null
+                                , false).setFullWindows(true).setTab2(true).showDialog();
                    }
                });
                return true;
--- a/main/src/main/res/layout/activity_entry.xml
+++ b/main/src/main/res/layout/activity_entry.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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:layout_width="match_parent"
    android:layout_height="match_parent"
@@ -295,12 +296,49 @@
        android:layout_marginTop="80dp"
        android:src="@mipmap/white_logo" />

-    <WebView
-        android:id="@+id/webview"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/webview_container"
        android:layout_width="match_parent"
-        android:visibility="gone"
        android:layout_height="match_parent"
-        android:layout_centerHorizontal="true" />
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <View
+            android:id="@+id/view2"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/btn_back1"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_centerVertical="true"
+            android:layout_marginTop="10dp"
+            android:onClick="backClick"
+            android:padding="9dp"
+            android:src="@mipmap/icon_back"
+            android:tint="@color/textColor"
+            app:layout_constraintBottom_toBottomOf="@+id/view2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <WebView
+            android:id="@+id/webview"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_centerHorizontal="true"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view2" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+


 </RelativeLayout>