From d26205bd1f8b36b8849ee839a109e77c59dad169 Mon Sep 17 00:00:00 2001 From: huangjian Date: Wed, 15 Mar 2023 10:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +- .../main/java/com/nnbc123/app/UIHelper.java | 10 +- .../app/application/XChatApplication.java | 36 ++--- .../MyRecommendCardActivity.java | 4 +- .../com/nnbc123/app/base/BaseLoginAct.java | 2 +- .../nnbc123/app/home/fragment/HomeFragment.kt | 2 +- .../nnbc123/app/home/fragment/MeFragment.kt | 2 +- .../radish/activity/RadishRecordActivity.java | 2 +- .../app/radish/signin/view/RuleDialog.java | 2 +- .../com/nnbc123/app/ui/im/RouterHandler.java | 2 +- .../app/ui/im/chat/MsgViewHolderText.java | 6 +- .../ui/patriarch/PatriarchModeActivity.java | 2 +- .../app/ui/webview/CommonWebViewActivity.java | 2 +- .../app/ui/widget/dialog/MonsterDialog.java | 8 +- .../app/ui/withdraw/WithdrawActivity.java | 2 +- .../app/ui/withdraw/WithdrawRuleActivity.java | 2 +- .../drawable-xhdpi/ic_room_bottom_play.png | Bin 3396 -> 3250 bytes .../res/drawable-xhdpi/ic_vip_room_bottom.png | Bin 3174 -> 2568 bytes .../res/drawable-xhdpi/icon_gift_value.png | Bin 832 -> 959 bytes .../drawable-xhdpi/icon_room_close_mic.png | Bin 2585 -> 1960 bytes .../res/drawable-xhdpi/icon_room_open_mic.png | Bin 1838 -> 1651 bytes .../drawable-xhdpi/icon_room_send_gift.png | Bin 9271 -> 7920 bytes .../community/helper/ShareDynamicHelper.java | 2 +- .../java/com/nnbc123/core/UriProvider.java | 140 +++++++++--------- .../XChatConstants.java | 10 +- .../com/nnbc123/core/share/ShareModel.java | 8 +- 26 files changed, 129 insertions(+), 125 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 858b92d12..f73cc7e42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 diff --git a/app/src/main/java/com/nnbc123/app/UIHelper.java b/app/src/main/java/com/nnbc123/app/UIHelper.java index 7f786becb..c089d02b8 100644 --- a/app/src/main/java/com/nnbc123/app/UIHelper.java +++ b/app/src/main/java/com/nnbc123/app/UIHelper.java @@ -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"); } } diff --git a/app/src/main/java/com/nnbc123/app/application/XChatApplication.java b/app/src/main/java/com/nnbc123/app/application/XChatApplication.java index 0599711f6..d85b13b12 100644 --- a/app/src/main/java/com/nnbc123/app/application/XChatApplication.java +++ b/app/src/main/java/com/nnbc123/app/application/XChatApplication.java @@ -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,9 +300,8 @@ public class XChatApplication extends Application { UMConfigure.setEncryptEnabled(true); // 集成测试 UMConfigure.setLogEnabled(BuildConfig.DEBUG); - } - else { - CustomerServerHelper.init(instance,null); + } else { + CustomerServerHelper.init(instance, null); } LogUtils.d("init time = " + (System.currentTimeMillis() - startTime) + "ms"); @@ -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); } /** diff --git a/app/src/main/java/com/nnbc123/app/avroom/recommendcard/MyRecommendCardActivity.java b/app/src/main/java/com/nnbc123/app/avroom/recommendcard/MyRecommendCardActivity.java index be944dadf..57ebb3383 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/recommendcard/MyRecommendCardActivity.java +++ b/app/src/main/java/com/nnbc123/app/avroom/recommendcard/MyRecommendCardActivity.java @@ -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"); } }); } diff --git a/app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java b/app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java index 70007ebc4..4bcb4ef8a 100644 --- a/app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java +++ b/app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java @@ -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); diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/HomeFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/HomeFragment.kt index 4cb3f53c8..aab5d31b2 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/HomeFragment.kt @@ -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) } } } diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt index e5dd5d029..ba3ffdf75 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/MeFragment.kt @@ -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() diff --git a/app/src/main/java/com/nnbc123/app/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/nnbc123/app/radish/activity/RadishRecordActivity.java index 4e65f82b7..e05585851 100644 --- a/app/src/main/java/com/nnbc123/app/radish/activity/RadishRecordActivity.java +++ b/app/src/main/java/com/nnbc123/app/radish/activity/RadishRecordActivity.java @@ -124,7 +124,7 @@ public class RadishRecordActivity extends BaseMvpActivity { 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"); } } diff --git a/app/src/main/java/com/nnbc123/app/ui/im/RouterHandler.java b/app/src/main/java/com/nnbc123/app/ui/im/RouterHandler.java index 7bec9fb96..86d6d35bf 100644 --- a/app/src/main/java/com/nnbc123/app/ui/im/RouterHandler.java +++ b/app/src/main/java/com/nnbc123/app/ui/im/RouterHandler.java @@ -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: //收藏的房间 diff --git a/app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderText.java b/app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderText.java index 2a01f4209..72caf18f5 100644 --- a/app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderText.java +++ b/app/src/main/java/com/nnbc123/app/ui/im/chat/MsgViewHolderText.java @@ -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()); diff --git a/app/src/main/java/com/nnbc123/app/ui/patriarch/PatriarchModeActivity.java b/app/src/main/java/com/nnbc123/app/ui/patriarch/PatriarchModeActivity.java index ddc4fee9f..97ab0bf3a 100644 --- a/app/src/main/java/com/nnbc123/app/ui/patriarch/PatriarchModeActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/patriarch/PatriarchModeActivity.java @@ -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); //下划线 diff --git a/app/src/main/java/com/nnbc123/app/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/nnbc123/app/ui/webview/CommonWebViewActivity.java index ebdf56452..bf7c71c62 100644 --- a/app/src/main/java/com/nnbc123/app/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/webview/CommonWebViewActivity.java @@ -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; } diff --git a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/MonsterDialog.java b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/MonsterDialog.java index 36c273d2d..bbee8a524 100644 --- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/MonsterDialog.java +++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/MonsterDialog.java @@ -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; } diff --git a/app/src/main/java/com/nnbc123/app/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/nnbc123/app/ui/withdraw/WithdrawActivity.java index d2c54e0b8..3b765426c 100644 --- a/app/src/main/java/com/nnbc123/app/ui/withdraw/WithdrawActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/withdraw/WithdrawActivity.java @@ -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); diff --git a/app/src/main/java/com/nnbc123/app/ui/withdraw/WithdrawRuleActivity.java b/app/src/main/java/com/nnbc123/app/ui/withdraw/WithdrawRuleActivity.java index e5855d203..e55528525 100644 --- a/app/src/main/java/com/nnbc123/app/ui/withdraw/WithdrawRuleActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/withdraw/WithdrawRuleActivity.java @@ -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"); } } diff --git a/app/src/main/res/drawable-xhdpi/ic_room_bottom_play.png b/app/src/main/res/drawable-xhdpi/ic_room_bottom_play.png index f8e7d32fac2791e3cf7aa77bae14314c81714474..62c70a807b50117e0289e08c97661a2eb2d1d2ac 100644 GIT binary patch literal 3250 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 IM6N<$f)d-;p#T5? delta 3157 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 diff --git a/app/src/main/res/drawable-xhdpi/icon_gift_value.png b/app/src/main/res/drawable-xhdpi/icon_gift_value.png index 96eb48a6b90dff9a4c07dba1c4059f03809dc683..bc848b2120188a9e9f6676366539e3142c614806 100644 GIT binary patch literal 959 zcmV;w13>(VP)Px&c}YY;R7gwZl}n2qMHGO)Q+;1^?>tE+StM~r$S@#2z=f{dWWa?FfLy?o5;ercam>tQ?!9wwcUM)t?i1-i6k%EiSKNnOqp z+$5z#OG7AY_)tShBI|3Z3Q1ibi;&Vm;lO#tCxWlgPJ=u*Hzl9%Nd6FX@;PntEj}B^ z_91ontb$9MxMBnsDujxVj2O%a1cfYB`Wf^~C~Cl{P#u#_iah$nVfiUab_Jy^&l%%h zAnT!>K4H`2x;65ClRR%wgbF2s)&*+dlmWbFl|En_LOCf^4+xExdFQDk^74?t7k&fp zCUqmlujdqPrRdej@;bSzV9SI;!HM97!94Yl2goX5n@~;&92Dx~X7$vpIW#PAA%x6} z`^{3UIBZw2S%o};y^sf?7!0rh3LsaoMzJ-)wHRce2ZYLmgjZ*hWJus_XuE!x$ZmM@ z6_4GFKhR)H*#d^G`(Pfyu`Hq#6`^QAIVOZjL8b)LlJ(Ow=HQSZ%k;e>3(t42EB)m_ z(bKI}Qby>W$Rj+C2v4A>3uOz!xWJ@fCIqRPcVD|tUK$eI?C9|%=%tO7(CjWNwyk)( zvkbQ*j~Sp80yY5`;Z5+P0ux(s(~_Pm<>524a&<@$A8xGbGg%hiUtiW*x~7zU#aVE1 z8TuHxV&f0q0}l~CE|{?a-1;CV7w?x(Z`%huFD_qm3u$IP+*s9Cc1v+lQbd6cO5+lt zsDqDtVGlfMNv|yYvuEb2yPNE`40a@6T`eAWS@QA5YMAP`l|0?f0&rFE4Izwz#K=bl zX-Zpd`Q+k!?VCUMt2=hnFMrSnQyV^8zZDK`c9kraN+8sP&;*GkiSUNp45?c<^FaN( zziNheZP%Y%&W~%QdU3U*$2zGFmS(65G>P@b)a2)KQ%;}`b00T z*)Z4jP$mL(kec~E?X&R4y!>*vHomVQethAIPTP_2R$Jv{DyR$kL7AD;i}SL!-x=|@ h1p7h$bq4=$!S70)Px%`bk7VR7gv;mCs8RQ546&XVhnC83>jT2$B%A>Bpj6R0Ik759mS?s%4N+i;}RM zNX1RI(p^QUQ3kGBXwW8GXoYE1AefPheki3V;(Igq-V^uE+<7z4r>+{9H*fBo^Eu~y z@0l}%|8!73E)NeEVE3_7lmj?fvqnT5w_|3)(BvMomReY+rY4!oNq~8B_B4EMgOKMS zWHA&2L`zWIk5pNYaZazaLGWdyy$WpjfG08#>J>chq1L)_8z2Jn*oST~wXsx0X%EN< z7_dGZNB_^{I(LAjc;J=;_6D^$1-UC7a+88=%93T4xCMfGPru- zf2jazvIdya@KrT&|I6Eu@(x$*1&WJ6pB7>cAxsC*jy7Xo--iZ>zNz~kTqC=9MQ*ML3Z_GjNAR8^#(h2>^xgXz|a z%FhEgc32?3@$?~-yqGOHH>(`yxaN^eIX()Hh_4TwfTt#)6lKefZ&toQd4idaG3yMa zYJ(S~_3;3NI-l)?+%DKc&v^G(2^A00d$%P3Ul}Ze=S@M#gLyl^=oW2EcB68^ioc=| z$7#}C&CZHT4-P?!*N|$T>08~WTWw_2De;ZuMM!yuK6cJVv%*d!Ztgn@##jIk%ipq( zWAX^K2srgL?M`o+ZV|k(uLeSlLa9)e9VF1@lhZ&`?p%B(=O6U-z2zvPClI1O$~^v- zS-qLZ;5p6o+5Nlipig`y;5w))y#*=SA-OOyKO_q%*@@}Gy98IyzD-Boj1vLQcGkkf z0Hmr3v!4Tr7Mkjs*zR+=BiOX#VK;>mG(dmZG8m;VuD2ajKl=w4xyf|1S7nU=0000< KMNUMnLSTX*?11wC diff --git a/app/src/main/res/drawable-xhdpi/icon_room_close_mic.png b/app/src/main/res/drawable-xhdpi/icon_room_close_mic.png index 2efc320f71fc35f08cfbed81f455ee8d842766b2..0e46c31fabd35208c299cd2c601f54591a543f45 100644 GIT binary patch literal 1960 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 diff --git a/app/src/main/res/drawable-xhdpi/icon_room_open_mic.png b/app/src/main/res/drawable-xhdpi/icon_room_open_mic.png index bf02f44ce0bb296b0660e2a6871b719ae768d716..1b5e1f278616f6a7226da5cf9d35befa7e06f660 100644 GIT binary patch literal 1651 zcmV-(28{WMP)Px*ElET{RCr$Hn@6Z6MHGg=GG{RdOe2PcId9BaLD7|27h*!p0Rti;s2ETT2L zp$oxrVNNKRz=RkUqmJ?%9Ur1II^(EQ^0%jE>RtQZ?!H}hz0W>y;l1waQ+576bz-$6 zGkNcq16Bf71Xci+2Xt*2z}fU3SPc9L`~fTieg_sh=X5O_g#{#?zB;kM3uPqR* z0Px=HjjszVI|`{w=J*Tv(K#or7>b4hzlQ~8`R(4@--AQW!;Jw$ljeynaGX9Up%?G}7 z&MCeaNRvE_b%=moY8#Ye?z!IAonPYqLKLOYq*vtT$4ZHz7B2~=@nsSFP;{>V~fOP=A0p>dAR8Lr%40-RjNKn2i zTdzQU(dvS_{|ayspcFPHrPj9t2iQg3KUn#G1`rlG=e}A3fYtDVK}tQ}IlzU+RB!&M z65+#~s{k{BP3*!Qz`dy#Wc+5U##n5D%pvdNfK*&`9q?#{Kqms%+L-r&<1+zJgvbGa zT1B*PfXGD7JyKy1lG_F8VxTyt~TV6%(nP{$4a@+guAP zyn**#sjgDqTr|!AObCFS!H+;4X8=y~G#_5i27p!Ki0N5%~ z{QqI3N#_C2+X7=Zc(}5$iiP)cgU13l*|Tbr?vwz4#R6dKru~6F6TfENBHg|oc-Y3J z3WUxCE-{{S0BJ;9@+kq3zMl|; z^g>i(8zvc2#H#1yu|y97HzWX{*aE4H;J#MO2Pm28cSYzis@p_HMps!A_KeZ)^Joz>BnKDs%U}F0GAC>?bATY@2>=YtGRephUE5C5(}h2OU06u$L40`Du^h#QsrlxNC4H~ZUkN( z0D{)DKX7$Vfm9vd<8%U~CV+K@{ZkOp$V?@%watymh{YtMD2-6=5CqbZ8-=z<01C}x z5^#zyzO5rwgE3P|Vlp;4ilTCja)nae%CiV1ix*JW0FBQ5)C6H^QPi{`XI*dy>k92t z6Nrz^;3>bzK~u}(20+fnNDxA9?;v0|V6UiHs_gD9K!)yR;IkZ3M?6a#BXT>rT4QDM z+!I-Oh0F?_M?vMSG1G#SK~b+TYIcNdQTNme+s+2b%Bvw7NZDR$qZfFWH%AQsX+e(m zxDHpUJ*K0zbx8dHZI!ALdL3Tzn8EFF13`;SeLzB?tUA6;NG-IGM>KhE(AdETB*K&4 z`_xBdl&H;>6hTVXmJj;^u~!yS~2 zKWAK(hb<002ovPDHLkV1l&Z_g4S_ literal 1838 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2I}#X;^)4C~IxyaaMwQX@Rme0>?T zfNTy1#`a7G7LXDkmI7i12Id8f3?RLXAh88Za9NuL%m_9}VfX!)F+gS41AIbUf!zP2 zVAzE~A*-mQtfpaXVrFS$XYc6b?BeR??&0a>?c?j` z9}pN691V|IJ$L@%rOQ{Y-MD%8 z;iJb-o;`o@_T7h%pT2zi{^RGb-+%u8(^y?6$H2hC>*?Yc;&FU!`0IFKcM;hMlB*(f&jg1soa(-sCs32xd~FNkmb?`@N7i;$ zZ{gfi;cH>8WSYyRtDHDLdcBA!G&h_)8ACP(&h zBnHP_(-J-yWBIOeUvc~w*@8-gY|i+jr=*!og&tjb@>yp>^}oyReLNv+7S_y-k-qRW zcYD}|E^}v*j@aw#z89bQld%1>IKxbJdw<)X+y``XvsT}Tn(uygL25DA3E!GKZ!FHv z|Ht;=cf%I(SYflp+w>V{de8Az%6$Er;hc5aoz<5FgCk0G7{YaSPTM8l*vc1tyW8Mc zL}jqU519|{vlWy)U7nQv;heMG_vNypV-ZsgEFyGGeskLjiEyr{{-8EonIbY-RS3eqJYx>~$S-$%eedtq$Pn8Z=eK0vue>j{KzoX3s1|;_ zSMn;a|NsAg8;&Y7oRBF|Yv4AU_~XNA|Bj9~+y`2U4VW4FTkLb<58aX0W+<>RW4g0V zb)tf!%cXt1JxBVO51it?KHngIWs3LvnfDw2?Y(=t;_6nrgMQbwb;{qrWq)?=%Qlbt zm4AGd=Gw+HKb|&=HR#@|w%1D=B2#;rovZ)Etx$HWzO{U_hx*#dk_lPyP22~Ce=ln| zoK3`^_(|{ec#5j6HU%IyoqPX+toC`cGt7p{^yGx-eVE_-rXQ6VV1(rAW_sZ z`OSQf{S_1Ez3{g>B*|ouz@B@;z(MnP;~UfSV%t7gS=l6V-`+iq_1I_Y-}1~RYs0tr zFwb}`EGE8Adxz?;XADcCKA*k5n%lJ2+>$fl>AwdHzg@fb&AIt|ID?Pc-GIydYox>Z z^%)QB{_^4$=xnx!D%{hR)OkohD1`l+;q?HO}#P+jHe>gTe~DWM4f D@3BIz diff --git a/app/src/main/res/drawable-xhdpi/icon_room_send_gift.png b/app/src/main/res/drawable-xhdpi/icon_room_send_gift.png index 54378b44c93a55d7feb008b8ea4c166d01e5a46f..6a0b8adadf899c6b48f951a30ac361a0b2ba9685 100644 GIT binary patch literal 7920 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 Z{|ATTF^e_5E*by;002ovPDHLkV1jh!+Gzj) diff --git a/app/src/module_community/java/com/nnbc123/app/community/helper/ShareDynamicHelper.java b/app/src/module_community/java/com/nnbc123/app/community/helper/ShareDynamicHelper.java index 6b7e2759f..a037c7deb 100644 --- a/app/src/module_community/java/com/nnbc123/app/community/helper/ShareDynamicHelper.java +++ b/app/src/module_community/java/com/nnbc123/app/community/helper/ShareDynamicHelper.java @@ -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; diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java b/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java index 0a164c3a5..64a95d740 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java @@ -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"); } } diff --git a/core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java index 3bbe8b349..fe246e816 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/nnbc123/xchat_android_constants/XChatConstants.java @@ -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 = "相亲玩法已开启,请点击主持人麦位选择主持人"; diff --git a/core/src/main/java/com/nnbc123/core/share/ShareModel.java b/core/src/main/java/com/nnbc123/core/share/ShareModel.java index a0c6c5a62..158729bb0 100644 --- a/core/src/main/java/com/nnbc123/core/share/ShareModel.java +++ b/core/src/main/java/com/nnbc123/core/share/ShareModel.java @@ -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 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 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);