塔罗牌客户端相关

2021-01-21 14:10:50 +08:00
parent 0cea1d3b5b
commit efde73af0d
13 changed files with 89 additions and 61 deletions
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
@@ -35,6 +35,7 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.coorchice.library.SuperTextView;
+import com.yizhuan.erban.ui.webview.DialogWebViewActivity;
 import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView;
 import com.yizhuan.erban.ui.widget.rollviewpager.Util;
 import com.yizhuan.erban.ui.widget.rollviewpager.hintview.ColorPointHintView;
@@ -1133,7 +1134,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
                @Override
                public void onWebClick(String url) {
                    StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_ROOM_PROMOTE_CLICK, "语音房_推广入口");
-                    DialogWebFragment.newInstance(url).show(getFragmentManager());
+                    DialogWebViewActivity.start(mContext,url);
                }
            });

--- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
@@ -39,12 +39,10 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
 import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
 import com.yizhuan.xchat_android_core.manager.RoomEvent;
 import com.yizhuan.xchat_android_core.manager.RtcEngineManager;
-import com.yizhuan.xchat_android_core.manager.event.HistoryMessageEvent;
 import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo;
 import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel;
 import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException;
 import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager;
-import com.yizhuan.xchat_android_core.room.bean.ActivityInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
 import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java
@@ -7,27 +7,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

-import com.coorchice.library.utils.LogUtils;
-import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
-import com.opensource.svgaplayer.SVGADrawable;
-import com.opensource.svgaplayer.SVGAImageView;
-import com.opensource.svgaplayer.SVGAParser;
-import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.yizhuan.erban.R;
-import com.yizhuan.erban.ui.im.RouterHandler;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
+import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
 import com.yizhuan.erban.utils.CommonJumpHelper;
 import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
-import com.yizhuan.xchat_android_core.im.custom.bean.RouterType;
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo;
 import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
 import com.yizhuan.xchat_android_core.statistic.StatisticManager;
 import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;

-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.List;

 public class RoomActAdapter extends StaticPagerAdapter {
--- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
@@ -7,15 +7,11 @@ import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.AssetManager;
 import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-
-import androidx.annotation.LayoutRes;
-import androidx.core.app.ActivityCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.SslErrorHandler;
@@ -29,12 +25,13 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;

+import androidx.annotation.LayoutRes;
+
 import com.google.gson.Gson;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nim.uikit.common.util.string.StringUtil;
 import com.orhanobut.logger.Logger;
-import com.tencent.bugly.crashreport.CrashReport;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.application.XChatApplication;
@@ -42,8 +39,10 @@ import com.yizhuan.erban.base.BaseActivity;
 import com.yizhuan.erban.ui.im.RouterHandler;
 import com.yizhuan.erban.ui.webview.event.CloseWebViewEvent;
 import com.yizhuan.erban.ui.webview.event.ShowNavEvent;
+import com.yizhuan.erban.ui.webview.event.TaroPayResultEvent;
 import com.yizhuan.erban.ui.widget.ShareDialog;
 import com.yizhuan.erban.utils.WebViewUtils;
+import com.yizhuan.xchat_android_core.Constants;
 import com.yizhuan.xchat_android_core.certification.event.CertificationResultEvent;
 import com.yizhuan.xchat_android_core.share.ShareModel;
 import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo;
@@ -55,6 +54,8 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

 import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;

 import cn.sharesdk.framework.Platform;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -67,7 +68,7 @@ import io.reactivex.schedulers.Schedulers;
 public class CommonWebViewActivity extends BaseActivity implements ShareDialog.OnShareDialogItemClick {

    protected FrameLayout layoutTitleBar;
-    private WebView webView;
+    protected WebView webView;
    private ProgressBar mProgressBar;
    private CommonWebViewActivity mActivity;
    private WebChromeClient wvcc;
@@ -239,6 +240,17 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
                    }
                    return true;
                }
+
+                if (url.startsWith("weixin://wap/pay")) {
+                    try {
+                        Intent intent = new Intent(Intent.ACTION_VIEW);
+                        intent.setData(Uri.parse(url));
+                        startActivity(intent);
+                    } catch (Exception e) {
+                        toast("未安装微信");
+                    }
+                    return true;
+                }
                if (url.contains("tel:")) {
                    //删除直接拨打电话的功能
                    return true;
@@ -380,8 +392,14 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O

    public void ShowWebView(String url) {
        Logger.d("ShowWebView--------" + url);
-        webView.loadUrl(url);
-
+        if (!TextUtils.isEmpty(url)) {
+            Map<String, String> map = new HashMap<>();
+            map.put("Referer", Constants.WXPAY_REFERER);
+            webView.loadUrl(url, map);
+        } else {
+            toast("网页链接无效");
+            finish();
+        }
    }

    @Override
@@ -486,4 +504,9 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
        StatusBarUtil.transparencyBar(this);
        StatusBarUtil.StatusBarLightMode(this);
    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onTaroPayResultEvent(TaroPayResultEvent event) {
+        finish();
+    }
 }
--- a/app/src/main/java/com/yizhuan/erban/ui/webview/DialogWebViewActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/DialogWebViewActivity.java
@@ -3,12 +3,17 @@ package com.yizhuan.erban.ui.webview;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;

 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_core.Constants;
