yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

H5地址修改

Browse Source
This commit is contained in:
huangjian
2021-01-18 11:18:20 +08:00
parent b7f6366faa
commit af5823f927
15 changed files with 62 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -7,7 +7,7 @@
.externalNativeBuild
.idea
.settings
app/accompany/debug/app-accompany-debug.apk
app/accompany/debug/output.json
app/yinyou/debug/app-accompany-debug.apk
app/yinyou/debug/output.json
*.apk
app/accompany/release/output.json
app/yinyou/release/output.json

6
app/src/main/java/com/yizhuan/erban/UIHelper.java
View File

@@ -171,7 +171,7 @@ public class UIHelper {
public static void showMonsterResult(Context context, String monsterId) {
CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL +
"/modules/monster/index.html?monsterId=" + monsterId);
"/yinyou/modules/monster/index.html?monsterId=" + monsterId);
}
/**
@@ -190,7 +190,7 @@ public class UIHelper {
*/
public static void showRecommendPosH5(Context context) {
String cardUrl = UriProvider.JAVA_WEB_URL +
"/modules/recommend-card/index.html";
"/yinyou/modules/recommend-card/index.html";
CommonWebViewActivity.start(context, cardUrl);
}
@@ -225,6 +225,6 @@ public class UIHelper {
}
public static void openContactUs(Context context) {
CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/modules/contact/contact.html");
CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/yinyou/modules/contact/contact.html");
}
}

2
app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java
View File

@@ -71,7 +71,7 @@ public class MyRecommendCardActivity extends BaseActivity {
@Override
public void performAction(View view) {
CommonWebViewActivity.start(context, UriProvider.JAVA_WEB_URL +
"/modules/recommend-card/help.html");
"/yinyou/modules/recommend-card/help.html");
}
});
}

2
app/src/main/java/com/yizhuan/erban/home/fragment/RankingFragment.java
View File

@@ -86,7 +86,7 @@ public class RankingFragment extends BaseBindingFragment<FragmentRankingBinding>
@Override
protected void onInitArguments(Bundle bundle) {
url = UriProvider.JAVA_WEB_URL + "/modules/erbanRank/index.html";
url = UriProvider.JAVA_WEB_URL + "/yinyou/modules/erbanRank/index.html";
mPosition = 1;
}

2
app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java
View File

@@ -124,7 +124,7 @@ public class RadishRecordActivity extends BaseMvpActivity<IRadishRecordView, Rad
mTitleBar.addAction(new TitleBar.ImageAction(R.mipmap.common_ic_help_white) {
@Override
public void performAction(View view) {
CommonWebViewActivity.start(RadishRecordActivity.this, UriProvider.JAVA_WEB_URL + "/modules/rule/radish.html");
CommonWebViewActivity.start(RadishRecordActivity.this, UriProvider.JAVA_WEB_URL + "/yinyou/modules/rule/radish.html");
}
});
}

2
app/src/main/java/com/yizhuan/erban/radish/signin/view/RuleDialog.java
View File

@@ -31,6 +31,6 @@ public class RuleDialog extends BaseBindingDialog<DialogRuleBinding> {
binding.wvRule.setWebViewClient(new WebViewClient());
// 设置Webview的user-agent
binding.wvRule.getSettings().setUserAgentString(binding.wvRule.getSettings().getUserAgentString() + " tutuAppAndroid erbanAppAndroid");
binding.wvRule.loadUrl(UriProvider.JAVA_WEB_URL + "/modules/rule/rule-popup.html");
binding.wvRule.loadUrl(UriProvider.JAVA_WEB_URL + "/yinyou/modules/rule/rule-popup.html");
}
}

2
app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeActivity.java
View File

