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

域名修改

Browse Source
This commit is contained in:
huangjian
2023-03-15 10:36:51 +08:00
parent abbe516b3a
commit d26205bd1f
26 changed files with 129 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@@ -136,7 +136,8 @@ android {
buildTypes {
release {
buildConfigField "String", "BASE_URL", "\"https://yinyou.api.shengxuanwangluo.com/\""
buildConfigField "String", "BASE_URL", "\"https://api.nnbc123.cn/\""
buildConfigField "String", "WEB_URL", "\"https://h5.nnbc123.cn/\""
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
@@ -147,10 +148,11 @@ android {
}
debug {
buildConfigField "String", "BASE_URL", "\"http://106.55.241.216/\""
buildConfigField "String", "BASE_URL", "\"https://api.nnbc123.cn/\""
buildConfigField "String", "WEB_URL", "\"https://h5.nnbc123.cn/\""
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "\"https://api.nnbc123.cn/\""
buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.nnbc123.cn/\""
minifyEnabled false
shrinkResources false
signingConfig signingConfigs.v2

10
app/src/main/java/com/nnbc123/app/UIHelper.java
View File

@@ -153,8 +153,8 @@ public class UIHelper {
}
public static void showMonsterResult(Context context, String monsterId) {
CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL +
"/yinyou/modules/monster/index.html?monsterId=" + monsterId);
CommonWebViewActivity.start(context, UriProvider.WEB_URL +
"/yinmeng/modules/monster/index.html?monsterId=" + monsterId);
}
/**
@@ -172,8 +172,8 @@ public class UIHelper {
* 跳转推荐页h5
*/
public static void showRecommendPosH5(Context context) {
String cardUrl = UriProvider.JAVA_WEB_URL +
"/yinyou/modules/recommend-card/index.html";
String cardUrl = UriProvider.WEB_URL +
"/yinmeng/modules/recommend-card/index.html";
CommonWebViewActivity.start(context, cardUrl);
}
@@ -208,6 +208,6 @@ public class UIHelper {
}
public static void openContactUs(Context context) {
CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/yinyou/modules/contact/contact.html");
CommonWebViewActivity.start(context, UriProvider.WEB_URL + "/yinmeng/modules/contact/contact.html");
}
}

34
app/src/main/java/com/nnbc123/app/application/XChatApplication.java
View File

@@ -48,11 +48,9 @@ import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.nimlib.sdk.util.NIMUtil;
import com.nnbc123.app.qiyukefu.CustomerServerHelper;
import com.nnbc123.app.qiyukefu.GlideImageLoader;
import com.opensource.svgaplayer.SVGAParser;
import com.orhanobut.logger.AndroidLogAdapter;
import com.orhanobut.logger.Logger;
import com.qiyukf.unicorn.api.Unicorn;
import com.scwang.smartrefresh.header.MaterialHeader;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
@@ -206,7 +204,7 @@ public class XChatApplication extends Application {
public static void initOtherSDK() {
if (isInitOtherSDK) return;
isInitOtherSDK = true;
Context context = BasicConfig.INSTANCE.getAppContext();
Context context = instance;
Application application = (Application) context.getApplicationContext();
// 初始化 sp
long startTime = System.currentTimeMillis();
@@ -302,8 +300,7 @@ public class XChatApplication extends Application {
UMConfigure.setEncryptEnabled(true);
// 集成测试
UMConfigure.setLogEnabled(BuildConfig.DEBUG);
}
else {
} else {
CustomerServerHelper.init(instance, null);
}
@@ -316,7 +313,7 @@ public class XChatApplication extends Application {
* 初始化linkedMe
*/
private static void initLinkedMe() {
LinkedME.getInstance(BasicConfig.INSTANCE.getAppContext(), XChatConstants.LINKED_ME_KEY);
LinkedME.getInstance(instance, XChatConstants.LINKED_ME_KEY);
if (isDebug()) {
//设置debug模式下打印LinkedME日志
LinkedME.getInstance().setDebug();
@@ -348,13 +345,13 @@ public class XChatApplication extends Application {
"HUAWEI".toLowerCase().equals(brand.toLowerCase())
|| "HONOR".toLowerCase().equals(brand.toLowerCase())
|| "HUAWEI".equals(manufacturer))) {
LoadedApkHuaWei.hookHuaWeiVerifier((Application) BasicConfig.INSTANCE.getAppContext().getApplicationContext());
LoadedApkHuaWei.hookHuaWeiVerifier((Application) instance.getApplicationContext());
}
}
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
public static void registerActivityLifecycleCallback(Application.ActivityLifecycleCallbacks callbacks) {
((Application) BasicConfig.INSTANCE.getAppContext().getApplicationContext()).registerActivityLifecycleCallbacks(callbacks);
((Application) instance.getApplicationContext()).registerActivityLifecycleCallbacks(callbacks);
}
/**
@@ -394,7 +391,7 @@ public class XChatApplication extends Application {
// 如果第三方 APP 需要缓存清理功能， 清理这个目录下面个子目录的内容即可。
String sdkPath = null;
try {
sdkPath = Environment.getExternalStorageDirectory() + "/" + BasicConfig.INSTANCE.getAppContext().getPackageName() + "/nim";
sdkPath = Environment.getExternalStorageDirectory() + "/" + instance.getPackageName() + "/nim";
} catch (ArrayIndexOutOfBoundsException e) {
}
@@ -405,7 +402,7 @@ public class XChatApplication extends Application {
// 配置附件缩略图的尺寸大小。表示向服务器请求缩略图文件的大小
// 该值一般应根据屏幕尺寸来确定， 默认值为 Screen.width / 2
int widthPixels = BasicConfig.INSTANCE.getAppContext().getResources().getDisplayMetrics().widthPixels;
int widthPixels = instance.getResources().getDisplayMetrics().widthPixels;
options.thumbnailSize = widthPixels / 2;
// // save cache，留做切换账号备用
DemoCache.setNotificationConfig(config);
@@ -527,23 +524,28 @@ public class XChatApplication extends Application {
private static void init(String channel) {
initNimUIKit();
UriProvider.initUri(BuildConfig.BASE_URL_DEBUG, BuildConfig.BASE_URL_STAGING, BuildConfig.BASE_URL_RELEASE);
SVGAParser.Companion.shareParser().init(BasicConfig.INSTANCE.getAppContext());
UriProvider.initUri(
BuildConfig.BASE_URL_DEBUG,
BuildConfig.BASE_URL_STAGING,
BuildConfig.BASE_URL_RELEASE,
BuildConfig.WEB_URL
);
SVGAParser.Companion.shareParser().init(instance);
try {
/** svga动画缓存路径 */
File cacheDir = new File(BasicConfig.INSTANCE.getAppContext().getApplicationContext().getExternalCacheDir(), "http");
File cacheDir = new File(instance.getExternalCacheDir(), "http");
if (!cacheDir.exists()) cacheDir.mkdirs();
HttpResponseCache.install(cacheDir, 1024 * 1024 * 128);
} catch (IOException e) {
Log.e(TAG, "testtest", e);
}
initRxNet(BasicConfig.INSTANCE.getAppContext(), UriProvider.JAVA_WEB_URL);
initRxNet(instance, UriProvider.WEB_URL);
/**
* 使用到realm 数据库，这里配置数据库 这里必须先于模块初始化前进行初始化配置
*/
Realm.init(BasicConfig.INSTANCE.getAppContext());
Realm.init(instance);
RealmConfiguration config = new RealmConfiguration.Builder()
.name("accompany.realm")
.deleteRealmIfMigrationNeeded()
@@ -591,7 +593,7 @@ public class XChatApplication extends Application {
private static void initNimUIKit() {
// 初始化
NimUIKit.init(BasicConfig.INSTANCE.getAppContext());
NimUIKit.init(instance);
}
/**

4
app/src/main/java/com/nnbc123/app/avroom/recommendcard/MyRecommendCardActivity.java
View File

@@ -70,8 +70,8 @@ public class MyRecommendCardActivity extends BaseActivity {
mTitleBar.addAction(new TitleBar.ImageAction(R.drawable.ic_rcmd_help) {
@Override
public void performAction(View view) {
CommonWebViewActivity.start(context, UriProvider.JAVA_WEB_URL +
"/yinyou/modules/recommend-card/help.html");
CommonWebViewActivity.start(context, UriProvider.WEB_URL +
"/yinmeng/modules/recommend-card/help.html");
}
});
}

2
app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java
View File

@@ -154,7 +154,7 @@ public abstract class BaseLoginAct extends BaseActivity {
if (!canClick) {
return;
}
CommonWebViewActivity.start(BaseLoginAct.this, UriProvider.JAVA_WEB_URL + XChatConstants.LOGIN_ERBAN_ACCOUNT_URL);
CommonWebViewActivity.start(BaseLoginAct.this, UriProvider.WEB_URL + XChatConstants.LOGIN_ERBAN_ACCOUNT_URL);
}
}, start, start + 5, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);

2
app/src/main/java/com/nnbc123/app/home/fragment/HomeFragment.kt
View File

@@ -37,7 +37,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener {
R.id.iv_my_room -> {
StatisticManager.Instance()
.onEvent(StatisticsProtocol.EVENT_HOME_MY_ROOM_CLICK, "首页_我的房间")
OpenRoomHelper.openRoom(baseActivity)
OpenRoomHelper.openHomePartyRoom(baseActivity)
}
}
}

2
app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt
View File

@@ -373,7 +373,7 @@ class MeFragment : BaseFragment(), View.OnClickListener {
StatisticManager.Instance()
.onEvent(StatisticsProtocol.EVENT_USERCENTER_RECHARGE_CARD_CLICK, "个人中心充值卡片点击")
}
R.id.me_item_room -> OpenRoomHelper.openRoom(requireActivity() as BaseActivity)
R.id.me_item_room -> OpenRoomHelper.openHomePartyRoom(requireActivity() as BaseActivity)
R.id.me_item_level -> CommonWebViewActivity.start(
mContext,
UriProvider.getUserLevelUrl()

2
app/src/main/java/com/nnbc123/app/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 + "/yinyou/modules/rule-yinyou/radish.html");
CommonWebViewActivity.start(RadishRecordActivity.this, UriProvider.WEB_URL + "/yinmeng/modules/rule/radish.html");
}
});
}

2
app/src/main/java/com/nnbc123/app/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 + "/yinyou/modules/rule-yinyou/rule-popup.html");
binding.wvRule.loadUrl(UriProvider.WEB_URL + "/yinmeng/modules/rule/rule-popup.html");
}
}

2
app/src/main/java/com/nnbc123/app/ui/im/RouterHandler.java
View File

@@ -285,7 +285,7 @@ public class RouterHandler {
case RouterType.MY_ROOM:
//我的房间,开房
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK, "我页_进入我的房间");
OpenRoomHelper.openRoom((BaseActivity) context);
OpenRoomHelper.openHomePartyRoom((BaseActivity) context);
break;
case RouterType.COLLECTION_ROOM:
//收藏的房间

6
app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderText.java
View File

@@ -29,7 +29,7 @@ import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
import java.util.Map;
import static com.nnbc123.core.UriProvider.IM_SERVER_URL;
import static com.nnbc123.core.UriProvider.WEB_URL;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_CAR_EXPIRE;
/**
@@ -126,11 +126,11 @@ public class MsgViewHolderText extends MsgViewHolderBase {
if (mNobleAttachment != null) {
switch (mNobleAttachment.mSecond) {
case CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GOOD_NUMBER_INACTIVE:
CommonWebViewActivity.start(mTvMsg.getContext(), IM_SERVER_URL + "modules/nobles/numApply.html");
CommonWebViewActivity.start(mTvMsg.getContext(), WEB_URL + "modules/nobles/numApply.html");
break;
case CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOBLE_END:
//http://beta.tutuyuyin.com/modules/nobles/order.html?nobleIndex=1
CommonWebViewActivity.start(mTvMsg.getContext(), IM_SERVER_URL + "modules/nobles/order.html");
CommonWebViewActivity.start(mTvMsg.getContext(), WEB_URL + "modules/nobles/order.html");
break;
case CustomAttachment.CUSTOM_MESS_SUB_HADEXPIRE:
CommonWebViewActivity.start(mTvMsg.getContext(), UriProvider.getNobleIntro());

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

@@ -25,7 +25,7 @@ public static void start(Context context) {
@Override
protected void init() {
initWhiteTitleBar("青少年模式");
mBinding.tvPlan.setOnClickListener(v -> CommonWebViewActivity.start(PatriarchModeActivity.this, UriProvider.IM_SERVER_URL + "/yinyou/activity/cleanNet/index.html"));
mBinding.tvPlan.setOnClickListener(v -> CommonWebViewActivity.start(PatriarchModeActivity.this, UriProvider.WEB_URL + "/yinmeng/activity/cleanNet/index.html"));
mBinding.tvOpen.setOnClickListener(v -> start(PatriarchPwdActivity.class));
mBinding.tvPlan.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线

2
app/src/main/java/com/nnbc123/app/ui/webview/CommonWebViewActivity.java
View File

@@ -370,7 +370,7 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
for (int i = length - 1; i >=0 ; i--) {
String lastUrl = list.getItemAtIndex(i).getUrl();
steps--;
if (lastUrl != null && lastUrl.startsWith(UriProvider.JAVA_WEB_URL)) {
if (lastUrl != null && lastUrl.startsWith(UriProvider.WEB_URL)) {
view.goBackOrForward(steps);
break;
}

8
app/src/main/java/com/nnbc123/app/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 + "/yinyou/modules/monster/intro.html");
CommonWebViewActivity.start(getContext(), UriProvider.WEB_URL + "/yinmeng/modules/monster/intro.html");
} else if (beforeAppearSeconds < 30 && beforeAppearSeconds > 15) {
CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/yinyou/modules/monster/intro.html");
CommonWebViewActivity.start(getContext(), UriProvider.WEB_URL + "/yinmeng/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 +
"/yinyou/modules/monster/index.html?monsterId=" + dataBean.getMonsterId());
CommonWebViewActivity.start(getContext(), UriProvider.WEB_URL +
"/yinmeng/modules/monster/index.html?monsterId=" + dataBean.getMonsterId());
}
break;
}

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

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

2
app/src/main/java/com/nnbc123/app/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+"/yinyou/modules/guide/withdraw.html");
mWebView.loadUrl(UriProvider.WEB_URL +"/yinmeng/modules/guide/withdraw.html");
}
}

BIN
app/src/main/res/drawable-xhdpi/ic_room_bottom_play.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_vip_room_bottom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_gift_value.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 832 B

After

Width:  |  Height:  |  Size: 959 B

BIN
app/src/main/res/drawable-xhdpi/icon_room_close_mic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_open_mic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_send_gift.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

2
app/src/module_community/java/com/nnbc123/app/community/helper/ShareDynamicHelper.java
View File

@@ -69,7 +69,7 @@ public class ShareDynamicHelper {
String imageUrl = bean.getShareCover();
int imageWidth = UIUtil.dip2px(BasicConfig.INSTANCE.getAppContext(), 50);
imageUrl = ImageLoadUtilsV2.getSizeUrl(imageUrl, imageWidth);
String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_WORLD_DYNAMIC_URL +
String siteUrl = UriProvider.WEB_URL + XChatConstants.SHARE_WORLD_DYNAMIC_URL +
"?uid=" + AuthModel.get().getCurrentUid() +
"&dynamicId=" + bean.getDynamicId() +
"&worldId=" + worldId;

140
core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java
View File

@@ -12,8 +12,8 @@ public class UriProvider {
/**
* 默认以下生产环境地址
*/
public static String JAVA_WEB_URL = "https://yinyou.api.shengxuanwangluo.com/";
public static String IM_SERVER_URL = "https://yinyou.api.shengxuanwangluo.com/";
public static String WEB_URL = "https://h5.nnbc123.cn/";
public static String API_URL = "https://api.nnbc123.cn/";
/**
* 初始化URL
@@ -22,30 +22,30 @@ public class UriProvider {
* @param serverStaging
* @param serverRelease
*/
public static void initUri(String serverDebug, String serverStaging, String serverRelease) {
public static void initUri(String serverDebug, String serverStaging, String serverRelease, String webUrl) {
Env.EnvType envType = Env.getCurrentEnv();
if (envType == Env.EnvType.Debug) {
initUrl(serverDebug);
initUrl(serverDebug, webUrl);
} else if (envType == Env.EnvType.Staging) {
initUrl(serverStaging);
initUrl(serverStaging, webUrl);
} else if (envType == Env.EnvType.Release) {
initUrl(serverRelease);
initUrl(serverRelease, webUrl);
} else {
initUrl(serverDebug);
initUrl(serverDebug, webUrl);
}
}
private static void initUrl(String url) {
JAVA_WEB_URL = url;
IM_SERVER_URL = url;
private static void initUrl(String apiUrl, String webUrl) {
WEB_URL = webUrl;
API_URL = apiUrl;
}
/**
* @return
*/
public static String getLotteryActivityPage() {
return IM_SERVER_URL.concat("/activity/double12/index.html");
return WEB_URL.concat("/activity/double12/index.html");
}
/**
@@ -54,42 +54,42 @@ public class UriProvider {
* @return -
*/
public static String getRoomBg() {
return IM_SERVER_URL.concat("/yinyou/modules/noble/roomBgList.html");
return WEB_URL.concat("/yinmeng/modules/noble/roomBgList.html");
}
/**
* 贵族介绍页
*/
public static String getNobleIntro() {
return IM_SERVER_URL.concat("/yinyou/modules/nobles/intro.html");
return WEB_URL.concat("/yinmeng/modules/nobles/intro.html");
}
/**
* 贵族介绍页
*/
public static String getRanking() {
return IM_SERVER_URL.concat("/yinyou/modules/rank/index.html#/rank");
return WEB_URL.concat("/yinmeng/modules/rank/index.html#/rank");
}
/**
* 帮助页
*/
public static String getHelp() {
return IM_SERVER_URL.concat("/yinyou/modules/rule-yinyou/guide.html");
return WEB_URL.concat("/yinmeng/modules/rule/guide.html");
}
/**
* 等级界面
*/
public static String getUserLevelUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/level/index.html");
return WEB_URL.concat("/yinmeng/modules/level/index.html");
}
/**
* 邀请好友
*/
public static String getShareUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/inviteCode/index.html");
return WEB_URL.concat("/yinmeng/modules/inviteCode/index.html");
}
@@ -97,7 +97,7 @@ public class UriProvider {
* 等级界面
*/
public static String getUserCharmLevelUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/charm/index.html");
return WEB_URL.concat("/yinmeng/modules/charm/index.html");
}
@@ -107,7 +107,7 @@ public class UriProvider {
* @return
*/
public static String getErbanTopMessageUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/headNews/index.html");
return WEB_URL.concat("/yinmeng/modules/headNews/index.html");
}
/**
@@ -116,7 +116,7 @@ public class UriProvider {
* @return
*/
public static String getRelatedToMeHeadLineUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/headNews/index.html?atMe=1");
return WEB_URL.concat("/yinmeng/modules/headNews/index.html?atMe=1");
}
/**
@@ -125,7 +125,7 @@ public class UriProvider {
* @return
*/
public static String getCreateFamilyUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/family/create.html");
return WEB_URL.concat("/yinmeng/modules/family/create.html");
}
/**
@@ -134,7 +134,7 @@ public class UriProvider {
* @return
*/
public static String getFamilyInstructionUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/family/handbook.html");
return WEB_URL.concat("/yinmeng/modules/family/handbook.html");
}
/**
@@ -143,7 +143,7 @@ public class UriProvider {
* @return
*/
public static String getFamilyCurrencyHelpUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/family/faq.html");
return WEB_URL.concat("/yinmeng/modules/family/faq.html");
}
/**
@@ -152,7 +152,7 @@ public class UriProvider {
* @return
*/
public static String getReportWallUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/inform/inform-list.html");
return WEB_URL.concat("/yinmeng/modules/inform/inform-list.html");
}
/**
@@ -161,7 +161,7 @@ public class UriProvider {
* @return
*/
public static String getPublicChatHallHelpUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/inform/help.html");
return WEB_URL.concat("/yinmeng/modules/inform/help.html");
}
/**
@@ -170,7 +170,7 @@ public class UriProvider {
* @return
*/
public static String getUserProtocolUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/protocol.html");
return WEB_URL.concat("/yinmeng/modules/rule/protocol.html");
}
/**
@@ -179,14 +179,14 @@ public class UriProvider {
* @return
*/
public static String getUserReportUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/inform/index.html");
return WEB_URL.concat("/yinmeng/modules/inform/index.html");
}
/**
* 话题-说明
*/
public static String getMiniWorldRuleUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/world-rule/index.html");
return WEB_URL.concat("/yinmeng/modules/world-rule/index.html");
}
/**
@@ -195,7 +195,7 @@ public class UriProvider {
* @return
*/
public static String getTutuRealNamePage() {
return JAVA_WEB_URL.concat("/yinyou/modules/identity/new.html");
return WEB_URL.concat("/yinmeng/modules/identity/new.html");
}
/**
@@ -204,7 +204,7 @@ public class UriProvider {
* @return
*/
public static String getMyIncomeUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/myincome/index.html#/MyIncome");
return WEB_URL.concat("/yinmeng/modules/myincome/index.html#/MyIncome");
}
/**
@@ -213,7 +213,7 @@ public class UriProvider {
* @return
*/
public static String getRechargeAgreementUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/rechargeAgreement.html");
return WEB_URL.concat("/yinmeng/modules/rule/rechargeAgreement.html");
}
/**
@@ -222,7 +222,7 @@ public class UriProvider {
* @return
*/
public static String getMentoringRelationshipGuide() {
return JAVA_WEB_URL.concat("/yinyou/modules/strategy/strategy.html");
return WEB_URL.concat("/yinmeng/modules/strategy/strategy.html");
}
/**
@@ -231,11 +231,11 @@ public class UriProvider {
* @return
*/
public static String getMentorRankingList() {
return JAVA_WEB_URL.concat("/yinyou/modules/strategy/teacher-list.html");
return WEB_URL.concat("/yinmeng/modules/strategy/teacher-list.html");
}
public static String getCommnunityNorms() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/community-norms.html");
return WEB_URL.concat("/yinmeng/modules/rule/community-norms.html");
}
/**
@@ -244,42 +244,42 @@ public class UriProvider {
* @return
*/
public static String getPrivacyAgreement() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/privacy-wap.html");
return WEB_URL.concat("/yinmeng/modules/rule/privacy-wap.html");
}
public static String getLinkUrl(String linkUrl) {
if (TextUtils.isEmpty(linkUrl)) {
return JAVA_WEB_URL;
return WEB_URL;
}
return JAVA_WEB_URL.concat(linkUrl);
return WEB_URL.concat(linkUrl);
}
/**
* 个人魅力榜
*/
public static String getPersonalCharismaRank() {
return JAVA_WEB_URL.concat("/yinyou/modules/charm/index.html");
return WEB_URL.concat("/yinmeng/modules/charm/index.html");
}
/**
* 宝箱帮助
*/
public static String getBoxHelp() {
return JAVA_WEB_URL.concat("/yinyou/modules/rank/index.html#/wishingWellRule");
return WEB_URL.concat("/yinmeng/modules/rank/index.html#/wishingWellRule");
}
/**
* 宝箱记录
*/
public static String getBoxHistory() {
return JAVA_WEB_URL.concat("/yinyou/modules/rank/index.html#/wishingWellRecord");
return WEB_URL.concat("/yinmeng/modules/rank/index.html#/wishingWellRecord");
}
/**
* 获取宝箱钥匙
*/
public static String getBoxKey() {
return JAVA_WEB_URL.concat("/yinyou/activity/explore/index.html");
return WEB_URL.concat("/yinmeng/activity/explore/index.html");
}
/**
@@ -288,7 +288,7 @@ public class UriProvider {
* @return
*/
public static String getRedPacketRule() {
return JAVA_WEB_URL.concat("yinyou/modules/rule-yinyou/red-packet-rule.html");
return WEB_URL.concat("/yinmeng/modules/rule/red-packet-rule.html");
}
@@ -298,7 +298,7 @@ public class UriProvider {
* @return
*/
public static String getDatingRule() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/dating.html");
return WEB_URL.concat("/yinmeng/modules/rule/dating.html");
}
/**
@@ -307,7 +307,7 @@ public class UriProvider {
* @return
*/
public static String getGameShareUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/game/index.html");
return WEB_URL.concat("/yinmeng/modules/game/index.html");
}
/**
@@ -316,7 +316,7 @@ public class UriProvider {
* @return
*/
public static String getLinkAccountUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/game/bindAccount.html");
return WEB_URL.concat("/yinmeng/modules/game/bindAccount.html");
}
/**
@@ -325,7 +325,7 @@ public class UriProvider {
* @return
*/
public static String getLinkRoomUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/associateAccount/index.html");
return WEB_URL.concat("/yinmeng/modules/associateAccount/index.html");
}
@@ -333,7 +333,7 @@ public class UriProvider {
* 房间排行榜
*/
public static String getRoomRanking() {
return IM_SERVER_URL.concat("/yinyou/modules/room_rank/index.html?roomUid=" + AvRoomDataManager.get().getRoomUid());
return WEB_URL.concat("/yinmeng/modules/room_rank/index.html?roomUid=" + AvRoomDataManager.get().getRoomUid());
}
/**
@@ -342,7 +342,7 @@ public class UriProvider {
* @return
*/
public static String getSDKPermissionUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/sdk.html");
return WEB_URL.concat("/yinmeng/modules/rule/sdk.html");
}
/**
@@ -351,112 +351,112 @@ public class UriProvider {
* @return
*/
public static String getDeivcePermissionUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/permissions.html");
return WEB_URL.concat("/yinmeng/modules/rule/permissions.html");
}
/**
* 隐私协议-个人信息
*/
public static String getPersonalInfoUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/personal-info.html");
return WEB_URL.concat("/yinmeng/modules/rule/personal-info.html");
}
/**
* 隐私指引
*/
public static String getPrivacyUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/privacy-wap.html");
return WEB_URL.concat("/yinmeng/modules/rule/privacy-wap.html");
}
/**
* 贵族中心帮助页
*/
public static String getVipHelpUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/introduction-patrician.html");
return WEB_URL.concat("/yinmeng/modules/rule/introduction-patrician.html");
}
/**
* Cp装扮
*/
public static String getCpDecorationUrl() {
return JAVA_WEB_URL.concat("/yinyou/activity/act-nameplate-cp/index.html");
return WEB_URL.concat("/yinmeng/activity/act-nameplate-cp/index.html");
}
/**
* 用户充值协议
*/
public static String getChargeAgreementUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/rechargeAgreement.html");
return WEB_URL.concat("/yinmeng/modules/rule/rechargeAgreement.html");
}
/**
* 用户注册服务协议
*/
public static String getRegistrationAgreementUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/protocol.html");
return WEB_URL.concat("/yinmeng/modules/rule/protocol.html");
}
/**
* 直播服务协议
*/
public static String getLiveServiceAgreementUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/live-protocol.html");
return WEB_URL.concat("/yinmeng/modules/rule/live-protocol.html");
}
/**
* 社区规范
*/
public static String getCommunitySpecificationUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/community-norms.html");
return WEB_URL.concat("/yinmeng/modules/rule/community-norms.html");
}
/**
* 账号注销协议
*/
public static String getCancellationAgreementUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/logout-agreement.html");
return WEB_URL.concat("/yinmeng/modules/rule/logout-agreement.html");
}
/**
* 开通粉丝团
*/
public static String getFansTeamOpenUrl(long roomUid) {
return JAVA_WEB_URL.concat("/yinyou/modules/fans_club/nameplate.html?roomUid=" + roomUid);
return WEB_URL.concat("/yinmeng/modules/fans_club/nameplate.html?roomUid=" + roomUid);
}
/**
* 粉丝团排行
*/
public static String getFansTeamRankUrl(long roomUid) {
return JAVA_WEB_URL.concat("/yinyou/modules/fans_club/fans_rank.html?roomUid=" + roomUid);
return WEB_URL.concat("/yinmeng/modules/fans_club/fans_rank.html?roomUid=" + roomUid);
}
/**
* 我的粉丝团
*/
public static String getFansTeamMyFansUrl(long roomUid) {
return JAVA_WEB_URL.concat("/yinyou/modules/fans_club/myfans.html?roomUid=" + roomUid);
return WEB_URL.concat("/yinmeng/modules/fans_club/myfans.html?roomUid=" + roomUid);
}
/**
* 粉丝团规则
*/
public static String getFansTeamRuleUrl() {
return JAVA_WEB_URL.concat("/yinyou/modules/fans_club/rule.html");
return WEB_URL.concat("/yinmeng/modules/fans_club/rule.html");
}
/**
* 个播小时榜
*/
public static String getSingleRoomHourRankUrl(long roomUid) {
return JAVA_WEB_URL.concat("/yinyou/modules/room_rank/hourRank.html?roomUid=" + roomUid);
return WEB_URL.concat("/yinmeng/modules/room_rank/hourRank.html?roomUid=" + roomUid);
}
/**
* 牌照房小时榜
*/
public static String getRoomHourRankUrl(long roomUid) {
return JAVA_WEB_URL.concat("/yinyou/modules/room_rank/hourRankLicense.html?roomUid=" + roomUid);
return WEB_URL.concat("/yinmeng/modules/room_rank/hourRankLicense.html?roomUid=" + roomUid);
}
@@ -464,14 +464,14 @@ public class UriProvider {
* 周星榜
*/
public static String getWeekStarUrl() {
return JAVA_WEB_URL.concat("/yinyou/activity/act-constellation/index.html");
return WEB_URL.concat("/yinmeng/activity/act-constellation/index.html");
}
/**
* 幸运礼物说明
*/
public static String getLuckyGiftRule(int giftID) {
return JAVA_WEB_URL.concat("/yinyou/modules/rule-yinyou/luckyGiftRule.html?giftID=" + giftID);
return WEB_URL.concat("/yinmeng/modules/rule/luckyGiftRule.html?giftID=" + giftID);
}
/**
@@ -480,28 +480,28 @@ public class UriProvider {
* @return
*/
public static String getLiveAgreement() {
return JAVA_WEB_URL.concat("/yinyou/activity/activemodel/index.html?code=ZBGG");
return WEB_URL.concat("/yinmeng/activity/activemodel/index.html?code=ZBGG");
}
/**
* 航海帮助
*/
public static String getRadishHelp() {
return JAVA_WEB_URL.concat("/yinyou/activity/act-sail/play_explain.html");
return WEB_URL.concat("/yinmeng/activity/act-sail/play_explain.html");
}
/**
* 航海记录
*/
public static String getRadishHistory() {
return JAVA_WEB_URL.concat("/yinyou/activity/act-sail/win_record.html");
return WEB_URL.concat("/yinmeng/activity/act-sail/win_record.html");
}
/**
* 获取航海钥匙
*/
public static String getRadishKey() {
return JAVA_WEB_URL.concat("/yinyou/activity/act-sail/more.html");
return WEB_URL.concat("/yinmeng/activity/act-sail/more.html");
}
}

