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

H5的跳转格式基本替换完成

Browse Source
This commit is contained in:
ningwenqiang 2024-10-28 17:56:33 +08:00
parent f4adc9ca6c
commit b8996a700a
19 changed files with 83 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Share/src/main/java/com/yunbao/share/bean/ShareBean.java
View File

@ -33,12 +33,12 @@ public class ShareBean {
public static String createLiveShareLink(String shareUid, String anchorId, String anchorName, String anchorAvatar) { public static String createLiveShareLink(String shareUid, String anchorId, String anchorName, String anchorAvatar) {
return String.format(CommonAppConfig.HOST + return String.format(CommonAppConfig.HOST +"/h5/home/share.html?uid=%s&user_id=%s&isGoogle=%s",
"/index.php?g=Appapi&m=home&a=share&uid=%s&user_id=%s&isGoogle=%s",
anchorId, anchorId,
shareUid, shareUid,
CommonAppConfig.IS_GOOGLE_PLAY CommonAppConfig.IS_GOOGLE_PLAY
); );
} }
public static String createInviteLink(String shareUid) { public static String createInviteLink(String shareUid) {

15
common/src/main/java/com/yunbao/common/HtmlConfig.java
View File

@ -7,12 +7,12 @@ package com.yunbao.common;
public class HtmlConfig { public class HtmlConfig {
//登录即代表同意服务和隐私条款 //登录即代表同意服务和隐私条款
public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=68"; public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/h5/page/index.html?id=68";
public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=67"; public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=67";
//注册用户协议 //注册用户协议
public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2"; public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=2";
public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3"; public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/h5/page/index.html?id=3";
//直播间贡献榜 //直播间贡献榜
public static final String LIVE_LIST = CommonAppConfig.HOST + "/index.php?g=Appapi&m=contribute&a=index&uid="; public static final String LIVE_LIST = CommonAppConfig.HOST + "/index.php?g=Appapi&m=contribute&a=index&uid=";
@ -33,7 +33,7 @@ public class HtmlConfig {
public static final String LUCK_GIFT_TIP = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=26"; public static final String LUCK_GIFT_TIP = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=26";
//直播间玩家看到的心愿单 //直播间玩家看到的心愿单
public static final String WISHLIST_URL = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Wish&a=index"; public static final String WISHLIST_URL = CommonAppConfig.HOST + "/h5/wish/index.html?1=1";
//直播间玩家看到的转盘 //直播间玩家看到的转盘
public static final String TURNTABLE_URL = CommonAppConfig.HOST + "/Appapi/Turntable/index"; public static final String TURNTABLE_URL = CommonAppConfig.HOST + "/Appapi/Turntable/index";
@ -48,7 +48,7 @@ public class HtmlConfig {
public static final String PERSONAL = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/Personal"; public static final String PERSONAL = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/Personal";
//我的徽章 右上角问号 //我的徽章 右上角问号
public static final String MEDAL_QUESTION = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Fans&a=rule&isfans=1"; public static final String MEDAL_QUESTION = CommonAppConfig.HOST + "/h5/fans/rule.html?isfans=1";
//我的明细 //我的明细
public static final String DETAIL = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Detail&a=index"; public static final String DETAIL = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Detail&a=index";
@ -58,4 +58,7 @@ public class HtmlConfig {
//充值说明 //充值说明
public static final String CHARGE_EXPLAIN = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=41"; public static final String CHARGE_EXPLAIN = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=41";
} }

6
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -891,7 +891,7 @@ public interface PDLiveApi {
/** /**
* 获取普通红包的领取记录 * 获取普通红包的领取记录
*/ */
@GET("/Live.endRedPacket") @GET("/ylajieshuhongbao")
Observable<ResponseModel<Object>> endRedPacket( Observable<ResponseModel<Object>> endRedPacket(
@Query("liveuid") String liveUid, @Query("liveuid") String liveUid,
@Query("red_packet_id") String redPacketId @Query("red_packet_id") String redPacketId
@ -1331,11 +1331,13 @@ public interface PDLiveApi {
@GET("/ylahuoquyonghujiaoyoubiaoqian") @GET("/ylahuoquyonghujiaoyoubiaoqian")
Observable<ResponseModel<List<CareerBean>>> getHobby(); Observable<ResponseModel<List<CareerBean>>> getHobby();
@GET("/ylashezhibiaoqian") @GET("/ylashezhibiaoqian")
Observable<ResponseModel<List<BaseModel>>> setHobby( Observable<ResponseModel<List<BaseModel>>> setHobby(
@Query("labels") String labelsId @Query("labels") String labelsId
); );
@GET("/ylasetLabel") @GET("/ylahuoqushezhizhuangtai")
Observable<ResponseModel<FirstLoginBean>> isFirstLogin( Observable<ResponseModel<FirstLoginBean>> isFirstLogin(
); );
@GET("/ylahuoquzhuboid") @GET("/ylahuoquzhuboid")

2
common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
View File

@ -619,7 +619,7 @@ public class JavascriptInterfaceUtils {
@JavascriptInterface @JavascriptInterface
public void androidClickToTaskPage() { public void androidClickToTaskPage() {
ARouter.getInstance().build(PATH_REWARD).withString("url", ARouter.getInstance().build(PATH_REWARD).withString("url",
CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid() CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid()
+ "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1" + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation(); + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1" + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation();
} }

2
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@ -272,7 +272,7 @@ public class RouteUtil {
* 跳转到充值页面 * 跳转到充值页面
*/ */
public static void forwardMyCoin(Context context) { public static void forwardMyCoin(Context context) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=zhifu&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); String url = CommonAppConfig.HOST + "/h5/Mall/zhifu.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
ARouter.getInstance().build(PATH_COIN).withString("url", url).navigation(); ARouter.getInstance().build(PATH_COIN).withString("url", url).navigation();
} }

2
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -980,7 +980,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() { dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1"; String url = CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
WebViewActivity.forward(mContext, url, true); WebViewActivity.forward(mContext, url, true);
dialog.dismiss(); dialog.dismiss();
} }

2
live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java
View File

@ -278,7 +278,7 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic
break; break;
case Constants.LIVE_FUNC_WKS: case Constants.LIVE_FUNC_WKS:
String url = CommonAppConfig.HOST String url = CommonAppConfig.HOST
+ "/h5/activity/weekStar/index.html?&uid=" + "/h5/activity/weekStar/index.html?uid="
+ CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid
+ "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"); + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");

2
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -1223,7 +1223,7 @@ public class LiveAudienceActivity extends LiveActivity {
} }
break; break;
case LIVE_WKS://周星榜 case LIVE_WKS://周星榜
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + userInfo.getId() + "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?uid=" + userInfo.getId() + "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 1); ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 1);
break; break;
case NOBLE: case NOBLE:

4
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@ -501,7 +501,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
leaveLive(); leaveLive();
break; break;
case Constants.LIVE_FUNC_WKS: case Constants.LIVE_FUNC_WKS:
String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, url, false, 0); ZhuangBanActivity.forward(mContext, url, false, 0);
break; break;
case Constants.LIVE_FUNC_LINK_MIC://连麦 case Constants.LIVE_FUNC_LINK_MIC://连麦
@ -1590,7 +1590,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
switch (event.getType()) { switch (event.getType()) {
case LIVE_WKS: case LIVE_WKS:
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?uid="
+ userInfo.getId() + + userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid; "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 0); ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 0);

4
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@ -497,7 +497,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
leaveLive(); leaveLive();
break; break;
case Constants.LIVE_FUNC_WKS: case Constants.LIVE_FUNC_WKS:
String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid; String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, url, false, 0); ZhuangBanActivity.forward(mContext, url, false, 0);
break; break;
case Constants.LIVE_FUNC_LINK_MIC://连麦 case Constants.LIVE_FUNC_LINK_MIC://连麦
@ -1597,7 +1597,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
switch (event.getType()) { switch (event.getType()) {
case LIVE_WKS: case LIVE_WKS:
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?uid="
+ userInfo.getId() + + userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid; "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 0); ZhuangBanActivity.forward(mContext, weeklyStarUrl, false, 0);

4
live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java
View File

@ -63,8 +63,8 @@ public class LiveTrickeryDialogFragment4Audience extends AbsDialogFragment {
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
RelativeLayout rlWebview= (RelativeLayout) findViewById(R.id.rlWebview); RelativeLayout rlWebview= (RelativeLayout) findViewById(R.id.rlWebview);
if (mWishWebViewHolder == null) { if (mWishWebViewHolder == null) {
String url= CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=prank"; String url= CommonAppConfig.HOST + "/h5/Turntable/prank.html?";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchor_id="+mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + CommonAppConfig.getInstance().getToken() + "&anchor_id="+mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Log.i("tag",url); Log.i("tag",url);
mWishWebViewHolder = new WishlistWebViewHolder(mContext, rlWebview, url); mWishWebViewHolder = new WishlistWebViewHolder(mContext, rlWebview, url);

2
live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
View File

@ -175,7 +175,7 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
btn_onecz_event.setOnClickListener(new View.OnClickListener() { btn_onecz_event.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
String url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); String url = CommonAppConfig.HOST + "/h5/activity/firstTopUp/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", url); bundle.putString("url", url);
LiveOneDialogFragment fragment = new LiveOneDialogFragment((Activity) mContext); LiveOneDialogFragment fragment = new LiveOneDialogFragment((Activity) mContext);

4
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@ -735,8 +735,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
* 观众打开主播的整蛊惑单窗口 * 观众打开主播的整蛊惑单窗口
*/ */
public void openZGListWindow() { public void openZGListWindow() {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky"; String url = CommonAppConfig.HOST + "/h5/Turntable/tricky.html?";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Log.i("tag", url); Log.i("tag", url);
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();

26
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -68,6 +68,7 @@ import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity; import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yunbao.common.HtmlConfig;
import com.yunbao.common.bean.PrankProgressBean; import com.yunbao.common.bean.PrankProgressBean;
import com.yunbao.common.fragment.GiftWallMainTab1Fragment; import com.yunbao.common.fragment.GiftWallMainTab1Fragment;
import com.yunbao.common.utils.DebugUtils; import com.yunbao.common.utils.DebugUtils;
@ -2551,11 +2552,18 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
//判断是否是星级活动 //判断是否是星级活动
if (bean.isStart()) { if (bean.isStart()) {
type = bean.getModel().getType(); type = bean.getModel().getType();
htmlUrl.append(CommonAppConfig.HOST).append("/").append(bean.getModel().getActivityUrl()).append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=").append(userInfo.getUserNicename()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&uid=").append(userInfo.getId()).append("&k=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); htmlUrl.append(CommonAppConfig.HOST).append("/")
.append(bean.getModel().getActivityUrl())
.append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=")
.append(userInfo.getUserNicename()).append("&token=").append(userInfo.getToken())
.append("&anchorUid=").append(mLiveUid)
.append("&uid=").append(userInfo.getId())
.append("&k=").append(System.currentTimeMillis())
.append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
} else { } else {
type = bean.getShow_type(); type = bean.getShow_type();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); htmlUrl.append(HtmlConfig.WISHLIST_URL).append(HtmlConfig.WISHLIST_URL.contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
} }
if (htmlUrl.toString().contains("StarChallenge")) { if (htmlUrl.toString().contains("StarChallenge")) {
Map<String, String> map_ekv = new HashMap<String, String>(); Map<String, String> map_ekv = new HashMap<String, String>();
@ -2717,7 +2725,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
ZhuangBanActivity.forward(mContext, url, false, 1); ZhuangBanActivity.forward(mContext, url, false, 1);
} else if (link.equals("zxb")) { } else if (link.equals("zxb")) {
String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
ZhuangBanActivity.forward(mContext, url, false, 1); ZhuangBanActivity.forward(mContext, url, false, 1);
} else if (link.equals("xyd")) { } else if (link.equals("xyd")) {
openWishListWindow(); openWishListWindow();
@ -6253,7 +6261,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
mTopBannerList = new ArrayList<>(); mTopBannerList = new ArrayList<>();
BannerBean bannerBean = new BannerBean(); BannerBean bannerBean = new BannerBean();
bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1); bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).
setmLink(CommonAppConfig.HOST + "/index.php").setType(1);
bannerBean.setShow_type("2"); bannerBean.setShow_type("2");
mTopBannerList.add(bannerBean); mTopBannerList.add(bannerBean);
/*if (mTopBannerList.size() == 1 || mTopBannerList.size() == 0) { /*if (mTopBannerList.size() == 1 || mTopBannerList.size() == 0) {
@ -6313,7 +6322,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = ""; String type = "";
StringBuffer htmlUrl = new StringBuffer(); StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); htmlUrl.append(HtmlConfig.WISHLIST_URL).append(HtmlConfig.WISHLIST_URL.contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else { } else {
@ -6368,7 +6377,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
String type = ""; String type = "";
StringBuffer htmlUrl = new StringBuffer(); StringBuffer htmlUrl = new StringBuffer();
htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
htmlUrl.append(HtmlConfig.WISHLIST_URL).append(HtmlConfig.WISHLIST_URL.contains("?") ? "&uid=" : "?uid=")
.append(userInfo.getId()).append("&token=").append(userInfo.getToken())
.append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid)
.append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index")
.append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1);
} else { } else {

2
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@ -524,7 +524,7 @@ public class EditProfileActivity extends AbsActivity {
dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() { dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1"; String url = CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
WebViewActivity.forward(mContext, url, false); WebViewActivity.forward(mContext, url, false);
dialog.dismiss(); dialog.dismiss();
} }

58
main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java
View File

@ -196,83 +196,83 @@ public class MyWalletActivity extends AbsActivity {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
//华为 //华为
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
huaWeiFragment1 = new HuaWeiFragment(); huaWeiFragment1 = new HuaWeiFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo"); bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo");
huaWeiFragment1.setArguments(bundle1); huaWeiFragment1.setArguments(bundle1);
huaWeiFragment2 = new HuaWeiFragment(); huaWeiFragment2 = new HuaWeiFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo"); bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo");
huaWeiFragment2.setArguments(bundle2); huaWeiFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
samsungFragment1 = new SamsungFragment(); samsungFragment1 = new SamsungFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment1.setArguments(bundle1); samsungFragment1.setArguments(bundle1);
samsungFragment2 = new SamsungFragment(); samsungFragment2 = new SamsungFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment2.setArguments(bundle2); samsungFragment2.setArguments(bundle2);
} else { } else {
if (payConfig==1){ if (payConfig==1){
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletcoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletgold.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
}else { }else {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
} }
} }
@ -282,24 +282,24 @@ public class MyWalletActivity extends AbsActivity {
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
huaWeiFragment1 = new HuaWeiFragment(); huaWeiFragment1 = new HuaWeiFragment();
@ -309,23 +309,23 @@ public class MyWalletActivity extends AbsActivity {
huaWeiFragment2 = new HuaWeiFragment(); huaWeiFragment2 = new HuaWeiFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo"); bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo");
huaWeiFragment2.setArguments(bundle2); huaWeiFragment2.setArguments(bundle2);
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
samsungFragment1 = new SamsungFragment(); samsungFragment1 = new SamsungFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment1.setArguments(bundle1); samsungFragment1.setArguments(bundle1);
samsungFragment2 = new SamsungFragment(); samsungFragment2 = new SamsungFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
samsungFragment2.setArguments(bundle2); samsungFragment2.setArguments(bundle2);
} else { } else {
Log.i("tss", "不是首充"); Log.i("tss", "不是首充");
@ -333,34 +333,34 @@ public class MyWalletActivity extends AbsActivity {
if (payConfig==1){ if (payConfig==1){
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletcoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletgold.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
}else { }else {
rView.setVisibility(View.VISIBLE); rView.setVisibility(View.VISIBLE);
walletFragment = new WalletFragment(); walletFragment = new WalletFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle.putString("url", CommonAppConfig.HOST + "/h5/Mall/walletbean.html?first_page=1&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
walletFragment.setArguments(bundle); walletFragment.setArguments(bundle);
googleFragment1 = new GoogleFragment(); googleFragment1 = new GoogleFragment();
Bundle bundle1 = new Bundle(); Bundle bundle1 = new Bundle();
bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle1.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment1.setArguments(bundle1); googleFragment1.setArguments(bundle1);
googleFragment2 = new GoogleFragment(); googleFragment2 = new GoogleFragment();
Bundle bundle2 = new Bundle(); Bundle bundle2 = new Bundle();
bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); bundle2.putString("url", CommonAppConfig.HOST + "/h5/Mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=panduo" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
googleFragment2.setArguments(bundle2); googleFragment2.setArguments(bundle2);
} }

2
main/src/main/java/com/yunbao/main/dialog/SigninDialog.java
View File

@ -65,7 +65,7 @@ public class SigninDialog extends AbsDialogFragment {
goto_sign.setOnClickListener(new View.OnClickListener() { goto_sign.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
ARouter.getInstance().build(PATH_REWARD).withString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation(); ARouter.getInstance().build(PATH_REWARD).withString("url", CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation();
dismiss(); dismiss();
} }

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

@ -542,7 +542,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
} else if (i == R.id.btn_gold) { } else if (i == R.id.btn_gold) {
MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮"); MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮");
// mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2)); // mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index"; String url = CommonAppConfig.HOST + "/h5/task/index.html?";
RewardActivity.forward(mContext, url); RewardActivity.forward(mContext, url);
} else if (i == R.id.rt_kefu) { } else if (i == R.id.rt_kefu) {
WebViewActivity.forward(mContext, beanKefu.getHref(), false); WebViewActivity.forward(mContext, beanKefu.getHref(), false);

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

@ -153,7 +153,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
mLevelAnchor.setOnClickListener(new View.OnClickListener() { mLevelAnchor.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0") + "&for"; String url = CommonAppConfig.HOST + "/h5/Level/index.html?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0") + "&for";
WebViewActivity.forward(mContext, url, false); WebViewActivity.forward(mContext, url, false);
} }
}); });
@ -161,7 +161,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
mLevel.setOnClickListener(new View.OnClickListener() { mLevel.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); String url = CommonAppConfig.HOST + "/h5/Level/index.html?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
WebViewActivity.forward(mContext, url, false); WebViewActivity.forward(mContext, url, false);
} }
}); });