@@ -18,7 +18,7 @@ public class PatriarchModeActivity extends BaseBindingActivity<ActivityPatriarch
@Override
protected void init() {
initTitleBar("青少年模式");
mBinding.tvPlan.setOnClickListener(v -> CommonWebViewActivity.start(PatriarchModeActivity.this, UriProvider.IM_SERVER_URL + "/accompany/activity/activemodel/index.html?code=jingwangxingdong"));
mBinding.tvPlan.setOnClickListener(v -> CommonWebViewActivity.start(PatriarchModeActivity.this, UriProvider.IM_SERVER_URL + "/yinyou/activity/activemodel/index.html?code=jingwangxingdong"));
mBinding.tvOpen.setOnClickListener(v -> start(PatriarchPwdActivity.class));
mBinding.tvPlan.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线

1
app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java
View File

@@ -203,6 +203,7 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
tvSearch = findViewById(R.id.tv_search);
tvSearch.setOnClickListener(this);
tvSearch.requestLayout();
ivClearText = findViewById(R.id.iv_clear_text);
ivClearText.setOnClickListener(this);

10
app/src/main/java/com/yizhuan/erban/ui/wallet/RedBagActivity.java
View File

@@ -199,19 +199,19 @@ public class RedBagActivity extends BaseActivity implements View.OnClickListener
String url = null;
switch (v.getId()) {
case R.id.tv_red_rank:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/rankList.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/rankList.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.tv_red_rule:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/fight.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/fight.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.tv_red_method:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/secret.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/secret.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.ll_people:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/invitation.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/invitation.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.ll_share_bonus:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/revenue.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/revenue.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.tv_withdraw:
// if (redPacketInfo == null || redPacketInfo.getPacketNum() < 100) {

10
app/src/main/java/com/yizhuan/erban/ui/wallet/RedBagFragment.java
View File

@@ -178,19 +178,19 @@ public class RedBagFragment extends BaseFragment implements View.OnClickListener
String url = null;
switch (v.getId()) {
case R.id.rly_red_rank:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/rankList.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/rankList.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.rly_red_rule:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/fight.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/fight.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.rly_red_method:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/secret.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/secret.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.rly_people:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/invitation.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/invitation.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.rly_share_bonus:
url = UriProvider.IM_SERVER_URL + "/modules/bonus/revenue.html" + "?uid=" + AuthModel.get().getCurrentUid();
url = UriProvider.IM_SERVER_URL + "/yinyou/modules/bonus/revenue.html" + "?uid=" + AuthModel.get().getCurrentUid();
break;
case R.id.img_withdraw:
isRequest = true;

6
app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java
View File

@@ -156,15 +156,15 @@ public class MonsterDialog extends BaseDialog implements View.OnClickListener {
case R.id.tv_msg:
long beforeAppearSeconds = dataBean.getBeforeAppearSeconds();
if (beforeAppearSeconds >= 30) {
CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/modules/monster/intro.html");
CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/yinyou/modules/monster/intro.html");
} else if (beforeAppearSeconds < 30 && beforeAppearSeconds > 15) {
CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/modules/monster/intro.html");
CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/yinyou/modules/monster/intro.html");
} else if (beforeAppearSeconds <= 15) {
AVRoomActivity.start(getContext(), dataBean.getAppearRoomUid());
}
if (dataBean.getMonsterStatus() == MonsterInfo.MONSTER_STATUS_DID_DEAD) {
CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL +
"/modules/monster/index.html?monsterId=" + dataBean.getMonsterId());
"/yinyou/modules/monster/index.html?monsterId=" + dataBean.getMonsterId());
}
break;
}

2
app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java
View File

@@ -394,7 +394,7 @@ public class WithdrawActivity extends BaseActivity {
});
tvWithdrawRule.setOnClickListener(v -> CommonWebViewActivity.start(
context, UriProvider.IM_SERVER_URL + "/modules/guide/output.html"));
context, UriProvider.IM_SERVER_URL + "/yinyou/modules/guide/output.html"));
//切换类型
tvWithdrawType.setVisibility(View.GONE);

2
app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawRuleActivity.java
View File

@@ -15,6 +15,6 @@ public class WithdrawRuleActivity extends BaseActivity {
setContentView(R.layout.activity_withdraw_rule);
initTitleBar("提现规则");
mWebView = (WebView) findViewById(R.id.wv_view);
mWebView.loadUrl(UriProvider.IM_SERVER_URL+"/modules/guide/withdraw.html");
mWebView.loadUrl(UriProvider.IM_SERVER_URL+"/yinyou/modules/guide/withdraw.html");
}
}