10
core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java
View File

@@ -101,7 +101,7 @@ public class XChatConstants {
/**
* 分享房间 URL
*/
public static final String SHARE_ROOM_URL = "/yinyou/modules/share_room/index.html?shareUid=";
public static final String SHARE_ROOM_URL = "/yinmeng/modules/share_room/index.html?shareUid=";
/**
* 分享家族文本
@@ -116,7 +116,7 @@ public class XChatConstants {
/**
* 分享家族 URL
*/
public static final String SHARE_FAMILY_URL = "/yinyou/modules/share/share_family.html";
public static final String SHARE_FAMILY_URL = "/yinmeng/modules/share/share_family.html";
/**
* 分享群组文本
@@ -131,11 +131,11 @@ public class XChatConstants {
/**
* 分享群组 URL
*/
public static final String SHARE_TEAM_URL = "/yinyou/modules/share/share_family.html";
public static final String SHARE_TEAM_URL = "/yinmeng/modules/share/share_family.html";
/**
* 分享群组 URL
*/
public static final String SHARE_WORLD_DYNAMIC_URL = "/yinyou/modules/world/share-page/index.html";
public static final String SHARE_WORLD_DYNAMIC_URL = "/yinmeng/modules/world/share-page/index.html";
/**
* 系统消息那个用户的UID
@@ -157,7 +157,7 @@ public class XChatConstants {
/**
* 登录页面「如何登录」对应的 H5 页面
*/
public static final String LOGIN_ERBAN_ACCOUNT_URL = "/yinyou/modules/rule-yinyou/login_tips.html";
public static final String LOGIN_ERBAN_ACCOUNT_URL = "/yinmeng/modules/rule/login_tips.html";
public static final String ROOM_INTRODUCTION = "可点击房间话题查看本房间公告";
public static final String DATING_TIPS_OPEN = "相亲玩法已开启,请点击主持人麦位选择主持人";

8
core/src/main/java/com/nnbc123/core/share/ShareModel.java
View File

@@ -143,7 +143,7 @@ public class ShareModel extends BaseModel implements IShareModel {
sp.setText(title + XChatConstants.SHARE_ROOM_TEXT);
sp.setTitle(XChatConstants.SHARE_ROOM_TITLE);
sp.setImageUrl(userInfo.getAvatar());
final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL +
final String siteUrl = UriProvider.WEB_URL + XChatConstants.SHARE_ROOM_URL +
AuthModel.get().getCurrentUid() + "&uid=" + roomUid + "&room_name=" +
URLEncoder.encode(title, "utf8") + "&room_id=" + roomId + "&room_avatar=" +
URLEncoder.encode(room_avatar, "utf8") + "&share_name=" +
@@ -228,7 +228,7 @@ public class ShareModel extends BaseModel implements IShareModel {
@Override
public void subscribe(SingleEmitter<String> emitter) throws Exception {
//无UI API
final String shareLink = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_FAMILY_URL;
final String shareLink = UriProvider.WEB_URL + XChatConstants.SHARE_FAMILY_URL;
Platform.ShareParams sp = new Platform.ShareParams();
sp.setText(XChatConstants.SHARE_FAMILY_TEXT);
sp.setTitle(XChatConstants.SHARE_FAMILY_TITLE + "“" + title + "”");
@@ -273,7 +273,7 @@ public class ShareModel extends BaseModel implements IShareModel {
@Override
public void subscribe(SingleEmitter<String> emitter) throws Exception {
//无UI API
final String shareLink = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_TEAM_URL;
final String shareLink = UriProvider.WEB_URL + XChatConstants.SHARE_TEAM_URL;
Platform.ShareParams sp = new Platform.ShareParams();
sp.setText(XChatConstants.SHARE_TEAM_TEXT);
sp.setTitle(XChatConstants.SHARE_TEAM_TITLE + "“" + title + "”");
@@ -377,7 +377,7 @@ public class ShareModel extends BaseModel implements IShareModel {
public void shareImage(Platform platform, String url) {
//无UI API
final String shareLink = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_TEAM_URL;
final String shareLink = UriProvider.WEB_URL + XChatConstants.SHARE_TEAM_URL;
Platform.ShareParams sp = new Platform.ShareParams();
// sp.setText(XChatConstants.SHARE_TEAM_TEXT);
// sp.setTitle(XChatConstants.SHARE_TEAM_TITLE);