+
+import java.util.HashMap;
+import java.util.Map;

 public class DialogWebViewActivity extends CommonWebViewActivity {

--- a/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java
@@ -30,6 +30,7 @@ import com.yizhuan.erban.ui.webview.event.CloseDialogWebViewEvent;
 import com.yizhuan.erban.ui.webview.event.CloseWebViewEvent;
 import com.yizhuan.erban.ui.webview.event.H5NotifyClientEvent;
 import com.yizhuan.erban.ui.webview.event.ShowNavEvent;
+import com.yizhuan.erban.ui.webview.event.TaroPayResultEvent;
 import com.yizhuan.erban.ui.widget.ShareDialog;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.certification.event.CertificationResultEvent;
@@ -501,7 +502,20 @@ public class JSInterface {

    @JavascriptInterface
    public void closeDialogWebView() {
-        EventBus.getDefault().post(new CloseDialogWebViewEvent());
+        if (mActivity!=null) mActivity.finish();
+    }
+
+    /**
+     * 打开弹窗式 WebViewActivity
+     */
+    @JavascriptInterface
+    public void openDialogWebview(String url) {
+        DialogWebViewActivity.start(mActivity, url);
+    }
+
+    @JavascriptInterface
+    public void checkResultFinish(int result) {
+        EventBus.getDefault().post(new TaroPayResultEvent().setResult(result));
    }

 }
--- a/app/src/main/java/com/yizhuan/erban/ui/webview/event/TaroPayResultEvent.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/webview/event/TaroPayResultEvent.java
@@ -0,0 +1,20 @@
+package com.yizhuan.erban.ui.webview.event;
+
+
+/**
+ * Created by MadisonRong on 26/06/2018.
+ */
+
+public class TaroPayResultEvent {
+
+    private int result;
+
+    public int getResult() {
+        return result;
+    }
+
+    public TaroPayResultEvent setResult(int result) {
+        this.result = result;
+        return this;
+    }
+}
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
@@ -289,6 +289,16 @@ public class XChatConstants {
    public static final String OPPO_APP_KEY = "631b6753a1fa481e88dd57793a04e531";
    public static final String OPPO_SECRET = "c963ee7c0ba54fbfb3124b4aa7011b17";

+    /**
+     * Referer (DEBUG)
+     */
+    public static final String KEY_REFERER_DEBUG = "http://120.79.211.243/";
+
+    /**
+     * Referer (RELEASE)
+     */
+    public static final String KEY_REFERER_RELEASE = "https://api.zhongjialx.com/";
+
    // 侧耳
 //    public static final String QUICK_PASS_BUSINESS_ID = BuildConfig.DEBUG ? "cadbb4ed892549dab4d1adc9d62013bb" : "ba4a642810294561b9cd17034a448b49";

--- a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java
@@ -1,6 +1,8 @@
 package com.yizhuan.xchat_android_core;

 import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.yizhuan.xchat_android_library.utils.pref.CommonPref;

 import java.io.File;

@@ -101,4 +103,7 @@ public class Constants {
    public static final byte TYPE_JOINED = 1;
    public static final byte TYPE_RECOMMEND = 2;
    public static final byte TYPE_ALL = 0;
+
+    public static final String WXPAY_REFERER = (BuildConfig.DEBUG && CommonPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt("enviroment") != 0) ?
+            XChatConstants.KEY_REFERER_DEBUG : XChatConstants.KEY_REFERER_RELEASE;
 }
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ActivityInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ActivityInfo.java
@@ -1,33 +0,0 @@
-package com.yizhuan.xchat_android_core.room.bean;
-
-import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo;
-
-import java.util.List;
-
-public class ActivityInfo {
-
-    /**
-     * list : [{"actId":5,"actName":"51大酬宾","seqNo":1,"alertWinPic":"https://image.zhongjialx.com/Fo5iOjNLYe6vwMk69OxSXlsgqGNJ?imageslim","imageType":"png","skipType":2,"skipUrl":"https://www.baidu.com","startTime":1556985600000,"endTime":1557763199000,"packName":"测试大礼包"},{"actId":7,"actName":"测试活动xxx","seqNo":10,"alertWinPic":"https://image.zhongjialx.com/Fts-bIveVbuHZj-UOOuT0ksncp3T?imageslim","imageType":"png","skipType":1,"skipUrl":"901485","startTime":1556640000000,"endTime":1559231999000,"packName":"情人礼包"}]
-     * rotateInterval : 3
-     */
-
-    private int rotateInterval;
-    private List<ActionDialogInfo> list;
-
-    public int getRotateInterval() {
-        return rotateInterval;
-    }
-
-    public void setRotateInterval(int rotateInterval) {
-        this.rotateInterval = rotateInterval;
-    }
-
-    public List<ActionDialogInfo> getList() {
-        return list;
-    }
-
-    public void setList(List<ActionDialogInfo> list) {
-        this.list = list;
-    }
-
-}
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java
@@ -31,7 +31,6 @@ import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException;

 import com.yizhuan.xchat_android_core.room.activitytimer.ActivityTimerEvent;
 import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean;
-import com.yizhuan.xchat_android_core.room.bean.ActivityInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomResult;
 import com.yizhuan.xchat_android_core.room.bean.RoomWelcomeConfig;
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
@@ -30,7 +30,6 @@ import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
 import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
 import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean;
-import com.yizhuan.xchat_android_core.room.bean.ActivityInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomResult;
 import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo;
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java
@@ -5,9 +5,7 @@ import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData;
 import com.yizhuan.xchat_android_core.base.IModel;
 import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
 import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
-import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo;
 import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean;
-import com.yizhuan.xchat_android_core.room.bean.ActivityInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomResult;
 import com.yizhuan.xchat_android_core.room.bean.RoomWelcomeConfig;