12
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -165,7 +165,7 @@ public class XChatConstants {
/**
* 分享房间 URL
*/
public static final String SHARE_ROOM_URL = "/accompany/modules/share_room/index.html?shareUid=";
public static final String SHARE_ROOM_URL = "/yinyou/modules/share_room/index.html?shareUid=";
/**
* 分享家族文本
@@ -180,7 +180,7 @@ public class XChatConstants {
/**
* 分享家族 URL
*/
public static final String SHARE_FAMILY_URL = "/modules/share/share_family.html";
public static final String SHARE_FAMILY_URL = "/yinyou/modules/share/share_family.html";
/**
* 分享群组文本
@@ -195,17 +195,17 @@ public class XChatConstants {
/**
* 分享群组 URL
*/
public static final String SHARE_TEAM_URL = "/modules/share/share_family.html";
public static final String SHARE_TEAM_URL = "/yinyou/modules/share/share_family.html";
/**
* 分享群组 URL
*/
public static final String SHARE_WORLD_DYNAMIC_URL = "/modules/world/share-page/index.html";
public static final String SHARE_WORLD_DYNAMIC_URL = "/yinyou/modules/world/share-page/index.html";
/**
* 游戏排行榜 URL
*/
public static final String GAME_ROOK = "/modules/erbanRank/game_rank.html?type=week";
public static final String GAME_ROOK = "/yinyou/modules/erbanRank/game_rank.html?type=week";
/**
* 系统消息那个用户的UID
@@ -222,7 +222,7 @@ public class XChatConstants {
/**
* 登录页面「如何登录」对应的 H5 页面
*/
public static final String LOGIN_ERBAN_ACCOUNT_URL = "/modules/rule/login_tips.html";
public static final String LOGIN_ERBAN_ACCOUNT_URL = "/yinyou/modules/rule/login_tips.html";
public static final String ROOM_INTRODUCTION = "可点击房间话题查看本房间公告";
public static final String SHOW = "show";

126
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
View File

@@ -48,11 +48,6 @@ public class UriProvider {
public static String JAVA_WEB_URL = "http://www.daxiaomao.com";
public static String IM_SERVER_URL = "https://www.daxiaomao.com";
public static String getGroupResourceBaseUri() {
return JAVA_WEB_URL.concat("/app/service/resource/list");
}
/**
* @return
*/
@@ -60,67 +55,48 @@ public class UriProvider {
return IM_SERVER_URL.concat("/activity/double12/index.html");
}
/**
* 贵族订单页面
*
* @return -
*/
public static String getNobleOrderPage() {
return IM_SERVER_URL.concat("/modules/noble/order.html");
}
/**
* 获取房间背景(有动效)
*
* @return -
*/
public static String getRoomBg() {
return IM_SERVER_URL.concat("/modules/noble/roomBgList.html");
return IM_SERVER_URL.concat("/yinyou/modules/noble/roomBgList.html");
}
/**
* 获取贵族推荐页面
*
* @return -
*/
public static String getNobleIntroducePage() {
return IM_SERVER_URL.concat("/modules/noble/intro.html");
}
/**
* 贵族介绍页
*/
public static String getNobleIntro() {
return IM_SERVER_URL.concat("/modules/nobles/intro.html");
return IM_SERVER_URL.concat("/yinyou/modules/nobles/intro.html");
}
/**
* 贵族介绍页
*/
public static String getRanking() {
return IM_SERVER_URL.concat("/accompany/modules/rank/index.html#/rank");
return IM_SERVER_URL.concat("/yinyou/modules/rank/index.html#/rank");
}
/**
* 帮助页
*/
public static String getHelp() {
return IM_SERVER_URL.concat("/accompany/modules/rule/guide.html");
return IM_SERVER_URL.concat("/yinyou/modules/rule/guide.html");
}
/**
* 等级界面
*/
public static String getUserLevelUrl() {
return JAVA_WEB_URL.concat("/accompany/modules/level/index.html");
return JAVA_WEB_URL.concat("/yinyou/modules/level/index.html");
}
/**
* 邀请好友
*/
public static String getShareUrl() {
return JAVA_WEB_URL.concat("/accompany/modules/inviteCode/index.html");
return JAVA_WEB_URL.concat("/yinyou/modules/inviteCode/index.html");
}
@@ -128,7 +104,7 @@ public class UriProvider {
* 等级界面
*/
public static String getUserCharmLevelUrl() {
return JAVA_WEB_URL.concat("/accompany/modules/charm/index.html");
return JAVA_WEB_URL.concat("/yinyou/modules/charm/index.html");
}
@@ -138,7 +114,7 @@ public class UriProvider {
* @return
*/
public static String getErbanTopMessageUrl() {
return JAVA_WEB_URL.concat("/modules/headNews/index.html");
return JAVA_WEB_URL.concat("/yinyou/modules/headNews/index.html");
}
/**
@@ -147,7 +123,7 @@ public class UriProvider {
* @return
*/
public static String getRelatedToMeHeadLineUrl() {
return JAVA_WEB_URL.concat("/modules/headNews/index.html?atMe=1");
return JAVA_WEB_URL.concat("/yinyou/modules/headNews/index.html?atMe=1");
}
/**
@@ -156,7 +132,7 @@ public class UriProvider {
* @return
*/
public static String getCreateFamilyUrl() {
return JAVA_WEB_URL.concat("/modules/family/create.html");
return JAVA_WEB_URL.concat("/yinyou/modules/family/create.html");
}
/**
@@ -165,7 +141,7 @@ public class UriProvider {
* @return
*/
public static String getFamilyInstructionUrl() {
return JAVA_WEB_URL.concat("/modules/family/handbook.html");
return JAVA_WEB_URL.concat("/yinyou/modules/family/handbook.html");
}
/**
@@ -174,16 +150,7 @@ public class UriProvider {
* @return
*/
public static String getFamilyCurrencyHelpUrl() {
return JAVA_WEB_URL.concat("/modules/family/faq.html");
}
/**
* 举报页
*
* @return
*/
public static String getReportPageUrl() {
return JAVA_WEB_URL.concat("/modules/report/index.html");
return JAVA_WEB_URL.concat("/yinyou/modules/family/faq.html");
}
/**
@@ -192,7 +159,7 @@ public class UriProvider {
* @return
*/
public static String getReportWallUrl() {
return JAVA_WEB_URL.concat("/modules/inform/inform-list.html ");
return JAVA_WEB_URL.concat("/yinyou/modules/inform/inform-list.html");
}
/**
@@ -201,7 +168,7 @@ public class UriProvider {
* @return
*/
public static String getPublicChatHallHelpUrl() {
return JAVA_WEB_URL.concat("/modules/inform/help.html");
return JAVA_WEB_URL.concat("/yinyou/modules/inform/help.html");
}
/**
@@ -210,7 +177,7 @@ public class UriProvider {
* @return
*/
public static String getUserProtocolUrl() {
return JAVA_WEB_URL.concat("/accompany/modules/rule/protocol.html");
return JAVA_WEB_URL.concat("/yinyou/modules/rule/protocol.html");
}
/**
@@ -219,14 +186,14 @@ public class UriProvider {
* @return
*/
public static String getUserReportUrl() {
return JAVA_WEB_URL.concat("/accompany/modules/inform/index.html");
return JAVA_WEB_URL.concat("/yinyou/modules/inform/index.html");
}
/**
* 话题-说明
*/
public static String getMiniWorldRuleUrl() {
return JAVA_WEB_URL.concat("/modules/world-rule/index.html");
return JAVA_WEB_URL.concat("/yinyou/modules/world-rule/index.html");
}
/**
@@ -235,7 +202,7 @@ public class UriProvider {
* @return
*/
public static String getTutuRealNamePage() {
return JAVA_WEB_URL.concat("/accompany/modules/identity/new.html");
return JAVA_WEB_URL.concat("/yinyou/modules/identity/new.html");
}
/**
@@ -244,7 +211,7 @@ public class UriProvider {
* @return
*/
public static String getMyIncomeUrl() {
return JAVA_WEB_URL.concat("/accompany/modules/myincome/index.html#/MyIncome");
return JAVA_WEB_URL.concat("/yinyou/modules/myincome/index.html#/MyIncome");
}
/**
@@ -253,16 +220,7 @@ public class UriProvider {
* @return
*/
public static String getRechargeAgreementUrl() {
return JAVA_WEB_URL.concat("/accompany/modules/rule/rechargeAgreement.html");
}
/**
* 音游专属，101技能认证页面
*
* @return
*/
public static String getTutuAprove() {
return JAVA_WEB_URL.concat("/activity/tutu101-2/index.html");
return JAVA_WEB_URL.concat("/yinyou/modules/rule/rechargeAgreement.html");
}
/**
@@ -271,7 +229,7 @@ public class UriProvider {
* @return
*/
public static String getMentoringRelationshipGuide() {
return JAVA_WEB_URL.concat("/modules/strategy/strategy.html");
return JAVA_WEB_URL.concat("/yinyou/modules/strategy/strategy.html");
}
/**
@@ -280,11 +238,11 @@ public class UriProvider {
* @return
*/
public static String getMentorRankingList() {
return JAVA_WEB_URL.concat("/modules/strategy/teacher-list.html");
return JAVA_WEB_URL.concat("/yinyou/modules/strategy/teacher-list.html");
}
public static String getCommnunityNorms() {
return JAVA_WEB_URL.concat("/modules/rule/community-norms.html");
return JAVA_WEB_URL.concat("/yinyou/modules/rule/community-norms.html");
}
/**
@@ -293,11 +251,7 @@ public class UriProvider {
* @return
*/
public static String getPrivacyAgreement() {
return JAVA_WEB_URL.concat("/accompany/modules/rule/privacy-wap.html");
}
public static String getUserAgreement() {
return JAVA_WEB_URL.concat("/modules/guide/protocol.html");
return JAVA_WEB_URL.concat("/yinyou/modules/rule/privacy-wap.html");
}
public static String getLinkUrl(String linkUrl) {
@@ -307,41 +261,27 @@ public class UriProvider {
return JAVA_WEB_URL.concat(linkUrl);
}
/**
* 主播认证
*
*/
public static String getAnchorCertification() {
return JAVA_WEB_URL.concat("/modules/certification/index.html");
}
/**
* 个人魅力榜
*
*/
public static String getPersonalCharismaRank() {
return JAVA_WEB_URL.concat("/accompany/modules/charm/index.html");
}
/**
* 宝箱排行
*
*/
public static String getBoxRank() {
return JAVA_WEB_URL.concat("/accompany/modules/rank/index.html#/wishingWellRank");
return JAVA_WEB_URL.concat("/yinyou/modules/charm/index.html");
}
/**
* 宝箱帮助
*
*/
public static String getBoxHelp() {
return JAVA_WEB_URL.concat("/accompany/modules/rank/index.html#/wishingWellRule");
return JAVA_WEB_URL.concat("/yinyou/modules/rank/index.html#/wishingWellRule");
}
/**
* 宝箱记录
*
*/
public static String getBoxHistory() {
return JAVA_WEB_URL.concat("/accompany/modules/rank/index.html#/wishingWellRecord");
return JAVA_WEB_URL.concat("/yinyou/modules/rank/index.html#/wishingWellRecord");
}
/**
@@ -349,7 +289,7 @@ public class UriProvider {
*
*/
public static String getBoxKey() {
return JAVA_WEB_URL.concat("/accompany/activity/explore/index.html");
return JAVA_WEB_URL.concat("/yinyou/activity/explore/index.html");
}
/**
@@ -361,12 +301,4 @@ public class UriProvider {
return JAVA_WEB_URL.concat("accompany/modules/rule/red-packet-rule.html");
}
/**
* 福袋玩法说明
*
* @return
*/
public static String getLuckyBagRule() {
return JAVA_WEB_URL.concat("accompany/modules/luckyBag/index.html");
}
}