From db05ff116e2a6f5a4a5af53fbc48c2100367c3ce Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Tue, 12 Nov 2024 09:48:25 +0800 Subject: [PATCH] =?UTF-8?q?HOSO=E6=8F=90=E5=8C=85=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Share/src/main/AndroidManifest.xml | 4 +- app/build.gradle | 15 +- app/src/google_online/google-services.json | 10 +- .../phonelive/activity/LauncherActivity.java | 12 +- .../java/com/yunbao/common/HtmlConfig.java | 12 +- .../common/activity/WebViewActivity.java | 3 + .../common/bean/CheckUpgradesModel.java | 4 + .../common/custom/CommonRefreshView.java | 3 + .../main/java/com/yunbao/common/http/API.java | 2 +- .../yunbao/common/http/CommonHttpConsts.java | 4 +- .../yunbao/common/http/CommonHttpUtil.java | 18 +- .../com/yunbao/common/http/HttpClient.java | 4 +- .../common/http/HttpLoggingInterceptor.java | 2 +- .../common/http/JavaConverterFactory.java | 97 +++++ .../java/com/yunbao/common/http/JsonBean.java | 50 ++- .../com/yunbao/common/http/LiveHttpUtil.java | 194 ++++------ .../com/yunbao/common/http/PDLiveApi.java | 353 +++++++++--------- .../common/http/base/GetRequestParams.java | 19 +- .../common/http/base/PostRequestParams.java | 13 +- .../yunbao/common/manager/IMLoginManager.java | 8 +- .../manager/InstructorRemarkManager.java | 2 +- .../manager/NoviceInstructorManager.java | 2 +- .../manager/imrongcloud/MessageIMManager.java | 4 +- .../imrongcloud/RongcloudIMManager.java | 2 +- .../com/yunbao/common/pay/PayPresenter.java | 2 +- .../com/yunbao/common/utils/AesUtils.java | 74 ++++ .../utils/JavascriptInterfaceUtils.java | 4 +- .../yunbao/common/utils/MicStatusManager.java | 2 +- .../com/yunbao/common/utils/RouteUtil.java | 3 +- .../yunbao/common/views/AbsViewHolder.java | 4 + .../res/drawable/backgroud_live_open_lfet.xml | 2 +- .../drawable/backgroud_live_open_right.xml | 2 +- .../res/layout/view_complete_information.xml | 2 +- .../res/mipmap-mdpi/tipbox_btn_orange.png | Bin 1193 -> 2676 bytes common/src/main/res/values-zh/strings.xml | 4 +- common/src/main/res/values/strings.xml | 2 +- config.gradle | 8 +- .../faceunity/agora/LiveFloatView.java | 2 +- .../yunbao/live/activity/LiveActivity.java | 2 +- .../live/activity/LiveAnchorActivity.java | 2 +- .../live/activity/LiveAudienceActivity.java | 4 +- .../live/activity/LiveRyAnchorActivity.java | 6 +- .../live/activity/LiveSwAnchorActivity.java | 6 +- .../live/activity/WebViewActivityMedal.java | 3 + .../live/dialog/LiveGiftDialogFragment.java | 2 +- .../com/yunbao/live/dialog/LiveGiftPopup.java | 2 +- .../dialog/LiveMicUserDialogFragment.java | 4 +- .../LiveTrickeryDialogFragment4Audience.java | 4 +- .../yunbao/live/dialog/MenuPopuwWindow.java | 2 +- .../com/yunbao/live/http/ImHttpConsts.java | 2 +- .../java/com/yunbao/live/http/ImHttpUtil.java | 24 +- .../presenter/LiveLinkMicPkPresenter.java | 8 +- .../live/presenter/LiveLinkMicPresenter.java | 2 +- .../presenter/LiveRyLinkMicPkPresenter.java | 8 +- .../presenter/LiveSwLinkMicPkPresenter.java | 18 +- .../com/yunbao/live/socket/SocketClient.java | 2 +- .../live/socket/SocketLinkMicPkUtil.java | 4 +- .../yunbao/live/socket/SocketRyClient.java | 6 +- .../live/socket/SocketRyLinkMicPkUtil.java | 4 +- .../yunbao/live/socket/SocketSwClient.java | 6 +- .../live/socket/SocketSwLinkMicPkUtil.java | 4 +- .../live/views/LiveAudienceViewHolder.java | 6 +- .../live/views/LiveNewReadySwViewHolder.java | 9 +- .../live/views/LivePlayRyViewHolder.java | 2 +- .../live/views/LivePlaySwViewHolder.java | 4 +- .../live/views/LivePushRyViewHolder.java | 16 +- .../live/views/LivePushSwViewHolder.java | 20 +- .../live/views/LivePushTxViewHolder.java | 12 +- .../yunbao/live/views/LiveRoomViewHolder.java | 8 +- .../live/views/LiveRyAnchorViewHolder.java | 6 +- .../live/views/PortraitLiveManager.java | 4 +- live/src/main/res/layout/dialog_live_task.xml | 3 +- live/src/main/res/layout/item_live_task.xml | 2 +- .../res/layout/view_receive_red_packet.xml | 2 +- main/src/main/AndroidManifest.xml | 1 + .../main/activity/EditProfileActivity.java | 2 +- .../yunbao/main/activity/EntryActivity.java | 11 +- .../yunbao/main/activity/LoginActivity.java | 2 +- .../yunbao/main/activity/MainActivity.java | 13 +- .../main/activity/MainMessageActivity.java | 47 +++ .../main/activity/MyWalletActivity.java | 52 +-- .../main/activity/RegisterActivity.java | 4 +- .../yunbao/main/activity/RewardActivity.java | 3 + .../main/adapter/MainHomeLiveAdapter.java | 32 +- .../yunbao/main/dialog/OneLoginDialog.java | 4 +- .../com/yunbao/main/http/MainHttpUtil.java | 115 +++--- .../yunbao/main/views/HonorViewHolder.java | 2 +- .../yunbao/main/views/MainGameViewHolder.java | 59 +++ .../views/MainHomeCommunityViewHolder.java | 1 - .../main/views/MainHomeGameViewHolder.java | 3 +- .../main/views/MainHomeLiveViewHolder.java | 15 +- .../yunbao/main/views/MainHomeViewHolder.java | 8 +- .../yunbao/main/views/MainMeViewHolder.java | 8 +- .../main/views/MainMessageViewHolder.java | 5 +- .../src/main/res/drawable/icon_community.webp | Bin 0 -> 2354 bytes .../main/res/drawable/icon_community_p.webp | Bin 0 -> 4322 bytes main/src/main/res/drawable/icon_home.webp | Bin 0 -> 1556 bytes main/src/main/res/drawable/icon_home_p.webp | Bin 0 -> 2560 bytes .../main/res/drawable/icon_main_start.webp | Bin 0 -> 25864 bytes main/src/main/res/drawable/icon_me.webp | Bin 0 -> 1850 bytes main/src/main/res/drawable/icon_me_p.webp | Bin 0 -> 3234 bytes main/src/main/res/drawable/icon_message.webp | Bin 0 -> 1558 bytes .../src/main/res/drawable/icon_message_p.webp | Bin 0 -> 2714 bytes main/src/main/res/layout/activity_entry.xml | 8 +- main/src/main/res/layout/view_game_holder.xml | 8 + main/src/main/res/layout/view_homemain.xml | 2 +- .../main/res/layout/view_main_community.xml | 3 +- .../res/layout/view_main_community_video.xml | 1 + main/src/main/res/layout/view_main_me.xml | 59 ++- .../src/main/res/layout/view_main_message.xml | 17 +- main/src/main/res/values/arrays.xml | 248 +----------- package_config.gradle | 4 +- .../com/yunbao/video/http/VideoHttpUtil.java | 30 +- .../video/upload/VideoUploadFtpImpl.java | 2 +- 114 files changed, 1068 insertions(+), 868 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java create mode 100644 common/src/main/java/com/yunbao/common/utils/AesUtils.java create mode 100644 main/src/main/java/com/yunbao/main/activity/MainMessageActivity.java create mode 100644 main/src/main/java/com/yunbao/main/views/MainGameViewHolder.java create mode 100644 main/src/main/res/drawable/icon_community.webp create mode 100644 main/src/main/res/drawable/icon_community_p.webp create mode 100644 main/src/main/res/drawable/icon_home.webp create mode 100644 main/src/main/res/drawable/icon_home_p.webp create mode 100644 main/src/main/res/drawable/icon_main_start.webp create mode 100644 main/src/main/res/drawable/icon_me.webp create mode 100644 main/src/main/res/drawable/icon_me_p.webp create mode 100644 main/src/main/res/drawable/icon_message.webp create mode 100644 main/src/main/res/drawable/icon_message_p.webp create mode 100644 main/src/main/res/layout/view_game_holder.xml diff --git a/Share/src/main/AndroidManifest.xml b/Share/src/main/AndroidManifest.xml index ab3505f2b..a9e63b551 100644 --- a/Share/src/main/AndroidManifest.xml +++ b/Share/src/main/AndroidManifest.xml @@ -25,10 +25,10 @@ android:label="@string/app_name" android:screenOrientation="portrait" /> - + android:exported="true" />--> diff --git a/app/build.gradle b/app/build.gradle index 3378311dc..f229494df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,11 +69,12 @@ android { exclude 'lib/armeabi-v7a/libMNN_Express.so' //美颜 if (rootProject.ext.manifestPlaceholders.isPluginModel) { - exclude 'lib/armeabi-v7a/libCNamaSDK.so' - exclude 'lib/arm64-v8a/libCNamaSDK.so' - exclude 'lib/armeabi-v7a/libfuai.so' - exclude 'lib/arm64-v8a/libfuai.so' } + //谷歌包干掉美颜 + exclude 'lib/armeabi-v7a/libCNamaSDK.so' + exclude 'lib/arm64-v8a/libCNamaSDK.so' + exclude 'lib/armeabi-v7a/libfuai.so' + exclude 'lib/arm64-v8a/libfuai.so' } compileOptions { @@ -126,8 +127,8 @@ android { variant.mergeAssetsProvider.configure { doLast { delete(fileTree(dir: outputDir, includes: ['model/ai_bgseg_green.bundle', - //'model/ai_face_processor.bundle', - //'model/ai_face_processor_lite.bundle', + 'model/ai_face_processor.bundle',//谷歌包干掉美颜 + 'model/ai_face_processor_lite.bundle',//谷歌包干掉美颜 'model/ai_hairseg.bundle', 'model/ai_hand_processor.bundle', 'model/ai_human_processor.bundle', @@ -259,7 +260,7 @@ android { //abiFilters "arm64-v8a", "x86_64" println("打包ndk 链接") } else { - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "arm64-v8a" //abiFilters "arm64-v8a" println("打包ndk其他") } diff --git a/app/src/google_online/google-services.json b/app/src/google_online/google-services.json index 4f9023d32..ea138338f 100644 --- a/app/src/google_online/google-services.json +++ b/app/src/google_online/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407", "android_client_info": { - "package_name": "com.newpdlive.sy" + "package_name": "com.yhosolive.oy" } }, "oauth_client": [ @@ -17,7 +17,7 @@ "client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.newpdlive.sy", + "package_name": "com.yhosolive.oy", "certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47" } }, @@ -25,7 +25,7 @@ "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.newpdlive.sy", + "package_name": "com.yhosolive.oy", "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" } }, @@ -33,7 +33,7 @@ "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.newpdlive.sy", + "package_name": "com.yhosolive.oy", "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" } }, @@ -41,7 +41,7 @@ "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.newpdlive.sy", + "package_name": "com.yhosolive.oy", "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" } }, diff --git a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java index 057386bd8..53d500534 100644 --- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java +++ b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java @@ -135,7 +135,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL mBtnSkipVideo = findViewById(R.id.btn_skip_video); mBtnSkipImage.setOnClickListener(this); mBtnSkipVideo.setOnClickListener(this); - // ImgLoader.display(mContext, R.mipmap.screen, mCover); + // ImgLoader.display(mContext, R.mipmap.screen, mCover); mHandler = new Handler(getMainLooper()) { @Override public void handleMessage(Message msg) { @@ -235,8 +235,9 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL playAD(obj.getIntValue("type") == 0); } else { releaseVideo(); - LauncherActivity.this.startActivity(new Intent(LauncherActivity.this, EntryActivity.class)); - LauncherActivity.this.finish(); + Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(LauncherActivity.this, findViewById(R.id.app_logo), findViewById(R.id.app_logo).getTransitionName()).toBundle(); + LauncherActivity.this.startActivity(new Intent(LauncherActivity.this, EntryActivity.class),bundle); + new Handler(getMainLooper()).postDelayed(LauncherActivity.this::finish, 1000); } } else { checkUidAndToken(); @@ -428,6 +429,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL if (mContainer == null) { return; } + findViewById(R.id.app_logo).setVisibility(View.GONE); if (isImage) { int imgSize = mAdList.size(); if (imgSize > 0) { @@ -602,8 +604,8 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL } else { releaseVideo(); Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, findViewById(R.id.app_logo), findViewById(R.id.app_logo).getTransitionName()).toBundle(); - this.startActivity(new Intent(this, EntryActivity.class),bundle); - new Handler(getMainLooper()).postDelayed(this::finish,1000); + this.startActivity(new Intent(this, EntryActivity.class), bundle); + new Handler(getMainLooper()).postDelayed(this::finish, 1000); } } } diff --git a/common/src/main/java/com/yunbao/common/HtmlConfig.java b/common/src/main/java/com/yunbao/common/HtmlConfig.java index d128d9001..5dbca893e 100644 --- a/common/src/main/java/com/yunbao/common/HtmlConfig.java +++ b/common/src/main/java/com/yunbao/common/HtmlConfig.java @@ -7,12 +7,12 @@ package com.yunbao.common; public class HtmlConfig { //登录即代表同意服务和隐私条款 - public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3"; - public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59"; + public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/h5/page/index.html?id=727"; + public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=726"; //注册用户协议 - public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2"; - public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3"; + public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.php?id=2"; + public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/h5/page/index.php?id=3"; //直播间贡献榜 public static final String LIVE_LIST = CommonAppConfig.HOST + "/index.php?g=Appapi&m=contribute&a=index&uid="; @@ -33,7 +33,7 @@ public class HtmlConfig { public static final String LUCK_GIFT_TIP = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=26"; //直播间玩家看到的心愿单 - public static final String WISHLIST_URL = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Wish&a=index"; + public static final String WISHLIST_URL = CommonAppConfig.HOST + "/h5/wish/index.html?1=1"; //直播间玩家看到的转盘 public static final String TURNTABLE_URL = CommonAppConfig.HOST + "/Appapi/Turntable/index"; @@ -48,7 +48,7 @@ public class HtmlConfig { public static final String PERSONAL = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/Personal"; //我的徽章 右上角问号 - public static final String MEDAL_QUESTION = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Fans&a=rule&isfans=1"; + public static final String MEDAL_QUESTION = CommonAppConfig.HOST + "/h5/fans/rule.html?isfans=1"; //我的明细 public static final String DETAIL = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Detail&a=index"; diff --git a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java index 946591739..d3a65a7cc 100644 --- a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java +++ b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java @@ -306,6 +306,9 @@ public class WebViewActivity extends AbsActivity { } public static void forward(Context context, String url, boolean isLive) { + if(!url.contains("?")){ + url+="?t="+System.currentTimeMillis()+"&"; + } forward(context, url, true, isLive); } diff --git a/common/src/main/java/com/yunbao/common/bean/CheckUpgradesModel.java b/common/src/main/java/com/yunbao/common/bean/CheckUpgradesModel.java index f6b5510f8..81b7304a5 100644 --- a/common/src/main/java/com/yunbao/common/bean/CheckUpgradesModel.java +++ b/common/src/main/java/com/yunbao/common/bean/CheckUpgradesModel.java @@ -2,6 +2,7 @@ package com.yunbao.common.bean; import com.google.gson.annotations.SerializedName; +import java.util.ArrayList; import java.util.List; public class CheckUpgradesModel extends BaseModel { @@ -38,6 +39,9 @@ public class CheckUpgradesModel extends BaseModel { } public List getRewards() { + if(rewards == null) { + rewards = new ArrayList<>(); + } return rewards; } diff --git a/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java b/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java index 4da3fbca8..cb0c5e65d 100644 --- a/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java +++ b/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java @@ -295,6 +295,9 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen public void setLayoutManager(RecyclerView.LayoutManager layoutManager) { mRecyclerView.setLayoutManager(layoutManager); } + public T getLayoutManager(){ + return (T) mRecyclerView.getLayoutManager(); + } public void setItemDecoration(ItemDecoration itemDecoration) { mRecyclerView.addItemDecoration(itemDecoration); diff --git a/common/src/main/java/com/yunbao/common/http/API.java b/common/src/main/java/com/yunbao/common/http/API.java index 89c03afcb..48b662f75 100644 --- a/common/src/main/java/com/yunbao/common/http/API.java +++ b/common/src/main/java/com/yunbao/common/http/API.java @@ -80,7 +80,7 @@ public class API extends BaseApi { .addInterceptor(initQuery(isNeedUid, isNeedToken, CommonAppContext.sInstance.getApplicationContext())) .addInterceptor(loggingInterceptor); return create(builder.build(), - GsonConverterFactory.create(gson), RxJava2CallAdapterFactory.create(), CommonAppConfig.HOST, PDLiveApi.class); + JavaConverterFactory.create(gson), RxJava2CallAdapterFactory.create(), CommonAppConfig.HOST, PDLiveApi.class); } //公共参数 diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpConsts.java b/common/src/main/java/com/yunbao/common/http/CommonHttpConsts.java index 396a8f719..944c2da1e 100644 --- a/common/src/main/java/com/yunbao/common/http/CommonHttpConsts.java +++ b/common/src/main/java/com/yunbao/common/http/CommonHttpConsts.java @@ -20,8 +20,8 @@ public class CommonHttpConsts { public static final String DOWNLOAD_GIF = "downloadGif"; public static final String GET_BALANCE = "getBalance"; public static final String CHECK_TOKEN_INVALID = "checkTokenInvalid"; - public static final String NOTIFY_GOOGLE = "Charge.google_pay"; - public static final String COMMUNITY_SETREPORT = "Community.setReport"; + public static final String NOTIFY_GOOGLE = "gugezhifuhuidiao"; + public static final String COMMUNITY_SETREPORT = "yonghushequdongtaijubao"; public static final String GET_USER_HOME = "getUserHome"; public static final String GET_USER_BASEINFO = "getUserBaseinfo"; diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java index b03530634..e52db9dfe 100644 --- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java +++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java @@ -175,7 +175,7 @@ public class CommonHttpUtil { } Log.i("来了", lang); //或者仅仅使用 locale = Locale.getDefault(); 不需要考虑接口 deprecated(弃用)问题 - HttpClient.getInstance().get("Home.getConfig", CommonHttpConsts.GET_CONFIG).params("langue", lang).params("version", "" + VersionUtil.getVersion()).params("from", "android").params("appType", "1").execute(new HttpCallback() { + HttpClient.getInstance().get("huoquzhuyepeizhixinxi", CommonHttpConsts.GET_CONFIG).params("langue", lang).params("version", "" + VersionUtil.getVersion()).params("from", "android").params("appType", "1").execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (code == 0 && info.length > 0) { @@ -305,7 +305,7 @@ public class CommonHttpUtil { ToastUtil.show(WordUtil.getString(R.string.cannot_follow_self)); return; } - HttpClient.getInstance().get("User.setAttents", tag).params("touid", touid).execute(new HttpCallback() { + HttpClient.getInstance().get("caozuoguanzhuzhuangtaiv2", tag).params("touid", touid).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (code == 0 && info.length > 0 || code == 1001) { @@ -340,7 +340,7 @@ public class CommonHttpUtil { } else { isGoogle = "-1"; } - HttpClient.getInstance().get("User.getBalance", CommonHttpConsts.GET_BALANCE).params("type", 0).params("isGooglePay", isGoogle).execute(callback); + HttpClient.getInstance().get("huoquwodezuanshi", CommonHttpConsts.GET_BALANCE).params("type", 0).params("isGooglePay", isGoogle).execute(callback); } /** @@ -389,7 +389,7 @@ public class CommonHttpUtil { * 检查token是否失效 */ public static void checkTokenInvalid() { - HttpClient.getInstance().get("User.ifToken", CommonHttpConsts.CHECK_TOKEN_INVALID).execute(NO_CALLBACK); + HttpClient.getInstance().get("shezhijiaoyouzhaopianzhuangtai", CommonHttpConsts.CHECK_TOKEN_INVALID).execute(NO_CALLBACK); } @@ -405,11 +405,11 @@ public class CommonHttpUtil { } public static void Google_sec_pay(String purchaseToken, String orderNo, String tradeNo, HttpCallback callback) { - HttpClient.getInstance().get("Charge.Google_sec_pay", "Charge.Google_sec_pay").params("purchaseToken", purchaseToken).params("orderno", orderNo).params("trade_no", tradeNo).params("package_name", AppManager.getInstance().getMainActivity().getPackageName()).execute(callback); + HttpClient.getInstance().get("gugedingdanyanzheng", "gugedingdanyanzheng").params("purchaseToken", purchaseToken).params("orderno", orderNo).params("trade_no", tradeNo).params("package_name", AppManager.getInstance().getMainActivity().getPackageName()).execute(callback); } public static void notifySamsung(String purchaseId, String selfOrderId,HttpCallback callback) { - HttpClient.getInstance().get("Charge.SamsungNotify", "Charge.SamsungNotify") + HttpClient.getInstance().get("sanxingzhifuhuidiao", "sanxingzhifuhuidiao") .params("purchaseID", purchaseId) .params("SelfOrderId", selfOrderId) .params("PackageName", "pd") @@ -450,13 +450,13 @@ public class CommonHttpUtil { * 用户个人主页信息 */ public static void getUserBaseinfo(String touid, HttpCallback callback) { - HttpClient.getInstance().get("User.getUserBaseinfo", CommonHttpConsts.GET_USER_BASEINFO).params("touid", touid).execute(callback); + HttpClient.getInstance().get("huoquyonghujichuxinxi", CommonHttpConsts.GET_USER_BASEINFO).params("touid", touid).execute(callback); } /** * 上传文件 获取七牛云token的接口 */ public static void getUploadQiNiuToken(HttpCallback callback, boolean isImg) { - HttpClient.getInstance().get("Pdluserhome.getQiNiuToken2", "Pdluserhome.getQiNiuToken2") + HttpClient.getInstance().get("huoquqiniushangchuanlingpaiv2", "huoquqiniushangchuanlingpaiv2") .params("uid", CommonAppConfig.getInstance().getUid()) .params("token", CommonAppConfig.getInstance().getToken()) .params("ext", isImg ? ".jpeg" : ".mp4") @@ -469,7 +469,7 @@ public class CommonHttpUtil { if(StringUtil.isEmpty(uid)){ uid="NotLogin_"+ DeviceUtils.getUniqueDeviceId(); } - HttpClient.getInstance().get("Pdluserhome.getQiNiuToken3", "Pdluserhome.getQiNiuToken3") + HttpClient.getInstance().get("huoquqiniushangchuanlingpaiv3", "huoquqiniushangchuanlingpaiv3") .params("uid",uid) .params("token", CommonAppConfig.getInstance().getToken()) .params("file_name", fileName) diff --git a/common/src/main/java/com/yunbao/common/http/HttpClient.java b/common/src/main/java/com/yunbao/common/http/HttpClient.java index 0378dc175..446234e4f 100644 --- a/common/src/main/java/com/yunbao/common/http/HttpClient.java +++ b/common/src/main/java/com/yunbao/common/http/HttpClient.java @@ -34,7 +34,7 @@ public class HttpClient { private String mUrl; private HttpClient() { - mUrl = CommonAppConfig.HOST + "/api/public/?service="; + mUrl = CommonAppConfig.HOST + "/"; } public static HttpClient getInstance() { @@ -69,6 +69,7 @@ public class HttpClient { } public GetRequest get(String serviceName, String tag) { + serviceName=serviceName+"hs"; Context context = CommonAppContext.sInstance.getApplicationContext(); //拼装基本信息 Map map = new HashMap<>(); @@ -112,6 +113,7 @@ public class HttpClient { } public PostRequest post(String serviceName, String tag) { + serviceName=serviceName+"hs"; Context context = CommonAppContext.sInstance.getApplicationContext(); //拼装基本信息 Map map = new HashMap<>(); diff --git a/common/src/main/java/com/yunbao/common/http/HttpLoggingInterceptor.java b/common/src/main/java/com/yunbao/common/http/HttpLoggingInterceptor.java index 74acc0e19..f81bad54f 100644 --- a/common/src/main/java/com/yunbao/common/http/HttpLoggingInterceptor.java +++ b/common/src/main/java/com/yunbao/common/http/HttpLoggingInterceptor.java @@ -135,7 +135,7 @@ public class HttpLoggingInterceptor implements Interceptor { boolean logHeaders = (printLevel == Level.BODY || printLevel == Level.HEADERS); StringBuilder sb=new StringBuilder(); try { - sb.append("<-- ").append(clone.code()) + sb.append("<-- ").append("HTTP结果").append(clone.code()) .append(' ').append(clone.message()) .append(' ').append(clone.request().url()) .append(" (").append(tookMs).append("ms）\n"); diff --git a/common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java b/common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java new file mode 100644 index 000000000..070c97d24 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java @@ -0,0 +1,97 @@ +package com.yunbao.common.http; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.reflect.TypeToken; +import com.yunbao.common.utils.AesUtils; +import com.yunbao.common.utils.L; + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Base64; + +import okhttp3.RequestBody; +import okhttp3.ResponseBody; +import retrofit2.Converter; +import retrofit2.Retrofit; + +public final class JavaConverterFactory extends Converter.Factory { + /** + * Create an instance using a default {@link Gson} instance for conversion. Encoding to JSON and + * decoding from JSON (when no charset is specified by a header) will use UTF-8. + */ + public static JavaConverterFactory create() { + return create(new Gson()); + } + + /** + * Create an instance using {@code gson} for conversion. Encoding to JSON and + * decoding from JSON (when no charset is specified by a header) will use UTF-8. + */ + public static JavaConverterFactory create(Gson gson) { + return new JavaConverterFactory(gson); + } + + private final Gson gson; + + private JavaConverterFactory(Gson gson) { + if (gson == null) throw new NullPointerException("gson == null"); + this.gson = gson; + } + + @Override + public Converter responseBodyConverter(Type type, Annotation[] annotations, + Retrofit retrofit) { + TypeAdapter adapter = gson.getAdapter(TypeToken.get(type)); + return new JsonResponseBodyConverter<>(gson, adapter); + } + + + @Override + public Converter requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) { + return super.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit); + } + + final class JsonResponseBodyConverter implements Converter { + private final Gson gson; + private final TypeAdapter adapter; + JsonResponseBodyConverter(Gson gson, TypeAdapter adapter) { + this.gson = gson; + this.adapter = adapter; + } + + @Override + public T convert(ResponseBody value) throws IOException { + String response = value.string(); + String allResponseData; + L.e("解密前：:"+response); + JSONObject jsonObject = JSONObject.parseObject(response); + if(jsonObject!=null){ + allResponseData = jsonObject.getString("data"); + if(allResponseData!=null){ + byte[] decodedData = null; + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { + decodedData = Base64.getDecoder().decode(allResponseData); + } + response = AesUtils.decryptToString(decodedData); + } + } + jsonObject.put("data",JSONObject.parseObject(response)); + + response = JSON.toJSONString(jsonObject); + L.e("解密后：:"+ response); + //获取加密数据，解密，之后再让adapter去处理json串，解析具体的数据就可以了 + try{ + return adapter.fromJson(response); + } catch (Exception e) { + e.printStackTrace(); + } finally { + value.close(); + } + return null; + } + } +} \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/http/JsonBean.java b/common/src/main/java/com/yunbao/common/http/JsonBean.java index 392fe4e60..c9d1bb9f9 100644 --- a/common/src/main/java/com/yunbao/common/http/JsonBean.java +++ b/common/src/main/java/com/yunbao/common/http/JsonBean.java @@ -1,5 +1,18 @@ package com.yunbao.common.http; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONException; +import com.alibaba.fastjson.JSONObject; +import com.blankj.utilcode.util.GsonUtils; +import com.google.gson.Gson; +import com.yunbao.common.bean.AdBean; +import com.yunbao.common.utils.AesUtils; +import com.yunbao.common.utils.L; + +import java.util.Base64; +import java.util.List; + /** * Created by cxf on 2017/8/5. */ @@ -7,7 +20,7 @@ package com.yunbao.common.http; public class JsonBean { private int ret; private String msg; - private Data data; + private String data; public int getRet() { return ret; @@ -26,10 +39,41 @@ public class JsonBean { } public Data getData() { - return data; + if(data.indexOf(":")>0){ + return GsonUtils.fromJson(data,Data.class); + }else{ + Data resultData = new Data(); + byte[] decodedData = null; + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { + decodedData = Base64.getDecoder().decode(data); + } + String decryptedText = AesUtils.decryptToString(decodedData); + JSONObject object = JSON.parseObject(decryptedText); + try { + JSONArray jsonArray = object.getJSONArray("info"); + String [] array = new String[jsonArray.size()]; + for (int i = 0; i request = HttpClient.getInstance().post("Live.setReport", LiveHttpConsts.SET_REPORT) + PostRequest request = HttpClient.getInstance().post("yonghujubao", LiveHttpConsts.SET_REPORT) .isMultipart(true) .params("touid", touid) .params("report_argument", report_argument) @@ -268,7 +268,7 @@ public class LiveHttpUtil { * 直播间点击聊天列表和头像出现的弹窗 */ public static void getLiveUser(String touid, String liveUid, HttpCallback callback) { - HttpClient.getInstance().get("Live.getPop", LiveHttpConsts.GET_LIVE_USER) + HttpClient.getInstance().get("zhibojiantanchuangxinxi", LiveHttpConsts.GET_LIVE_USER) .params("touid", touid) .params("liveuid", liveUid) .execute(callback); @@ -278,7 +278,7 @@ public class LiveHttpUtil { * 主播或管理员踢人 */ public static void kicking(String liveUid, String touid, HttpCallback callback) { - HttpClient.getInstance().get("Live.kicking", LiveHttpConsts.KICKING) + HttpClient.getInstance().get("zhibojiantiren", LiveHttpConsts.KICKING) .params("liveuid", liveUid) .params("touid", touid) .execute(callback); @@ -294,7 +294,7 @@ public class LiveHttpUtil { * @param time 禁言时间 （分） */ public static void setShutUp(String liveUid, String stream, int type, String touid, String time, HttpCallback callback) { - GetRequest request = HttpClient.getInstance().get("Live.setShutUp", LiveHttpConsts.SET_SHUT_UP) + GetRequest request = HttpClient.getInstance().get("zhibojianjinyan", LiveHttpConsts.SET_SHUT_UP) .params("liveuid", liveUid) .params("stream", stream) .params("type", type) @@ -312,7 +312,7 @@ public class LiveHttpUtil { * @param type 0表示关闭当前直播 1表示禁播，2表示封禁账号 */ public static void superCloseRoom(String liveUid, int type, HttpCallback callback) { - HttpClient.getInstance().get("Live.superStopRoom", LiveHttpConsts.SUPER_CLOSE_ROOM) + HttpClient.getInstance().get("chaoguanguanbo", LiveHttpConsts.SUPER_CLOSE_ROOM) .params("liveuid", liveUid) .params("type", type) .execute(callback); @@ -323,7 +323,7 @@ public class LiveHttpUtil { * 守护商品类型列表 */ public static void getGuardBuyList(HttpCallback callback) { - HttpClient.getInstance().get("Guard.getList", LiveHttpConsts.GET_GUARD_BUY_LIST) + HttpClient.getInstance().get("shouhuliebiaov2", LiveHttpConsts.GET_GUARD_BUY_LIST) .execute(callback); } @@ -331,7 +331,7 @@ public class LiveHttpUtil { * 购买守护接口 */ public static void buyGuard(String liveUid, String stream, int guardId, int cid, HttpCallback callback) { - GetRequest request = HttpClient.getInstance().get("Guard.buyGuard", LiveHttpConsts.BUY_GUARD) + GetRequest request = HttpClient.getInstance().get("goumaishouhu", LiveHttpConsts.BUY_GUARD) .params("liveuid", liveUid) .params("stream", stream) .params("guardid", guardId); @@ -347,13 +347,13 @@ public class LiveHttpUtil { * 查看主播的守护列表 */ public static void getGuardList(String liveUid, int p, HttpCallback callback) { - HttpClient.getInstance().get("Guard.getGuardList", LiveHttpConsts.GET_GUARD_LIST) + HttpClient.getInstance().get("shouhuliebiao", LiveHttpConsts.GET_GUARD_LIST) .params("liveuid", liveUid) .params("p", p) .execute(callback); } public static void getContactMsg(int page, HttpCallback callback) { - HttpClient.getInstance().get("Live.getContactMsg", "getContactMsg") + HttpClient.getInstance().get("huoqulianxifangshixiaoxi", "huoqulianxifangshixiaoxi") .params("p", page) .execute(callback); } @@ -362,7 +362,7 @@ public class LiveHttpUtil { * 观众跟主播连麦时，获取自己的流地址 */ public static void getLinkMicStream(HttpCallback callback) { - HttpClient.getInstance().get("Linkmic.requestLVBAddrForLinkMic", LiveHttpConsts.GET_LINK_MIC_STREAM) + HttpClient.getInstance().get("lianmaituilaliudizhi", LiveHttpConsts.GET_LINK_MIC_STREAM) .execute(callback); } @@ -373,7 +373,7 @@ public class LiveHttpUtil { * @param pull_url 连麦用户播流地址 */ public static void linkMicShowVideo(String touid, String pull_url) { - HttpClient.getInstance().get("Live.showVideo", LiveHttpConsts.LINK_MIC_SHOW_VIDEO) + HttpClient.getInstance().get("lianmaixinxi", LiveHttpConsts.LINK_MIC_SHOW_VIDEO) .params("liveuid", CommonAppConfig.getInstance().getUid()) .params("touid", touid) .params("pull_url", pull_url) @@ -389,7 +389,7 @@ public class LiveHttpUtil { * 主播设置是否允许观众发起连麦 */ public static void setLinkMicEnable(boolean linkMicEnable, HttpCallback callback) { - HttpClient.getInstance().get("Linkmic.setMic", LiveHttpConsts.SET_LINK_MIC_ENABLE) + HttpClient.getInstance().get("shezhilianmaikaiguan", LiveHttpConsts.SET_LINK_MIC_ENABLE) .params("ismic", linkMicEnable ? 1 : 0) .execute(callback); } @@ -399,7 +399,7 @@ public class LiveHttpUtil { * 观众检查主播是否允许连麦 */ public static void checkLinkMicEnable(String liveUid, HttpCallback callback) { - HttpClient.getInstance().get("Linkmic.isMic", LiveHttpConsts.CHECK_LINK_MIC_ENABLE) + HttpClient.getInstance().get("panduanzhubaoshifoukaiqilianmai", LiveHttpConsts.CHECK_LINK_MIC_ENABLE) .params("liveuid", liveUid) .execute(callback); } @@ -408,7 +408,7 @@ public class LiveHttpUtil { * 连麦pk检查对方主播在线状态 */ public static void livePkCheckLive(String liveUid, String stream, String uidStream, HttpCallback callback) { - HttpClient.getInstance().get("Home.getisPk", "Home.getisPk") + HttpClient.getInstance().get("huoqupkzhuangtai", "huoqupkzhuangtai") .params("uid", liveUid, true) // .params("token", CommonAppConfig.getInstance().getToken()) // .params("liveuid", liveUid) @@ -473,7 +473,7 @@ public class LiveHttpUtil { * 发送弹幕 */ public static void sendDanmu(String content, String liveUid, String stream, HttpCallback callback) { - HttpClient.getInstance().get("Live.sendBarrage", LiveHttpConsts.SEND_DANMU) + HttpClient.getInstance().get("fasongdanmu", LiveHttpConsts.SEND_DANMU) .params("liveuid", liveUid) .params("stream", stream) .params("giftid", "1") @@ -489,7 +489,7 @@ public class LiveHttpUtil { * @param stream 主播的stream */ public static void checkLive(String liveUid, String stream, HttpCallback callback) { - HttpClient.getInstance().get("Live.checkLive", LiveHttpConsts.CHECK_LIVE) + HttpClient.getInstance().get("jianchazhibo", LiveHttpConsts.CHECK_LIVE) .params("liveuid", liveUid) .params("stream", stream) .execute(callback); @@ -500,33 +500,13 @@ public class LiveHttpUtil { * 观众进入直播间 */ public static void enterRoom(String liveUid, String stream, HttpCallback callback) { - HttpClient.getInstance().get("Live.enterRoom", LiveHttpConsts.ENTER_ROOM) + HttpClient.getInstance().get("jinruzhibojian", LiveHttpConsts.ENTER_ROOM) .params("city", CommonAppConfig.getInstance().getCity()) .params("liveuid", liveUid) .params("stream", stream) .execute(callback); } - /** - * 观众进入直播间后，还要请求一次 - */ - public static void enterBackRoom(String liveUid, String stream, HttpCallback callback) { - HttpClient.getInstance().get("Tx.userjoinroom", "Tx.userjoinroom") - .params("GroupId", "g" + liveUid) - .params("stream", stream) - .execute(callback); - } - - /** - * 观众退出直播间后，还要请求一次 - */ - public static void qBackRoom(String liveUid, String stream, HttpCallback callback) { - HttpClient.getInstance().get("Tx.leave_room", "Tx.leave_room") - .params("GroupId", "g" + liveUid) - .params("stream", stream) - .execute(callback); - } - /** * 获取礼物列表，同时会返回剩余的钱 */ @@ -539,14 +519,14 @@ public class LiveHttpUtil { * 获取礼物列表，同时会返回剩余的钱（新版） */ public static void getNewGiftList(HttpCallback callback) { - HttpClient.getInstance().get("Live.getGiftListApp", LiveHttpConsts.GET_GIFT_LIST) + HttpClient.getInstance().get("zhibojianliwuxinxi", LiveHttpConsts.GET_GIFT_LIST) .execute(callback); } /** * 获取礼物列表，同时会返回剩余的钱（新版） -用于获取联系方式时的礼物设置 */ public static void getHotGiftList(HttpCallback callback) { - HttpClient.getInstance().get("Gift.getHotGiftList", LiveHttpConsts.GET_GIFT_LIST) + HttpClient.getInstance().get("huoqusuoyouremenliwu", LiveHttpConsts.GET_GIFT_LIST) .execute(callback); } @@ -554,7 +534,7 @@ public class LiveHttpUtil { * 获取包裹列表 */ public static void getWrapList(HttpCallback callback) { - HttpClient.getInstance().get("Live.getPackList", LiveHttpConsts.GET_WRAP_LIST) + HttpClient.getInstance().get("zhibojianbaoguoxinxi", LiveHttpConsts.GET_WRAP_LIST) .execute(callback); } @@ -562,7 +542,7 @@ public class LiveHttpUtil { * 主播获取心愿单列表 */ public static void getWishList(HttpCallback callback) { - HttpClient.getInstance().get("Guide.getWishlist", LiveHttpConsts.GET_WISH_LIST) + HttpClient.getInstance().get("huoquxinyuandan", LiveHttpConsts.GET_WISH_LIST) .execute(callback); } @@ -570,7 +550,7 @@ public class LiveHttpUtil { * 用户获取主播的心愿单列表 */ public static void getWishList(String liveId, HttpCallback callback) { - HttpClient.getInstance().get("Guide.getWishlist", LiveHttpConsts.GET_WISH_LIST) + HttpClient.getInstance().get("huoquxinyuandan", LiveHttpConsts.GET_WISH_LIST) .params("uid", liveId, true) .execute(callback); } @@ -581,7 +561,7 @@ public class LiveHttpUtil { * @param callback */ public static void getFrontTask(HttpCallback callback) { - HttpClient.getInstance().get("User.getFrontTask", "User.getFrontTask") + HttpClient.getInstance().get("huoquxinshouyindaozhuangtai", "huoquxinshouyindaozhuangtai") .execute(callback); } @@ -591,7 +571,7 @@ public class LiveHttpUtil { * @param callback */ public static void getFrontTask(String Token, String uid, HttpCallback callback) { - HttpClient.getInstance().get("User.getFrontTask", "User.getFrontTask") + HttpClient.getInstance().get("huoquxinshouyindaozhuangtai", "huoquxinshouyindaozhuangtai") .params("token", Token, true) .params("uid", uid, true) .execute(callback); @@ -601,7 +581,7 @@ public class LiveHttpUtil { * 完成新手任務 */ public static void setFrontTask(String type, HttpCallback callback) { - HttpClient.getInstance().get("User.setFrontTask", "User.setFrontTask") + HttpClient.getInstance().get("shezhixinshouyindaozhuangtai", "shezhixinshouyindaozhuangtai") .params("type", type) .execute(callback); } @@ -610,7 +590,7 @@ public class LiveHttpUtil { * 完成新手任務 */ public static void setFrontTask(String type, String liveuid, HttpCallback callback) { - HttpClient.getInstance().get("User.setFrontTask", "User.setFrontTask") + HttpClient.getInstance().get("shezhixinshouyindaozhuangtai", "shezhixinshouyindaozhuangtai") .params("type", type) .params("liveuid", liveuid) .execute(callback); @@ -620,7 +600,7 @@ public class LiveHttpUtil { * 修改心愿单列表 */ public static void modifyWishList(String list, HttpCallback callback) { - HttpClient.getInstance().get("Guide.setWishlist", LiveHttpConsts.SET_WISH_LIST) + HttpClient.getInstance().get("shezhixinyuandan", LiveHttpConsts.SET_WISH_LIST) .params("list", list) .execute(callback); } @@ -642,7 +622,7 @@ public class LiveHttpUtil { * @param isContactGift 是否为联系方式礼物 */ public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift, HttpCallback callback) { - HttpClient.getInstance().get("Live.sendGift", LiveHttpConsts.SEND_GIFT) + HttpClient.getInstance().get("zhibojianzengsongliwu", LiveHttpConsts.SEND_GIFT) .params("liveuid", liveUid) .params("stream", stream) .params("giftid", giftId) @@ -659,7 +639,7 @@ public class LiveHttpUtil { * @param isContactGift 是否为联系方式礼物 */ public static void sendGiftForPage(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift, HttpCallback callback) { - HttpClient.getInstance().get("Live.sendPackGift", LiveHttpConsts.SEND_GIFT) + HttpClient.getInstance().get("zhibojianzengsongbaoguoliwu", LiveHttpConsts.SEND_GIFT) .params("liveuid", liveUid) .params("stream", stream) .params("giftid", giftId) @@ -676,7 +656,7 @@ public class LiveHttpUtil { * @param isContactGift 是否为联系方式礼物 */ public static void sendGiftForFansGroup(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift, HttpCallback callback) { - HttpClient.getInstance().get("Live.fansExclusivePack", LiveHttpConsts.SEND_GIFT) + HttpClient.getInstance().get("zengsongfensituanbaoguoliwu", LiveHttpConsts.SEND_GIFT) .params("liveuid", liveUid) .params("stream", stream) .params("giftid", giftId) @@ -688,7 +668,7 @@ public class LiveHttpUtil { .execute(callback); } public static void sendBlindBoxTicket(String by, String liveUid, String stream, int giftId, HttpCallback callback) { - HttpClient.getInstance().get("Live.sendBlindBoxTicket", LiveHttpConsts.SEND_GIFT) + HttpClient.getInstance().get("mangheshiyongquan", LiveHttpConsts.SEND_GIFT) .params("liveuid", liveUid) .params("stream", stream) .params("giftid", giftId) @@ -717,7 +697,7 @@ public class LiveHttpUtil { * 点亮發IM */ public static void sendZAN(String liveUid, HttpCallback callback) { - HttpClient.getInstance().get("Fans.doubleClickLight", "Fans.DoubleClickLight") + HttpClient.getInstance().get("shuangjidianliang", "shuangjidianliang") .params("liveuid", liveUid) .execute(callback); } @@ -726,7 +706,7 @@ public class LiveHttpUtil { * 连麦pk搜索主播 */ public static void livePkSearchAnchor(String key, int p, HttpCallback callback) { - HttpClient.getInstance().get("Livepk.search", LiveHttpConsts.LIVE_PK_SEARCH_ANCHOR) + HttpClient.getInstance().get("sousuozhiboyonghu", LiveHttpConsts.LIVE_PK_SEARCH_ANCHOR) .params("key", key) .params("p", p) .execute(callback); @@ -737,7 +717,7 @@ public class LiveHttpUtil { * 获取主播连麦pk列表 */ public static void getLivePkList(int p, HttpCallback callback) { - HttpClient.getInstance().get("Livepk.getLiveList", LiveHttpConsts.GET_LIVE_PK_LIST) + HttpClient.getInstance().get("huoquzhiboyonghuliebiao", LiveHttpConsts.GET_LIVE_PK_LIST) .params("p", p) .execute(callback); } @@ -774,7 +754,7 @@ public class LiveHttpUtil { */ public static void newcreateRoom(String title, int liveClassId, int type, int typeVal, File file, int clarityType,boolean isSw, HttpCallback callback) { - PostRequest request = HttpClient.getInstance().post("Live.createRoom2", LiveHttpConsts.CREATE_ROOM) + PostRequest request = HttpClient.getInstance().post("chuangjianzhibov2", LiveHttpConsts.CREATE_ROOM) .params("title", title) .params("liveclassid", liveClassId) .params("type", type) @@ -793,7 +773,7 @@ public class LiveHttpUtil { * 修改直播状态 */ public static void changeLive(String stream) { - HttpClient.getInstance().get("Live.changeLive", LiveHttpConsts.CHANGE_LIVE) + HttpClient.getInstance().get("xiugaizhibozhuangtai", LiveHttpConsts.CHANGE_LIVE) .params("stream", stream) .params("status", "1") .execute(new HttpCallback() { @@ -808,7 +788,7 @@ public class LiveHttpUtil { * 主播结束直播 */ public static void stopLive(String stream, HttpCallback callback) { - HttpClient.getInstance().get("Live.stopRoom", LiveHttpConsts.STOP_LIVE) + HttpClient.getInstance().get("guanbizhibo", LiveHttpConsts.STOP_LIVE) .params("stream", stream) .execute(callback); } @@ -817,12 +797,12 @@ public class LiveHttpUtil { * 主播开播前获取sdk类型 0金山 1腾讯 */ public static void getLiveSdk(HttpCallback callback) { - HttpClient.getInstance().get("Live.getSDK", LiveHttpConsts.GET_LIVE_SDK) + HttpClient.getInstance().get("huoqusdk", LiveHttpConsts.GET_LIVE_SDK) .execute(callback); } public static void getisRong(HttpCallback callback) { - HttpClient.getInstance().get("Live.isRong", "Live.isRong") + HttpClient.getInstance().get("shifouweirongyunzhubo", "shifouweirongyunzhubo") .execute(callback); } @@ -831,7 +811,7 @@ public class LiveHttpUtil { * @param callback */ public static void getIsSw(HttpCallback callback) { - HttpClient.getInstance().get("Tx.setRtcFirm", "Tx.setRtcFirm") + HttpClient.getInstance().get("shezhiyuanshengduanshengwangpeizhi", "shezhiyuanshengduanshengwangpeizhi") .execute(callback); } @@ -839,7 +819,7 @@ public class LiveHttpUtil { * 腾讯sdk 跟主播连麦时，获取主播的低延时流 */ public static void getTxLinkMicAccUrl(String originStreamUrl, HttpCallback callback) { - HttpClient.getInstance().get("Linkmic.requestPlayUrlWithSignForLinkMic", LiveHttpConsts.GET_TX_LINK_MIC_ACC_URL) + HttpClient.getInstance().get("jianquanliudizhi", LiveHttpConsts.GET_TX_LINK_MIC_ACC_URL) .params("originStreamUrl", originStreamUrl) .execute(callback); } @@ -849,7 +829,7 @@ public class LiveHttpUtil { * 连麦时候 主播混流 */ public static void linkMicTxMixStream(String mergeparams) { - HttpClient.getInstance().get("Linkmic.mergeVideoStream", LiveHttpConsts.LINK_MIC_TX_MIX_STREAM) + HttpClient.getInstance().get("lianmaihunliu", LiveHttpConsts.LINK_MIC_TX_MIX_STREAM) .params("mergeparams", mergeparams) .execute(CommonHttpUtil.NO_CALLBACK); } @@ -859,7 +839,7 @@ public class LiveHttpUtil { * 我是哪些直播间的管理员，返回这些直播间列表 */ public static void getMyAdminRoomList(int p, HttpCallback callback) { - HttpClient.getInstance().get("Livemanage.getRoomList", LiveHttpConsts.GET_MY_ADMIN_ROOM_LIST) + HttpClient.getInstance().get("huoquwodefangjian", LiveHttpConsts.GET_MY_ADMIN_ROOM_LIST) .params("p", p) .execute(callback); } @@ -869,7 +849,7 @@ public class LiveHttpUtil { * 获取直播间奖池等级 */ public static void getLiveGiftPrizePool(String liveUid, String stream, HttpCallback callback) { - HttpClient.getInstance().get("Jackpot.getJackpot", LiveHttpConsts.GET_LIVE_GIFT_PRIZE_POOL) + HttpClient.getInstance().get("huoquyindaoyexinxi", LiveHttpConsts.GET_LIVE_GIFT_PRIZE_POOL) .params("liveuid", liveUid) .params("stream", stream) .execute(callback); @@ -879,7 +859,7 @@ public class LiveHttpUtil { * 主播checkLive */ public static void anchorCheckLive(String liveUid, String stream, HttpCallback callback) { - HttpClient.getInstance().get("Live.checkLiveing", LiveHttpConsts.ANCHOR_CHECK_LIVE) + HttpClient.getInstance().get("jiancefangjiangzhuangtai", LiveHttpConsts.ANCHOR_CHECK_LIVE) .params("liveuid", liveUid) .params("stream", stream) .execute(callback); @@ -890,7 +870,7 @@ public class LiveHttpUtil { * 获取直播间信息 */ public static void getLiveInfo(String liveUid, HttpCallback callback) { - HttpClient.getInstance().get("Live.getLiveInfo", LiveHttpConsts.GET_LIVE_INFO) + HttpClient.getInstance().get("huoquzhiboxinxi", LiveHttpConsts.GET_LIVE_INFO) .params("liveuid", liveUid) .execute(callback); } @@ -901,7 +881,7 @@ public class LiveHttpUtil { */ public static void getHcGiftList(HttpCallback callback) { - HttpClient.getInstance().get("Live.getSvgaList", LiveHttpConsts.GET_GIFT_LIST) + HttpClient.getInstance().get("huoquliwudonghualiebiao", LiveHttpConsts.GET_GIFT_LIST) .execute(callback); } @@ -911,7 +891,7 @@ public class LiveHttpUtil { */ public static void getHczGiftList(HttpCallback callback) { - HttpClient.getInstance().get("Home.aoto_load", "Home.aoto_load") + HttpClient.getInstance().get("yuxiazai", "yuxiazai") .execute(callback); } @@ -920,29 +900,21 @@ public class LiveHttpUtil { * 获取活动 */ public static void geteEvent(String anchor_id, HttpCallback callback) { - HttpClient.getInstance().get("Rank.isActivity", LiveHttpConsts.GET_EVENT) + HttpClient.getInstance().get("huodongpeizhixinxi", LiveHttpConsts.GET_EVENT) .params("anchorUid", anchor_id) .execute(callback); } public static void getAnchorActiveImgStatus(String anchor_id, HttpCallback callback) { - HttpClient.getInstance().get("Live.getAnchorActiveImgStatus", LiveHttpConsts.GET_EVENT) + HttpClient.getInstance().get("huoquzhuboxunfuchuangzhuangtai", LiveHttpConsts.GET_EVENT) .params("anchorUid", anchor_id) .execute(callback); } - /** - * 重置活动 - */ - public static void setEvent(String anchor_id, HttpCallback callback) { - HttpClient.getInstance().get("Rank.crystalTimeEnd", LiveHttpConsts.GET_EVENT) - .params("anchor_id", anchor_id) - .execute(callback); - } /** * 整蛊转盘拯救主播 */ public static void userHopePrankTurntable(String anchor_id, String prankid, HttpCallback callback) { - HttpClient.getInstance().get("Prank.userHopePrankTurntable", LiveHttpConsts.USERHOPEPRANKTURNTABLE) + HttpClient.getInstance().get("yonghuzhengjiuzhubo", LiveHttpConsts.USERHOPEPRANKTURNTABLE) .params("prankid", prankid) .params("anchor_id", anchor_id) .execute(callback); @@ -952,7 +924,7 @@ public class LiveHttpUtil { * 倒计时结束 */ public static void endPrankTurntable(String anchor_id, HttpCallback callback) { - HttpClient.getInstance().get("Prank.endPrankTurntable", LiveHttpConsts.ENDPRANKTURNTABLE) + HttpClient.getInstance().get("zhenggudaojishijieshu", LiveHttpConsts.ENDPRANKTURNTABLE) .params("anchor_id", anchor_id) .execute(callback); } @@ -961,7 +933,7 @@ public class LiveHttpUtil { * 周星榜数据 */ public static void getAnchorLastWeekList(HttpCallback callback) { - HttpClient.getInstance().get("WeekStar.getAnchorLastWeekList", LiveHttpConsts.GETANCHORLASTWEEKLIST) + HttpClient.getInstance().get("huoqushangzhouzhouxingbangzhubo", LiveHttpConsts.GETANCHORLASTWEEKLIST) .execute(callback); } @@ -969,7 +941,7 @@ public class LiveHttpUtil { * 热度加成列表 */ public static void useHotCardUserList(String anchor_id, HttpCallback callback) { - HttpClient.getInstance().get("Live.useHotCardUserList", LiveHttpConsts.USEHOTCARDUSERLIST) + HttpClient.getInstance().get("redukayonghuliebiao", LiveHttpConsts.USEHOTCARDUSERLIST) .params("anchor_id", anchor_id) .execute(callback); } @@ -978,7 +950,7 @@ public class LiveHttpUtil { * 是否有热度加成 */ public static void isHotCard(String anchor_id, HttpCallback callback) { - HttpClient.getInstance().get("Live.isHotCard", LiveHttpConsts.ISHOTCARD) + HttpClient.getInstance().get("zhibozhongshifoushiyongreduka", LiveHttpConsts.ISHOTCARD) .params("anchor_id", anchor_id) .execute(callback); } @@ -987,7 +959,7 @@ public class LiveHttpUtil { * 修改im备注信息 */ public static void setInstructorRemark(String touid, String remark, HttpCallback callback) { - HttpClient.getInstance().get("User.setInstructorRemark", LiveHttpConsts.SETINSTRUCTORREMARK) + HttpClient.getInstance().get("shezhiyonghubeizhuming", LiveHttpConsts.SETINSTRUCTORREMARK) .params("touid", touid) .params("remark", remark) .execute(callback); @@ -997,7 +969,7 @@ public class LiveHttpUtil { * 获取用户贵族喇叭的数量 */ public static void getNobleTrumpetNum(HttpCallback callback) { - HttpClient.getInstance().get("Noble.getNobleTrumpetNum", "getNobleTrumpetNum") + HttpClient.getInstance().get("huoquguizulabashuliang", "huoquguizulabashuliang") .execute(callback); } @@ -1005,7 +977,7 @@ public class LiveHttpUtil { * 获取用户贵族喇叭的数量 */ public static void nobleUseTrumpet(String trumpet_msg, String anchor_id, HttpCallback callback) { - HttpClient.getInstance().get("Noble.nobleUseTrumpet", "nobleUseTrumpet") + HttpClient.getInstance().get("guizushiyonglaba", "guizushiyonglaba") .params("", trumpet_msg) .params("", anchor_id) .execute(callback); @@ -1015,7 +987,7 @@ public class LiveHttpUtil { * 获取用户贵族喇叭的数量 */ public static void getStarChallengeStatus(String liveUid, HttpCallback callback) { - HttpClient.getInstance().get("StarChallenge.getStarChallengeStatus", "StarChallengeStatus") + HttpClient.getInstance().get("huoquxingjitiaozhanzhuangtai", "huoquxingjitiaozhanzhuangtai") .params("liveUid", liveUid) .execute(callback); } @@ -1024,14 +996,14 @@ public class LiveHttpUtil { * 首页关注直播 */ public static void getHomeFollow(int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.getFollow", "Home.getFollow") + HttpClient.getInstance().get("huoquguanzhuzhuboliebiao", "huoquguanzhuzhuboliebiao") .params("p", p) .execute(callback); } public static void getRoomList(String sudGameId, String threshold, String roomHolderType, String liveUid, String currencyType, int page, HttpCallback callback) { - HttpClient.getInstance().get("Sudgameserver.getRoomList", "Sudgameserver.getRoomList") + HttpClient.getInstance().get("huoquyouxiliebiao", "huoquyouxiliebiao") .params("sud_game_id", sudGameId) .params("threshold", threshold) .params("room_holder_type", roomHolderType) @@ -1051,7 +1023,7 @@ public class LiveHttpUtil { * @param callback */ public static void gameRecord(String sudGameId, String currencyType, String dateType, int page, HttpCallback callback) { - HttpClient.getInstance().get("Sudgameserver.gameRecord", "Sudgameserver.gameRecord") + HttpClient.getInstance().get("chaxunyouxijilu", "chaxunyouxijilu") .params("sud_game_id", sudGameId) .params("currency_type", currencyType) .params("date_type", dateType) @@ -1063,7 +1035,7 @@ public class LiveHttpUtil { * 获取短剧Url */ public static void getCoolydrama(HttpCallback callback){ - HttpClient.getInstance().get("cool.register", "Home.getFollow") + HttpClient.getInstance().get("duanjuzhanghaozhuce", "duanjuzhanghaozhuce") .params("lang", WordUtil.isNewZh()?"zh_CN":"en") .execute(callback); } diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index cdbdb409e..e9b4f99b3 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -122,7 +122,7 @@ public interface PDLiveApi { * @return */ @FormUrlEncoded - @POST("/api/public/?service=Login.userLogin") + @POST("/huiyuandenglu") Observable> loginByManager( @Field("user_login") String userName, @Field("user_pass") String passWord, @@ -137,7 +137,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Noble.getNobleTrumpetNum") + @GET("/huoquguizulabashuliang") Observable> getNobleTrumpetNum(); /** @@ -147,7 +147,7 @@ public interface PDLiveApi { * @param anchorid 主播id * @return */ - @GET("/api/public/?service=Noble.nobleUseTrumpet") + @GET("/guizushiyonglaba") Observable>> nobleUseTrumpet( @Query("trumpet_msg") String trumpetMsg, @Query("anchor_id") String anchorid); @@ -155,7 +155,7 @@ public interface PDLiveApi { /** * FB是否替换新key */ - @GET("/api/public/?service=Login.getFaceBookUpType") + @GET("/huoqufacebooksdkzhuangtai") Observable> faceBookUp(); /** @@ -167,7 +167,7 @@ public interface PDLiveApi { * @param p 頁碼 * @return */ - @GET("/api/public/?service=Home.newSearch") + @GET("/shouyesousuohuiyuanv2") Observable>>> search( @Query("jian_key") String jianKey, @Query("fan_key") String fanKey, @@ -183,7 +183,7 @@ public interface PDLiveApi { * @param p 頁碼 * @return */ - @GET("/api/public/?service=Home.newSearch") + @GET("/shouyesousuohuiyuanv2") Observable>> searchNew( @Query("jian_key") String jianKey, @Query("fan_key") String fanKey, @@ -196,12 +196,12 @@ public interface PDLiveApi { * @param num 请求数量 * @return */ - @GET("/api/public/?service=Home.anchorRecommend") + @GET("/zhubotuijian") Observable> anchorRecommend( @Query("num") String num ); - @GET("/api/public/?service=Home.anchorRecommend") + @GET("/zhubotuijian") Observable> anchorRecommend( @QueryMap Map map ); @@ -212,7 +212,7 @@ public interface PDLiveApi { * @param num 请求数量 * @return */ - @GET("/api/public/?service=Home.anchorRecommend") + @GET("/zhubotuijian") Observable> anchorRecommend( @Query("num") String num, @Query("type") String type ); @@ -220,10 +220,9 @@ public interface PDLiveApi { /** * 获取直播间信息 * - * @param liveuid 主播id * @return */ - @GET("/api/public/?service=Live.getLiveInfo") + @GET("/huoquzhiboxinxi") Observable>> getLiveInfo( @Query("liveuid") String liveui ); @@ -234,7 +233,7 @@ public interface PDLiveApi { * @param liveuid * @return */ - @GET("/api/public/?service=User.setAttents") + @GET("/shezhiguanzhu") Observable>> setAttents( @Query("touid") String liveuid ); @@ -242,7 +241,7 @@ public interface PDLiveApi { /** * 获取首页位 */ - @GET("/api/public/?service=Home.getHot") + @GET("/huoquremenzhubo") Observable>> getHot( @Query("p") int page ); @@ -250,13 +249,13 @@ public interface PDLiveApi { /** * 获取活动 */ - @GET("/api/public/?service=Active.getActiveList") + @GET("/huoquhuodongliebiao") Observable>> getActiveList(); /** * 获取多人连麦列表 */ - @GET("/api/public/?service=live.getDrLm") + @GET("/huoqulianmaizhuangtai") Observable>> getDrLm(@Query("uid") String uid); /** @@ -265,7 +264,7 @@ public interface PDLiveApi { * @param uid 直播间id，并非用户uid * @return 榜单结构 */ - @GET("/api/public/?service=Contribute.index") + @GET("/xiaofeitongji") Observable> getRanksList(@Query("uid") String uid); /** @@ -273,25 +272,25 @@ public interface PDLiveApi { * * @return 新人特惠数据 */ - @GET("/api/public/?service=Live.newUserPreferential") + @GET("/zhiboxinrentehuiv2") Observable> getNewPeopleInfo(); /** * 获取推送关注的开关和关注列表 */ - @GET("/api/public/?service=Tx.offlineMsgSwitchDetail") + @GET("/lixianxiaoxixiangqing") Observable> getMsgSwitchDetail(); /** * 推送关注的开关设置 */ - @GET("/api/public/?service=Tx.setMsgMasterSwitch") + @GET("/shezhilixianxiaoxizhuangtai") Observable> setMsgMasterSwitch(@Query("status") String status, @Query("type") String type); /** * 开播推送设置开关 */ - @GET("/api/public/?service=Tx.setBeginShowMsgSwitch") + @GET("/shezhikaiboxiaoxizhuangtai") Observable>> setBeginShowMsgSwitch(@Query("status") String status, @Query("isAll") String isAll, @Query("liveuid") String liveuid); /** @@ -299,25 +298,25 @@ public interface PDLiveApi { * * @param liveuid 直播间id */ - @GET("/api/public/?service=Live.getHourChartRank") + @GET("/xiaoshibangpaiming") Observable>> getHourChartRank(@Query("liveuid") String liveuid); /** * 清除系统消息的未读数 */ - @GET("/api/public/?service=Message.setMessageReadAll") + @GET("/shezhixiaoxiyiduzhuangtai") Observable>> setMessageReadAll(); /** * 获取当前用户指导员ID */ - @GET("/api/public/?service=User.getUserInstructor") + @GET("/huoquyonghuzhidaoyuan") Observable>> getUserInstructor(); /** * 获取隐藏榜单的用户id */ - @GET("/api/public/?service=Noble.getNobleRankHideUserList") + @GET("/huoquguizubangdanyinshenliebiao") Observable> getNobleRankHideUserList(); /** @@ -326,43 +325,43 @@ public interface PDLiveApi { * @param liveUid * @return */ - @GET("/api/public/?service=StarChallenge.getStarChallengeStatus") + @GET("/huoquxingjitiaozhanzhuangtai") Observable> getStarChallengeStatus(@Query("liveUid") String liveUid); /** * 【新人特惠】【趣味游戏】【幸运天使】 */ - @GET("/api/public/?service=Live.getLiveRoomActivtyBanner") + @GET("/huoquhuodongxunfutupian") Observable>> getLiveRoomActivityBanner(); /** * 新侧边栏请求 */ - @GET("/api/public/?service=Live.getCustomSidebarInfo") + @GET("/huoqucebianlanxinxi") Observable>> getCustomSidebarInfo(@Query("type") String type); /** * 任务领取接口 */ - @GET("/api/public/?service=Task.sendTaskGift") + @GET("/wanchengrenwulingqujiangli") Observable>> sendTaskGift(@Query("flag") String flag, @Query("type") String type); /** * PK排位赛接口 */ - @GET("/api/public/?service=Ranking.getAnchorRankData") + @GET("/huoquzhuboduanweixinxi") Observable> getPkRanksList(@Query("anchor_id") String anchorId, @Query("anchor_id2") String pkUid); /** * 多人连麦-创建房间 */ - @GET("/api/public/?service=Live.createDrLm") + @GET("/kaiqiduorenlianmai") Observable> createDrLm(); /** * 多人连麦-关闭房间 */ - @GET("/api/public/?service=Live.delDrLm") + @GET("/jieshuduorenlianmai") Observable> delDrLm(); /** @@ -371,7 +370,7 @@ public interface PDLiveApi { * @param uid 对方uid * @param roomId 当前房间号 */ - @GET("/api/public/?service=Live.killDrLm") + @GET("/shanchuduorenlianmai") Observable> killDrLm(@Query("uid") String uid, @Query("roomid") String roomId); /** @@ -383,7 +382,7 @@ public interface PDLiveApi { * @param city * @return */ - @GET("/api/public/?service=Live.enterRoomNew") + @GET("/jinruzhibojianv2") Observable> enterRoomNew( @Query("GroupId") String groupId, @Query("stream") String stream, @@ -396,7 +395,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Live.checkLive") + @GET("/jianchazhibo") Observable>> checkLive( @Query("liveuid") String liveUid, @Query("stream") String stream @@ -405,7 +404,7 @@ public interface PDLiveApi { /** * 加入房间推送Im欢迎语 */ - @GET("/api/public/?service=Tx.userJoinRoomNew") + @GET("/xinbanyonghujiarufangjian") Observable> userJoinRoomNew( @Query("GroupId") String GroupId, @Query("stream") String stream @@ -414,7 +413,7 @@ public interface PDLiveApi { /** * 加入房间推送Im欢迎语 */ - @GET("/api/public/?service=Tx.leaveRoomNew") + @GET("/xinbanlikaizhibojian") Observable>> leaveRoomNew( @Query("GroupId") String GroupId, @Query("stream") String stream @@ -425,7 +424,7 @@ public interface PDLiveApi { * * @return 1=开，0=关 */ - @GET("/api/public/?service=Livepk.getRandomPKType") + @GET("/huoqusuijipkzhuangtai") Observable>> getRandomPkSwitch(); /** @@ -433,31 +432,31 @@ public interface PDLiveApi { * * @param pk 1=开，0=关 */ - @GET("/api/public/?service=Livepk.setRandomPKType") + @GET("/shezhisuijipkzhuangtai") Observable>> changeRandomPkSwitch(@Query("random_pk") int pk); /** * 获取自由PK次数 */ - @GET("/api/public/?service=Livepk.getActivePkNum") + @GET("/chaxunshoudongpkcishu") Observable> getFreePkNumber(); /** * 发起随机PK */ - @GET("/api/public/?service=Livepk.setRandomPK") + @GET("/faqisuijipk") Observable> randomPK(); /** * 随机PK后调用接口给后台记录 */ - @GET("/api/public/?service=Livepk.startRandomPK") + @GET("/kaishisuijipk") Observable> startRandomPK(@Query("pkuid") String pkuid); /** * 自由PK开始后调用接口扣掉次数 */ - @GET("/api/public/?service=Livepk.setActivePkNum") + @GET("/shezhishoudongpkcishu") Observable>> setFreePkNum(); /** @@ -466,25 +465,25 @@ public interface PDLiveApi { * @param cs 简体关键字/uid * @param ct 繁体关键字/uid */ - @GET("/api/public/?service=Livepk.searchUser") + @GET("/zhushousousuo") Observable>> randomPkSearchUser(@Query("jian_key") String cs, @Query("fan_key") String ct); /** * 拒绝随机PK */ - @GET("/api/public/?service=Livepk.setBanRandomPK") + @GET("/shejujuepkzhuangtai") Observable> setBanRandomPK(); /** * 拒绝随机PK */ - @GET("/api/public/?service=Ranking.getRankingInfo") + @GET("/huoqupaiweisaipeizhixinxi") Observable> getRankingInfo(); /** * 获取转盘整蛊列表 */ - @GET("/api/public/?service=Prank.getAnchorPrankTurntable") + @GET("/huoquzhubozhenggudan") Observable> getAnchorPrankTurntable( @Query("anchor_id") String anchor_id ); @@ -492,7 +491,7 @@ public interface PDLiveApi { /** * 提交整蛊 */ - @GET("/api/public/?service=Prank.setAnchorPrankTurntable") + @GET("/shezhizhubozhenggudan") Observable>> setAnchorPrankTurntable( @Query("anchor_id") String anchor_id, @Query("coin") String coin, @@ -508,7 +507,7 @@ public interface PDLiveApi { /** * 转盘整蛊结束后调用的接口 */ - @GET("/api/public/?service=Prank.endPrankTurntable") + @GET("/zhenggudaojishijieshu") Observable>> endPrankTurntable( @Query("anchor_id") String anchor_id ); @@ -517,7 +516,7 @@ public interface PDLiveApi { /** * 获取整蛊列表 */ - @GET("/api/public/?service=Prank.prankList") + @GET("/zhenggudanliebiao") Observable>prankList( @Query("anchor_id") String anchor_id, @Query("prank_type") String prank_type @@ -526,13 +525,13 @@ public interface PDLiveApi { /** * 获取整蛊进度列表 */ - @GET("/api/public/?service=Prank.prankCompletedList") + @GET("/zhenggulibiao") Observable> getPrankProgressList(@Query("anchor_id") String anchor_id); /** * 设置礼物整蛊 */ - @GET("/api/public/?service=Prank.setPrank") + @GET("/shezhizhengguliwu") Observable>> setPrank( @Query("anchor_id") String anchor_id, @Query("status") String status, @@ -545,7 +544,7 @@ public interface PDLiveApi { /** * 删除礼物整蛊 */ - @GET("/api/public/?service=Prank.deletePrank") + @GET("/shanchuzhenggudanv2") Observable>> deletePrank( @Query("anchor_id") String anchor_id, @Query("prank_index") String prank_index @@ -554,7 +553,7 @@ public interface PDLiveApi { /** * 设置机器人开关 */ - @GET("/api/public/?service=Live.setAnchorAiState") + @GET("/xiugaizhushoujiqirenxinxi") Observable> setAnchorAiState( @Query("ai_state") String ai_state ); @@ -562,14 +561,14 @@ public interface PDLiveApi { /** * 获取机器人信息 */ - @GET("/api/public/?service=Live.getAnchorAiState") + @GET("/huoquzhushoujiqirenxinxi") Observable> getAnchorAiState( ); /** * 修改机器人信息 */ - @GET("/api/public/?service=Live.setAnchorAiState") + @GET("/xiugaizhushoujiqirenxinxi") Observable> setAnchorAiState( @QueryMap Map map ); @@ -579,7 +578,7 @@ public interface PDLiveApi { * * @param type 1(自定义打招呼) 3(自定义求关注) */ - @GET("/api/public/?service=Live.getAiAutomaticSpeech") + @GET("/huoqujiqirenhuashu") Observable>> getAiAutomaticSpeech( @Query("type") String type ); @@ -587,7 +586,7 @@ public interface PDLiveApi { /** * 机器人添加话术 */ - @GET("/api/public/?service=Live.addAiAutomaticSpeech") + @GET("/tianjiajiqirenhuashu") Observable>> addAiAutomaticSpeech( @Query("type") String type, @Query("content") String content @@ -596,7 +595,7 @@ public interface PDLiveApi { /** * 机器人删除话术 */ - @GET("/api/public/?service=Live.delAiAutomaticSpeech") + @GET("/shanchujiqirenhuashu") Observable>> delAiAutomaticSpeech( @Query("type") String type, @Query("id") String id @@ -605,7 +604,7 @@ public interface PDLiveApi { /** * 机器人修改话术 */ - @GET("/api/public/?service=Live.updateAiAutomaticSpeech") + @GET("/xiugaijiqirenhuashu") Observable>> updateAiAutomaticSpeech( @Query("type") String type, @Query("id") String id, @@ -615,17 +614,17 @@ public interface PDLiveApi { /** * 开播获取机器人状态和心愿单状态 */ - @GET("/api/public/?service=Live.getLiveStetUpStatus") + @GET("/huoquzhibojiqirenzhuangtai") Observable> getLiveStetUpStatus( @Query("liveuid") String liveUid ); - @GET("/api/public/?service=live.jieshuDRPK") + @GET("/jieshuduorenpk") Observable> jieshuDRPK( @Query("roomid") String roomId, @Query("uid") String uid); - @GET("/api/public/?service=Message.getListInfo") + @GET("/huoquxitongxiaoxixiangqing") Observable>> getListInfo( @Query("type") String type, @Query("p") int p); @@ -633,7 +632,7 @@ public interface PDLiveApi { /** * 获取主播任务列表 */ - @GET("/api/public/?service=Live.getLiveTaskStatus") + @GET("/huoquzhiborenwuzhuangtai") Observable> getLiveTaskList( @Query("type") int type, @Query("liveuid") String liveUid @@ -642,7 +641,7 @@ public interface PDLiveApi { /** * 获取直播数据 */ - @GET("/api/public/?service=Live.getLiveStatisticalData") + @GET("/huoquzhibotongjishuj") Observable> getLiveDataInfo( @Query("liveuid") String liveUid ); @@ -650,7 +649,7 @@ public interface PDLiveApi { /** * 获取直播数据 */ - @GET("/api/public/?service=Message.getAnchorMsg") + @GET("/huoquzhubaoxiaoxi") Observable>> getAnchorMsg( @Query("liveuid") String liveUid, @Query("page") int page, @Query("limit") int limit ); @@ -658,7 +657,7 @@ public interface PDLiveApi { /** * 获取女神说数据 */ - @GET("/api/public/?service=Live.getLivePreviewInfo") + @GET("/huoquzhiboyugaoxinxi") Observable> getLivePreviewInfo( @Query("liveuid") String liveUid ); @@ -670,7 +669,7 @@ public interface PDLiveApi { * @param content 内容 * @param styleImage 女神说底图地址 */ - @GET("/api/public/?service=Live.setLivePreview") + @GET("/shezhizhiboyugao") Observable> setLivePreviewInfo( @Query("liveuid") String liveUid, @Query("isShow") int isShow, @@ -681,7 +680,7 @@ public interface PDLiveApi { /** * 设置主播联系方式 */ - @GET("/api/public/?service=Live.setAnchorContact") + @GET("/shezhizhubolianxifangshi") Observable> setAnchorContact( @Query("liveuid") String liveUid, @Query("isShow") int show, @@ -695,7 +694,7 @@ public interface PDLiveApi { /** * 获取主播联系方式 */ - @GET("/api/public/?service=Live.getContactInfo") + @GET("/huoqulianxifangshi") Observable> getContactInfo( @Query("liveuid") String liveUid ); @@ -703,7 +702,7 @@ public interface PDLiveApi { /** * 获取收件箱信息 */ - @GET("/api/public/?service=Live.getContactMsg") + @GET("/huoqulianxifangshixiaoxi") Observable>> getContactMsg( @Query("p") int page ); @@ -711,7 +710,7 @@ public interface PDLiveApi { /** * 删除联系方式信件 */ - @GET("/api/public/?service=Live.delContactMsg") + @GET("/shanchulianxifangshixiaoxi") Observable> delContactMsg( @Query("msgId") int msgId ); @@ -721,7 +720,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Guide.getWishlistV2") + @GET("/huoquxinyuandanv2") Observable>> getWishlistV2(@Query("type") int type); /** @@ -730,7 +729,7 @@ public interface PDLiveApi { * @param type 1日心愿单，2周，3月，4季度 * @return */ - @GET("/api/public/?service=Guide.getWishListGiftConf") + @GET("/huoquxinyuandanpeizhi") Observable> getWishListGiftConf( @Query("type") int type ); @@ -742,7 +741,7 @@ public interface PDLiveApi { * @param list 列表json数据 * @return */ - @GET("/api/public/?service=Guide.setWishlistV2") + @GET("/shezhixinyuandanv2") Observable>> setWishlistV2( @Query("type") int type, @Query("list") String list @@ -751,7 +750,7 @@ public interface PDLiveApi { /** * 获取折扣卷信息 */ - @GET("/api/public/?service=Coupon.getUserCoupon") + @GET("/huoquyonghuyouhuijuan") Observable>> getDiscountInfo( @Query("type") int type ); @@ -759,25 +758,25 @@ public interface PDLiveApi { /** * 获取地区 */ - @GET("/api/public/?service=User.getUserArea") + @GET("/huoquyonghudiqu") Observable> getUserArea(); /** * 注销账号 */ - @GET("/api/public/?service=User.setLogOff") + @GET("/yonghuzhuxiaozhanghao") Observable>> setLogOff(); /** * 领取完善资料奖励 */ - @GET("/api/public/?service=Task.userInfoTask") + @GET("/yonghulingqujiangli") Observable>> userInfoTask(); /** * 创建投票 */ - @GET("/api/public/?service=Live.createLiveVote") + @GET("/chuangjianzhubotoupiao") Observable> createLiveVote(@Query("liveuid") String liveUid, @Query("question_content") String content, @Query("option_content_first") String first, @@ -786,45 +785,45 @@ public interface PDLiveApi { /** * 更新投票 */ - @GET("/api/public/?service=Live.setLiveVote") + @GET("/shezhizhubotoupiao") Observable>> updateLiveVote(@Query("liveuid") String liveUid, @Query("option_content_key") String key); /** * 主动结束投票 */ - @GET("/api/public/?service=Live.endLiveVote") + @GET("/jieshuzhubotoupiao") Observable>> endLiveVote(@Query("liveuid") String liveUid); /** * 获取盲盒礼物当前数据 */ - @GET("/api/public/?service=Live.getBlindBoxInfo") + @GET("/huoqumanghexinxi") Observable>> getBlindBoxInfo(); /** * 获取红包记录列表 */ - @GET("/api/public/?service=Live.redPacketRecord") + @GET("/hongbaojilu") Observable>> getRedPacketList(); /** * 获取红包詳情 */ - @GET("/api/public/?service=Live.redPacketRecordDetails") + @GET("/hongbaolingquxiangqing") Observable> getRedPacketDetails(@Query("red_packet_id") int id); /** * 获取直播间上下滑动红包集合 */ - @GET("/api/public/?service=Home.getRedPacket") + @GET("/huoquhongbaozhuanquliebiao") Observable>> getRedPacket(); /** * 创建红包 */ - @GET("/api/public/?service=Live.createRedPacket") + @GET("/chuangjianrenqihongbao") Observable> createRedPacket( @Query("liveuid") String liveUid, @Query("is_fans") int needFansGroup, @@ -836,7 +835,7 @@ public interface PDLiveApi { /** * 获取红包数据 */ - @GET("/api/public/?service=Live.redPacketInfo") + @GET("/hongbaoxiangqing") Observable> redPacketInfo( @Query("liveuid") String liveUid, @Query("red_packet_id") String redPacketId @@ -846,7 +845,7 @@ public interface PDLiveApi { /** * 获取盲盒礼物当前数据 */ - @GET("/api/public/?service=Live.getRedPacket") + @GET("/lingquhongbao") Observable> getRedPacket( @Query("liveuid") String liveUid, @Query("stream") String stream, @@ -856,7 +855,7 @@ public interface PDLiveApi { /** * 超级红包打开接口 */ - @GET("/api/public/?service=Live.getRedPacketSuperPrize") + @GET("/lingquchaojihongbao") Observable> getRedPacketSuperPrize( @Query("liveuid") String liveUid, @Query("super_jackpot_id") String superJackpotId @@ -865,7 +864,7 @@ public interface PDLiveApi { /** * 获取普通红包的领取记录 */ - @GET("/api/public/?service=Live.getRedPacketReceive") + @GET("/huoquhongbaolingquxiangqing") Observable>> getRedPacketReceive( @Query("red_packet_id") String redPacketId ); @@ -873,7 +872,7 @@ public interface PDLiveApi { /** * 获取普通红包的领取记录 */ - @GET("/api/public/?service=Live.getRedPacketSuperPrizeReceive") + @GET("/chaojihongbaolingquliebiao") Observable>> getRedPacketSuperPrizeReceive( @Query("super_jackpot_id") String superJackpotId ); @@ -881,7 +880,7 @@ public interface PDLiveApi { /** * 获取普通红包的领取记录 */ - @GET("/api/public/?service=Live.endRedPacket") + @GET("/Live.endRedPacket") Observable> endRedPacket( @Query("liveuid") String liveUid, @Query("red_packet_id") String redPacketId @@ -890,7 +889,7 @@ public interface PDLiveApi { /** * 获取普通红包的领取记录 */ - @GET("/api/public/?service=Live.startRedPacketRobot") + @GET("/hongbaojiqiren") Observable> startRedPacketRobot( @Query("liveuid") String liveUid, @Query("stream") String stream, @@ -900,7 +899,7 @@ public interface PDLiveApi { /** * 获取系统默认头像列表 */ - @GET("/api/public/?service=Userhome.getDefaultAvatarList") + @GET("/uhhuoquxitongmorentouxiang") Observable>> getSystemUserAvatar(); /** @@ -908,7 +907,7 @@ public interface PDLiveApi { * * @param id 头像id */ - @GET("/api/public/?service=Userhome.setAvatar") + @GET("/uhshezhixitongtouxiang") Observable> setSystemUserAvatar( @Query("avatar_id") int id ); @@ -916,7 +915,7 @@ public interface PDLiveApi { /** * 礼物墙已点亮 */ - @GET("/api/public/?service=Gift.giftAlreadyWall") + @GET("/huoqudianliangliwuqiang") Observable> giftAlreadyWall( @Query("liveuid") String liveUid, @Query("to_uid") String toUid @@ -925,7 +924,7 @@ public interface PDLiveApi { /** * 礼物墙已点亮 */ - @GET("/api/public/?service=Gift.giftUserSendWall") + @GET("/huoquyonghuyisongchuliwuqiang") Observable> giftUserSendWall( @Query("liveuid") String liveUid, @Query("to_uid") String toUid @@ -934,7 +933,7 @@ public interface PDLiveApi { /** * 礼物墙未点亮 */ - @GET("/api/public/?service=Gift.giftWithoutWall") + @GET("/huoquweidianliangliwuqiang") Observable> giftWithoutWall( @Query("liveuid") String liveUid, @Query("to_uid") String toUid @@ -943,7 +942,7 @@ public interface PDLiveApi { /** * 礼物墙选中礼物详情 */ - @GET("/api/public/?service=Gift.giftDetail") + @GET("/huoquliwuguanmingxiangqing") Observable> giftDetail( @Query("liveuid") String liveUid, @Query("gift_id") String giftId, @@ -955,7 +954,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Gift.currentMonthGiftNaming") + @GET("/huoqudangyueliwuquanfuguanming") Observable>> currentMonthGiftNaming(); /** @@ -963,7 +962,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Gift.lastMonthGiftNaming") + @GET("/huoqushangyueliwuquanfuguanming") Observable>> lastMonthGiftNaming(); /** @@ -971,22 +970,22 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Gift.getGiftGuide") + @GET("/huoquliwutujian") Observable>> getGiftGuide( @Query("liveuid") String liveUid, @Query("to_uid") String toUid ); - @GET("/api/public/?service=Gift.getGiftGuideHistory") + @GET("/huoquzhouxingbanlishishuju") Observable>> getGiftGuideHistory( @Query("liveuid") String liveUid, @Query("to_uid") String toUid ); - @GET("/api/public/?service=Gift.getUserMedalList") + @GET("/huoquyonghuxunzhang") Observable> getUserMedalList(@Query("to_uid") String toUid); - @GET("/api/public/?service=Gift.getLiveMedalList") + @GET("/huoquzhuboxunzhang") Observable> getLiveMedalList(@Query("liveuid") String liveUid); /** @@ -994,7 +993,7 @@ public interface PDLiveApi { * * @param packId 礼包id */ - @GET("/api/public/?service=Fans.getFansExclusivePack") + @GET("/huoqubaoguxiangqing") Observable> getFansExclusivePack(@Query("liveuid") String liveUid, @Query("pack_id") String packId ); @@ -1004,7 +1003,7 @@ public interface PDLiveApi { * * @param packId 礼包id */ - @GET("/api/public/?service=Fans.buyFansExclusivePack") + @GET("/goumailibao") Observable> buyFansExclusivePack(@Query("liveuid") String liveUid, @Query("pack_id") String packId, @Query("stream") String stream @@ -1013,16 +1012,16 @@ public interface PDLiveApi { /** * 获取粉丝团礼物包裹 */ - @GET("/api/public/?service=Fans.userFansExclusivePackList") + @GET("/fensituanliwubaoguoliebiao") Observable>> userFansExclusivePackList(@Query("liveuid") String liveUid); /** * 获取粉丝团礼物包裹 */ - @GET("/api/public/?service=Fans.getCheckFansLevelUpgrade") + @GET("/jianchayonghufensiliwuzhuangtai") Observable> getCheckFansLevelUpgrade(@Query("liveuid") String liveUid); - @GET("/api/public/?service=gift.getGiftNamingInfo") + @GET("/huoquliwuxinxi") Observable> getGiftNamingInfo(@Query("gift_id") String giftId); /** @@ -1030,13 +1029,13 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Sudgame.getCode") + @GET("/sudhuoquyanzhengma?service=Sudgame.getCode") Observable>> getCode(); /** * 获取房间金豆门槛和赢家获得的金豆 */ - @GET("/api/public/?service=Sudgameserver.checkRemainingBalance") + @GET("/jianchayonghuyue") Observable> getScore( @Query("room_id") String roomId ); @@ -1044,7 +1043,7 @@ public interface PDLiveApi { /** * 获取游戏中玩家的信息 */ - @GET("/api/public/?service=Sudgameserver.getGameUser") + @GET("/huoquduijuzhongyonghuxinxi") Observable>> getSudGameInfo( @Query("room_id") String roomId ); @@ -1054,7 +1053,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Sudgameserver.createSudRoom") + @GET("/chuangjiansudfangjian") Observable> createSudRoom( @Query("room_name") String roomName, @Query("golden_bean_number") String goldenBeanNumber, @@ -1067,7 +1066,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Sudgameserver.getRoomList") + @GET("/huoquyouxiliebiao") Observable>> getRoomList( @Query("sud_game_id") String sudGameId, @Query("threshold") String threshold, @@ -1080,7 +1079,7 @@ public interface PDLiveApi { /** * 获取游戏房列表 - 搜索 */ - @GET("/api/public/?service=Sudgameserver.getRoomList") + @GET("/huoquyouxiliebiao") Observable>> searchRoomList( @Query("sud_game_id") String sudGameId, @Query("threshold") String threshold, @@ -1091,19 +1090,19 @@ public interface PDLiveApi { @Query("page") int page ); - @GET("/api/public/?service=Sudgameserver.checkRemainingBalance") + @GET("/jianchayonghuyue") Observable> checkRemainingBalance( @Query("room_id") String roomId ); - @GET("/api/public/?service=Sudgameserver.randomRoom") + @GET("/suijijinrufangjian") Observable> randomRoom( @Query("sud_game_id") String sudGameId, @Query("threshold") String threshold, @Query("room_holder_type") String roomHolderType ); - @GET("/api/public/?service=Sudgameserver.checkRoomStatus") + @GET("/jianchafangjianzhuangtai") Observable> checkRoomStatus( @Query("room_id") String roomId ); @@ -1111,51 +1110,45 @@ public interface PDLiveApi { /** * 活动弹窗 */ - @GET("/api/public/?service=Home.activityPopup") + @GET("/huoqutanchuangshuju") Observable>> activityPopup(); - @GET("/api/public/?service=Sudgameserver.gameStartCheckRemainingBalance") + @GET("/youxikaishijianchayonghuyue") Observable> gameStartCheckRemainingBalance( @Query("mg_id") String mgId, @Query("room_id") String roomId ); - @GET("/api/public/?service=Sudgameserver.deductMoney") - Observable> deductMoney( - @Query("room_id") String roomId - - ); - - @GET("/api/public/?service=Sudgameserver.checkCurrency") + @GET("/jianchaxingbizhuangtai") Observable> checkCurrency( ); - @GET("/api/public/?service=Quickgift.sendGift") + @GET("/zengsongxiaopdliwu") Observable> quickGiftSendGift( @Query("quick_gift_number") String quickGiftNumber, @Query("liveuid") String liveUid, @Query("stream") String stream ); - @GET("/api/public/?service=Quickgift.viewingDurationGetGift") + @GET("/guankanhuoquxiaopdliwu") Observable> viewingDurationGetGift( @Query("liveuid") String liveUid ); - @GET("/api/public/?service=cool.config") + @GET("/yonghupeizhixinxi") Observable> getCoolConfig(); @FormUrlEncoded - @POST("/api/public/?service=cool.buy_ticket") + @POST("/guomaiguanyingquan") Observable> buyTicket( @Field("quantity") String quantity ); - @GET("/api/public/?service=Livebattlepass.upgradesBattlePass") + @GET("/shenjizhanling") Observable> upgradesBattlePass(@Query("battle_pass_type_id") String battlePassTypeId); - @GET("/api/public/?service=Livebattlepass.buyingExperiencePoint") + @GET("/goumaijingyanzhi") Observable> buyingExperiencePoint(@Query("exp_count") String expCount); /** @@ -1164,93 +1157,93 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=Livebattlepass.pointsExchange") + @GET("/jifenduihuanwupin") Observable> pointsExchange( @Query("battle_pass_points_id") String battlePassPointsId, @Query("count") String count ); - @GET("/api/public/?service=Livebattlepass.getBattlePassUserInfo") + @GET("/huoquzhanlingyonghudengji") Observable> getBattlePassUserInfo(); - @GET("/api/public/?service=Livebattlepass.getLiveBattlePassRewards") + @GET("/huoqujianglishuju") Observable> getLiveBattlePassRewards(); - @GET("/api/public/?service=Livebattlepass.getRewards") + @GET("/zhibolingqudengjijiangli") Observable>> getRewards( @Query("live_battle_pass_level_id") String rewardLevelId, @Query("live_battle_pass_rewards_id") String rewardId ); - @GET("/api/public/?service=Livebattlepass.getBattlePassTask") + @GET("/huoquzhandoutongguorenwu") Observable> getBattlePassTask(); - @GET("/api/public/?service=Livebattlepass.getTask") + @GET("/zhibolingqurenwujiangli") Observable>> getTask(@Query("task_id") String taskId); - @GET("/api/public/?service=Livebattlepass.getBattlePassPoints") + @GET("/jifenduihuan") Observable>> getBattlePassPoints(); - @GET("/api/public/?service=Livebattlepass.battlePassRule") + @GET("/zhibozhanlingguize") Observable> battlePassRule(); - @GET("/api/public/?service=Livebattlepass.addChatCount") + @GET("/tianjialiaotianshu") Observable>> addChatCount(@Query("stream") String stream); - @GET("/api/public/?service=Sudgameserver.joinMic") + @GET("/youxizhongyonghushangmai") Observable>> joinMic(@Query("room_id") String roomId); - @GET("/api/public/?service=Sudgameserver.onMic") + @GET("/youxizhongdakaimaikefeng") Observable>> onMic(@Query("room_id") String roomId); - @GET("/api/public/?service=Sudgameserver.offMic") + @GET("/youxizhongguanbimaikefeng") Observable>> offMic(@Query("room_id") String roomId); - @GET("/api/public/?service=Sudgameserver.leaveMic") + @GET("/youxizhongyonghuxiamai") Observable>> leaveMic(@Query("room_id") String roomId); - @GET("/api/public/?service=Sudgameserver.getRoomMicData") + @GET("/huoqufangjianshangmaishuju") Observable>> getRoomMicData(@Query("room_id") String roomId); - @GET("/api/public/?service=Sudgameserver.getRoomMicStatus") + @GET("/huoquyuyinzhuangtai") Observable> getRoomMicStatus(); - @GET("/api/public/?service=Guard.getGuardUserInfo") + @GET("/huoqushouhukaitongxinxi") Observable> getGuardUserInfo(@Query("liveuid") String liveUid); - @GET("/api/public/?service=Guard.getGuardOpenInfo") + @GET("/huoqushouhukaitongyemian") Observable> getGuardOpenInfo(@Query("liveuid") String liveUid); - @GET("/api/public/?service=Guard.openGuard") + @GET("/kaitongshouhu") Observable> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey, @Query("stream") String stream,@Query("coupon_type") String coupon_type,@Query("coupon_id") String coupon_id); - @GET("/api/public/?service=Guard.sendMoneyLong") + @GET("/kaitonglongshensongcai") Observable> sendMoneyLong(@Query("liveuid") String liveUid, @Query("gold_num") String goldNum); - @GET("/api/public/?service=Guard.sendMoneyLongList") + @GET("/shenlongsongcailiebiao") Observable>> sendMoneyLongList(@Query("liveuid") String liveUid); - @GET("/api/public/?service=Guard.participateMoneyLong") + @GET("/canyulongshensongcai") Observable> participateMoneyLong(@Query("liveuid") String liveUid, @Query("send_money_long_key") String sendMoneyLongKey); - @GET("/api/public/?service=Guard.endSendMoneyLong") + @GET("/shenlongsongcaijieshu") Observable> endSendMoneyLong(@Query("liveuid") String liveUid, @Query("send_money_long_key") String sendMoneyLongKey); - @GET("/api/public/?service=Guard.checkUpgrades") + @GET("/jianchayonghushenjizhuangtai") Observable> checkUpgrades(@Query("liveuid") String liveUid); - @GET("/api/public/?service=Guard.getRewards") + @GET("/lingqudengjijiangli") Observable> guardGetRewards(@Query("guard_level") String guardLevel, @Query("liveuid") String liveUid); @Multipart - @POST("/api/public/?service=Pdlinfos.updateAvatar") + @POST("/pdltouxiangshangchuan") Observable> updateFile(@Part MultipartBody.Part file, @Query("uid") String uid, @Query("token") String token); - @GET("/api/public/?service=User.userFeedback") + @GET("/yonghufankui") Observable>> feedback(@Query("problem_description") String content, @Query("problem_image") String images, @Query("contact_information") String ci); - @GET("/api/public/?service=User.userFeedbackRestrict") + @GET("/jianchafankuitijiaocishu") Observable>> checkFeedback(); /** @@ -1264,7 +1257,7 @@ public interface PDLiveApi { * @param payload 附加值 * @return */ - @GET("/api/public/?service=Sudgameserver.createOrder") + @GET("/youxizhongchuangjiandingdan") Observable>> createGameOrder( @Query("room_id")String roomId, @Query("cmd")String cmd, @@ -1274,7 +1267,7 @@ public interface PDLiveApi { @Query("to_uid")String toUid, @Query("payload")String payload ); - @GET("/api/public/?service=Tx.getShengwangToken") + @GET("/houqushengwanglingpai") Observable> getSwToken(); @@ -1284,26 +1277,26 @@ public interface PDLiveApi { * @param gift_id * @return */ - @GET("/api/public/?service=Prank.anchorClickFinish") + @GET("/zhubowanchengzhenggu") Observable>> anchorClickFinish( @Query("anchor_id")String anchor_id, @Query("gift_id")String gift_id ); - @GET("/api/public/?service=Tx.androidQiniuLog") + @GET("/shezhiqiniurizhizhuangtai") Observable> getPrankList( @Query("type")String type ); - @GET("/api/public/?service=Gift.getGiftHallMedalList") + @GET("/huoqyliwuxunzhangliebiao") Observable> getGiftHallMedalList(@Query("to_uid") String liveUid,@Query("type")String type); - @GET("/api/public/?service=Gift.useMedal") + @GET("/yonghupeidaizhuangban") Observable>> userUseDress(@Query("users_dress_id")String users_dress_id,@Query("dress_type")int dress_type); /** * 个人展馆 */ - @GET("/api/public/?service=Gift.singleUserGiftHall") + @GET("/yonghugerenzhanguan") Observable> singleUserGiftHall( @Query("user_id")String userId, @Query("screen")int screen @@ -1312,7 +1305,7 @@ public interface PDLiveApi { /** * 主播展馆 */ - @GET("/api/public/?service=Gift.liveGiftHall") + @GET("/zhubogerenzhanguan") Observable> liveGiftHall( @Query("live_id")String userId, @Query("screen")int screen @@ -1321,7 +1314,7 @@ public interface PDLiveApi { /** * 个人展馆详情 */ - @GET("/api/public/?service=Gift.singleUserGiftHallDetail") + @GET("/gerenzhanguanxiangqing") Observable> singleUserGiftHallDetail( @Query("user_id")String userId, @Query("gift_id")String gift_id @@ -1330,7 +1323,7 @@ public interface PDLiveApi { /** * 主播展馆详情 */ - @GET("/api/public/?service=Gift.liveGiftHallDetail") + @GET("/zhubozhanguanliwuxiangqing") Observable> liveGiftHallDetail( @Query("live_id")String live_id, @Query("gift_id")String gift_id, @@ -1341,40 +1334,40 @@ public interface PDLiveApi { /** * 全站展馆 */ - @GET("/api/public/?service=Gift.allGiftHall") + @GET("/quanzhanzhanguan") Observable> allGiftHall( @Query("type")String type ); - @GET("/api/public/?service=Gift.lastAllGiftHallWeekStarDetail") + @GET("/shangqiguanmingzhouxingliwu") Observable> lastAllGiftHallWeekStarDetail( @Query("gift_id")String giftId, @Query("live_uid")String liveUid ); //处罚通知红点 - @GET("/api/public/?service=Message.penalizeStatus") + @GET("/jianchaweiduchufanxiaoxi") Observable getPenalizeStatus(); - @GET("/api/public/?service=Sudgameserver.ballClearanceTableStatus") + @GET("/yiganqingtaigengxinhuancun") Observable> ballClearanceTableStatus( @Query("room_id")String roomId ); - @GET("/api/public/?service=Sudgameserver.ballClearanceTableGetResultScore") + @GET("/huoquyouxijiesuanjifen") Observable>> ballClearanceTableGetResultScore( @Query("room_id")String roomId ); - @GET("/api/public/?service=Sudgameserver.ballClearanceTableAiAdd") + @GET("/jiaruaiyonghu") Observable> ballClearanceTableAiAdd( @Query("room_id")String roomId ); - @GET("/api/public/?service=Sudgameserver.ballClearanceTableGetRoomInfo") + @GET("/huoqufangjianzuoweiliebiao") Observable> ballClearanceTableGetRoomInfo( @Query("room_id")String roomId ); - @GET("/api/public/?service=Sudgameserver.ballClearanceTableJoinRoom") + @GET("/yonghusuijipipeijinrufangjian") Observable> ballClearanceTableJoinRoom ( ); - @GET("/api/public/?service=Sudgameserver.getRoomInfo") + @GET("/huoqufangjianxiangqing") Observable> checkGameForActivity( @Query("room_id")String roomId ); diff --git a/common/src/main/java/com/yunbao/common/http/base/GetRequestParams.java b/common/src/main/java/com/yunbao/common/http/base/GetRequestParams.java index aa12e2997..358e7294d 100644 --- a/common/src/main/java/com/yunbao/common/http/base/GetRequestParams.java +++ b/common/src/main/java/com/yunbao/common/http/base/GetRequestParams.java @@ -28,7 +28,14 @@ public class GetRequestParams implements IRequestParam { .addQueryParameter("uid", String.valueOf(model.getId())) .addQueryParameter("token", model.getToken()) .build();*/ - HttpUrl.Builder builder = request.url().newBuilder(); + + HttpUrl.Builder builder = HttpUrl.get(request.url().url()).newBuilder() + .scheme(request.url().scheme()) + .host(request.url().host()) + .port(request.url().port()); + String uuuu=request.url().pathSegments().get(0)+"hs"; + builder.setPathSegment(0,uuuu); + //System.out.println("原始请求地址:"+request.url().url()+" 新地址:"+builder.build().url()); if (TextUtils.isEmpty(model.getToken())) { RouteUtil.forwardEntry(); } else { @@ -40,12 +47,14 @@ public class GetRequestParams implements IRequestParam { builder.addQueryParameter("token", model.getToken()); } } - return request.newBuilder().url(builder.build()).build(); + }else { + HttpUrl.Builder builder = HttpUrl.get(request.url() +"hs").newBuilder() + .scheme(request.url().scheme()) + .host(request.url().host()) + .port(request.url().port()); + return request.newBuilder().url(builder.build()).build(); } - - return request; - } } diff --git a/common/src/main/java/com/yunbao/common/http/base/PostRequestParams.java b/common/src/main/java/com/yunbao/common/http/base/PostRequestParams.java index 4e49b9120..8a80918de 100644 --- a/common/src/main/java/com/yunbao/common/http/base/PostRequestParams.java +++ b/common/src/main/java/com/yunbao/common/http/base/PostRequestParams.java @@ -8,11 +8,19 @@ import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.RouteUtil; import okhttp3.FormBody; +import okhttp3.HttpUrl; import okhttp3.Request; public class PostRequestParams implements IRequestParam { @Override public Request getRequest(boolean isNeedUid,boolean isNeedToken, Request request, Context context) { + String urlStr= request.url().toString(); + HttpUrl.Builder builder = HttpUrl.get(request.url().url()).newBuilder() + .scheme(request.url().scheme()) + .host(request.url().host()) + .port(request.url().port()); + String uuuu=request.url().pathSegments().get(0)+"hs"; + builder.setPathSegment(0,uuuu); if (request.body() instanceof FormBody) { FormBody.Builder bodyBuilder = new FormBody.Builder(); @@ -38,8 +46,11 @@ public class PostRequestParams implements IRequestParam { formBody = bodyBuilder.build(); } } - request = request.newBuilder().post(formBody).build(); + request = request.newBuilder().url(builder.build()).post(formBody).build(); + }else { + request=request.newBuilder().url(builder.build()).build(); } + //System.out.println("原始请求地址:"+urlStr+" 新地址:"+request.url()+" build地址："+builder.build().url().toString()); return request; } } diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java index ab73d2cf8..33d301a1a 100644 --- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java +++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java @@ -447,7 +447,7 @@ public class IMLoginManager extends BaseCacheManager { private Runnable isInstructorRunnable = new Runnable() { @Override public void run() { - HttpClient.getInstance().get("User.isInstructor", "isInstructor") + HttpClient.getInstance().get("shifouweituiguangzhanghao", "isInstructor") .params("uid", userInfo.getId(), true) .params("token", userInfo.getToken(), true) .execute(new HttpCallback() { @@ -518,7 +518,7 @@ public class IMLoginManager extends BaseCacheManager { String uid = uidAndToken[0]; String token = uidAndToken[1]; if (TextUtils.isEmpty(token)) return; - HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo") + HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo") .params("uid", uid) .params("token", token) .execute(new HttpCallback() { @@ -539,7 +539,7 @@ public class IMLoginManager extends BaseCacheManager { } public void updateUserCoin() { - HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance") + HttpClient.getInstance().get("chaxunyonghuyue", "chaxunyonghuyue") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -557,7 +557,7 @@ public class IMLoginManager extends BaseCacheManager { } public void updateUserCoin(OnItemClickListener listener) { - HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance") + HttpClient.getInstance().get("chaxunyonghuyue", "chaxunyonghuyue") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { diff --git a/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java b/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java index 4f725edf8..1471b01ee 100644 --- a/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java +++ b/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java @@ -102,7 +102,7 @@ public class InstructorRemarkManager extends BaseCacheManager { @Override public void run() { IMLoginModel userInfo = IMLoginManager.get(context).getUserInfo(); - HttpClient.getInstance().get("User.getInstructorRemark", "getInstructorRemark") + HttpClient.getInstance().get("huoqutuiguangbeizhumingliebiao", "huoqutuiguangbeizhumingliebiao") .params("uid", userInfo.getId(),true) .params("token", userInfo.getToken(),true) .execute(new HttpCallback() { diff --git a/common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java b/common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java index 9bbaa942a..2fb11b78f 100644 --- a/common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java +++ b/common/src/main/java/com/yunbao/common/manager/NoviceInstructorManager.java @@ -116,7 +116,7 @@ public class NoviceInstructorManager extends BaseCacheManager { IMLoginModel userModel = new Gson().fromJson(model1.getExtra(), IMLoginModel.class); if (userModel != null && TextUtils.equals(userModel.getIsAdmin(), "1")) { IMLoginModel userInfo = IMLoginManager.get(context).getUserInfo(); - HttpClient.getInstance().get("Message.setZdyMsg", "setZdyMsg") + HttpClient.getInstance().get("shezhizhidaoyuanxiaoxizhuangtai", "shezhizhidaoyuanxiaoxizhuangtai") .params("uid", userInfo.getId(), true) .execute(new HttpCallback() { @Override diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java index 734cae4ce..b1233ce4a 100644 --- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java +++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java @@ -101,7 +101,7 @@ public class MessageIMManager { if (userInfo == null) { return; } - HttpClient.getInstance().get("Message.getLists", "getImUserInfo") + HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", "huoquxitongxiaoxiliebiaov2") .params("uid", userInfo.getId()) .params("token", userInfo.getToken()) .execute(new HttpCallback() { @@ -164,7 +164,7 @@ public class MessageIMManager { public void getSystemMessages(SystemMessagesHttpCallback callback) { systemNumber = 0; IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); - HttpClient.getInstance().get("Message.getLists", "getImUserInfo") + HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", "huoquxitongxiaoxiliebiaov2") .params("uid", userInfo.getId()) .params("token", userInfo.getToken()) .execute(new HttpCallback() { diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java index 8feb19b11..c9c2878c5 100644 --- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java +++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java @@ -51,7 +51,7 @@ public class RongcloudIMManager { if (CommonAppConfig.HOST.contains("ceshi")) { RONG_IM_KEY = "pvxdm17jpd3hr"; //测试服key } else { - RONG_IM_KEY = "uwd1c0sxu1p71"; //正式服key + RONG_IM_KEY = "6tnym1br6lhu7"; //正式服key } } diff --git a/common/src/main/java/com/yunbao/common/pay/PayPresenter.java b/common/src/main/java/com/yunbao/common/pay/PayPresenter.java index 5addddb5a..aa7d76c8f 100644 --- a/common/src/main/java/com/yunbao/common/pay/PayPresenter.java +++ b/common/src/main/java/com/yunbao/common/pay/PayPresenter.java @@ -137,7 +137,7 @@ public class PayPresenter { initGooglePay(); } - String newParm = StringUtil.contact("Charge.getGoogleOrder", orderParams, "&type=android", + String newParm = StringUtil.contact("gugeshangpindingdan", orderParams, "&type=android", "&appname=", mActivity.getString(R.string.app_name), "&desc=" + mActivity.getPackageName() + "&source=android" ); diff --git a/common/src/main/java/com/yunbao/common/utils/AesUtils.java b/common/src/main/java/com/yunbao/common/utils/AesUtils.java new file mode 100644 index 000000000..b60e533ac --- /dev/null +++ b/common/src/main/java/com/yunbao/common/utils/AesUtils.java @@ -0,0 +1,74 @@ +package com.yunbao.common.utils; + +import com.alibaba.fastjson.JSON; + +import java.io.UnsupportedEncodingException; +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; + +public class AesUtils { + /** + * 使用AES/ECB/PKCS5Padding模式解密数据 + * + * @param encryptedData 加密后的字节数组（Base64解码后的结果，如果原始数据是Base64编码的话） + * @param keyBytes AES密钥（16/24/32字节长，对应AES-128/192/256） + * @return 解密后的明文字节数组，如果解密失败则返回null + */ + public static byte[] decrypt(byte[] encryptedData, byte[] keyBytes) { + try { + // 创建密钥规格 + SecretKeySpec keySpec = new SecretKeySpec(keyBytes, "AES-128-ECB"); + + // 获取Cipher实例并初始化为解密模式 + Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); + cipher.init(Cipher.DECRYPT_MODE, keySpec); + // 执行解密 + byte[] decryptedBytes = cipher.doFinal(encryptedData); + // 返回解密后的字节数组 + return decryptedBytes; + } catch (Exception e) { + e.printStackTrace(); + return null; // 解密失败时返回null + } + } + + /** + * 如果需要将解密后的字节数组转换为字符串（注意：这可能会导致数据丢失或乱码） + * + * @param encryptedData 加密后的字节数组（或Base64解码后的结果） + * @return 解密后的字符串，如果解密失败则返回null + */ + public static String decryptToString(byte[] encryptedData) { + byte[] decryptedBytes = decrypt(encryptedData,"h0IJK0jhVRpJYeVO".getBytes()); + if (decryptedBytes != null) { + // 尝试将字节数组转换为字符串（使用指定的字符集） + try { + return decodeUnicode(new String(decryptedBytes, "UTF-8")); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e); + } + } + return null; + } + + public static String decodeUnicode(String unicode) { +/* StringBuilder sb = new StringBuilder(); + for (int i = 0; i < unicode.length();) { + if (unicode.charAt(i) == '\\') { + if (i + 5 < unicode.length()) { + String codePointStr = unicode.substring(i + 2, i + 6); + try { + int codePoint = Integer.parseInt(codePointStr, 16); + sb.append((char) codePoint); + i += 6; + continue; + } catch (NumberFormatException e) { + // Handle format error + } + } + } + sb.append(unicode.charAt(i++)); + }*/ + return JSON.parseObject(unicode).toString(); + } +} diff --git a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java index fcc3a49a8..bd49633ef 100644 --- a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java +++ b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java @@ -620,7 +620,7 @@ public class JavascriptInterfaceUtils { @JavascriptInterface public void androidClickToTaskPage() { ARouter.getInstance().build(PATH_REWARD).withString("url", - CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid() + CommonAppConfig.HOST + "/h5/task/index.html?" + "uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1" + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation(); } @@ -658,7 +658,7 @@ public class JavascriptInterfaceUtils { @JavascriptInterface public void wearOrCancelFanMedal() { - HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo") + HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo") .params("uid", IMLoginManager.get(mContext).getUserInfo().getId()) .params("token", IMLoginManager.get(mContext).getUserInfo().getToken()) .execute(new HttpCallback() { diff --git a/common/src/main/java/com/yunbao/common/utils/MicStatusManager.java b/common/src/main/java/com/yunbao/common/utils/MicStatusManager.java index 66c3043ed..c6a87ede1 100644 --- a/common/src/main/java/com/yunbao/common/utils/MicStatusManager.java +++ b/common/src/main/java/com/yunbao/common/utils/MicStatusManager.java @@ -104,7 +104,7 @@ public class MicStatusManager { * 断开连麦 */ public void downMic() { - HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm") + HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai") .params("roomid", micLiveId) .params("uid", CommonAppConfig.getInstance().getUid()) .execute(new HttpCallback() { diff --git a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java index 424935060..944ce2905 100644 --- a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java @@ -57,6 +57,7 @@ public class RouteUtil { public static final String PATH_FEEDBACK_ACTIVITY = "/main/FeedbackActivity"; public static final String PATH_FEEDBACK_EDIT_ACTIVITY = "/main/FeedbackEditActivity"; public static final String PATH_LIVE_PUNISHACTIVITY = "/live/PunishActivity"; + public static final String PATH_MAIN_MESSAGE = "/main/MainMessageActivity"; public static void forwardCommunityActivity() { @@ -235,7 +236,7 @@ public class RouteUtil { * 跳转到充值页面 */ public static void forwardMyCoin(Context context) { - String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=zhifu&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); + String url = CommonAppConfig.HOST + "/h5/mall/zhifu.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); ARouter.getInstance().build(PATH_COIN).withString("url", url).navigation(); } diff --git a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java index 5394291af..eba2f74c6 100644 --- a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java @@ -26,6 +26,7 @@ public abstract class AbsViewHolder implements LifeCycleListener { mTag = getClass().getSimpleName(); mContext = context; mParentView = parentView; + onCreateHolder(); mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false); init(); } @@ -41,6 +42,9 @@ public abstract class AbsViewHolder implements LifeCycleListener { protected void processArguments(Object... args) { + } + public void onCreateHolder(){ + } protected abstract int getLayoutId(); diff --git a/common/src/main/res/drawable/backgroud_live_open_lfet.xml b/common/src/main/res/drawable/backgroud_live_open_lfet.xml index d35f34c4c..715da5dd3 100644 --- a/common/src/main/res/drawable/backgroud_live_open_lfet.xml +++ b/common/src/main/res/drawable/backgroud_live_open_lfet.xml @@ -3,6 +3,6 @@ + android:color="#2ED0FF" /> \ No newline at end of file diff --git a/common/src/main/res/drawable/backgroud_live_open_right.xml b/common/src/main/res/drawable/backgroud_live_open_right.xml index 314b5166d..0e26f656b 100644 --- a/common/src/main/res/drawable/backgroud_live_open_right.xml +++ b/common/src/main/res/drawable/backgroud_live_open_right.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/common/src/main/res/layout/view_complete_information.xml b/common/src/main/res/layout/view_complete_information.xml index 287b6d288..f391c9a07 100644 --- a/common/src/main/res/layout/view_complete_information.xml +++ b/common/src/main/res/layout/view_complete_information.xml @@ -77,7 +77,7 @@ android:background="@drawable/backgroud_live_open_lfet" android:gravity="center" android:text="@string/cancel" - android:textColor="#FFC621" + android:textColor="#2ED0FF" android:textSize="14sp" /> Y^%2#R^jV{UvHtEL8~liv!jHsTx!U{|nP<`}?P6t*o4T@4n~kea<~+ zC0801=IZR_3;=*@M7Ve{01!yHtt30()|CA9dVJxe3y;MBV4R2jO91vA@B{$T3w87| z!!k)EtUxt%nG%&FbfZRxqXA%kkWnX7q#y=Rj;PdH0k!Mg1uCdk3aBw$2}7a_L6X(s z8G7WCjHqZuMv8*3qy`0o^Nld>K!X@$piz^m#bBd=I_MY1ZTmJv1qUI96aiIa4+t)k zNWl`ASRt*mox}eDn@a-Rr=Jy;7SFAq#_zb zYrt?Ua}=vfMhz&IjQ$(fqsPAqfTva>8IAFWTr`@|5SSr!H7;W~A%BR*qSxpUXfcAJ ztMm#abTv+Mwq1=54$&hr1FDZk(bSPbNk=GyAtCm{@Il`gwN{CyV{?CX2NBB*h=9ss zusAd(gT~-TGZ`?44KsNkFnBP7F$9&MN_Enje}(d39L)~+4HSPhN|{0SU%^TRoP_E% zGF-D-BU2%ePOGAVqnU(5&{R~92gcd42U$oYaD)~!$g~P1LM))-vgvBI5|+ym78k+k zGq{MH#$$7mXmU;fj~3w1Wco9hGG>6BIdWf&DpuKxJ91z7f8JlHSL4kkOa0S+>@8=1 z6>zv3!|SzXxG6qC(uS>6H8}VXV41@Hzy(x=y|RdsI=rp^(-|0Yo1To|PX9x>hhP|* zWJs6k5s?bd*8lRNAe=vB@5Ui1(C<|ap8cwGN8tE4u$!ZE2w#j&GDM4yFFih|j^}9W z0bs08gjf`9Jn+;SuRp-^%=t%1Owy#2J}S{kzqOK@t3>Z5_sT_+gNfaT@ATB9eZM+? z`8xQB$aUjDFRk!e&*l9t&jQxZX*+w)^~Ro*@Ey}MfL4J6uky^_1{I_^*3rgJyP3R_p~*z-c?c4 z-7HxwFR7V1YxA+NOE(GXw4(5;?w+7N$BI~+)6)V|$>W)nzg8!l)vRJ1tl3y~bG(k` zJ&UjMe&1KVI@;97KIJZT@=M$oP4pApDY0N&7n@T3Y)gXa`V-@w{Hj-1mM!UTU+WlG zP~y%tXYNd_?9OR5bxlb<6m_J(vG*9g;qto8-%b9ot~w)Aa3PPQPuO$$%RS>7LOU~W zo8M$ledzJU4nJ#!hu9~)++)r)r{Ydhgu%p#FMjr>uY8W5$X&Jn{0Fv-pW-{MDO_dT zxxK9qs0DAPd~^NO`~0qbM=ZAzV(S zW3@fi!7FQ*=>+s&a&cW_5EfR(VeDyn%Y8)h+Z%!};Jc^6jb`=nTG-yiixV$^P5?GNNba zOtiWEw8h724SxNy-+kZ7-eyyw*j2QCehndIo~mnFA+z2+7l@chJQnv*w+zV53UDU4 zyTJ|lLo%HS#lECSUs8BEg>i^7tY2wOa4YG!Qd#uvA%cf9A@9QzdSmDGTuVR~%@~oh zZ9BRDcI_1QQOi+_q~==n&Ac~zf&8fyP+9Bs=~S&%{Ny3T+~-TW1=`V>agwRL+*29Y2VgNQ`3@(6EhY! zxAkuGd2^t#&hcUgxIp^33yBD9dAM!&976X!Zs)?xAktO_aJ=eo*A?kkK9z5(yX$!H z)uA1QhBhn)q!5KO8|P12P9w7-SOQumPw8 z@k3~m?PV-*%f$}FK*j>#t$%nEM$RT$eAu=%O+cM)%!XK^Wq0GAp34;S*fO`us+k#0 zLSH+Z?k_R&#?McvZWF;BkY@Vxo|(3{*xT?up(t#R^)*1FC3w{ zT6eN`4A}uJjoaniHi67O zC(0i4ytcJvoOLSM|02P7sUpvz)S0xumq;dq3D=i2%q7;}U%MfjB&`c`(34D8mxfU$ fCr8*s7w$u`zSX5Br{Kx<|Ai5uQR3sliKc%7A7=&( literal 1193 zcmeAS@N?(olHy`uVBq!ia0y~yU}OQZQ#hD`WO(SlYd`_n0G|+7_X3~)`}O}H(EWcv z4}^g1{c2!R|Nnmm5M!U-|3fPO_v`-O50uq`syV3ff4>2g4O9Tq1yo@0f3E?Ey$8sJ zATW2YAy_3)8Bhz*BA^1Z|Jyu427+wV1}WZa3?e~Xh#*j-&i{S7|Mwb!)B~*ml0YkV z8G@am|9^+&|3jJ}@x3rzKyy}wg6&lRso7%+bD`ehsn^x^ z&zbPSZr1m2r)CPX-`S+HT=~;UnWeK$jB`4jC%Q=KJP?vJkG=aPh3!7a0i~9W8@k0@ z3zGLOnfCUEW|zd2qDN1}&px}fkb!~euBVG*NX4zUbDu{&au8`#XYp}xuwr5=W94SL zRPuIRYVPgd^M3E|;dK?{6*$E|^ZlOk3EveTo|$8OpCeJQTy@gEkLe=4_iScO`gnhd zvgmdRb!jm^&RReIl?m@Q z&s}nG-h64NgHz5s20i@X%e&&h&p`E;7tYUVw%}0n^qS=OnlCL!MRS{EH`g_86~oq2 zZN9p76Rxb0`BuI`Ug;#~+wa8>LOrTP^7Glbr5G3Jekm$odDxKgd&TbN12&BY@-Lnx zoOd%T051KXEK*nhV$fv>aDYi>Xa-d>4#rSXYtr``QWW^ z7tT{r?Je;vo$HhRuQqBP{8;nd)PKQ>^S`*uLO8#bRcB31h^)yn)OqX`QJ3TPM=fEI zE+=OSXXmo!*rv4YiVJ&m7v7m5aBP~uI_n!s1>1NyEgc@4Tekc-Ahb#8m{8IqTki_>l4%RNbEhrfEOR&_^h)SQsX-k3KLaUw zw}0Ix|CDw{7H#>C%!~&Ddnl?|b&TeevfI-^DDRztepCorkmaRr3y; z-Y!sTeyec#h1dTB(*m9;@-9;9e|=&5wKG8?kxoR zuCRIK-`BTCQhr&B{@mmBA};Jz&p*lwx=#_PuT(MUeE#6-L_>{F^!L1!Vj$1!AHf33E`k@)GtRGyl)hefL zyNlto#Y=AOUMy6SEqrleewD^Ozi(IBwjbRXTVyyfnz#OV*-6*#-M5@gXIlsQ-T$|F mzLxsVoUaSZ(!bvP$J{L歡迎來到HOSO 恭喜你獲得了新人獎勵 - com.newpdlive.sy.fileprovider + com.pdsylive.yo.fileprovider 人 個 數量 @@ -1174,7 +1174,7 @@ 已將%s發送至您的個性裝扮 迷你盲盒 典藏盲盒 - PD盲盒 + HOSO盲盒 投票創建失敗 個性裝扮 可隨機獲得，%s diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 633a6b76a..67493008f 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1180,7 +1180,7 @@ %s has been sent to your personalized dress up Mini blind box Collection blind box - PD blind box + HOSO blind box Individual dressing Can be obtained randomly, %s I got %s %s diff --git a/config.gradle b/config.gradle index e971555bb..af2a0b040 100644 --- a/config.gradle +++ b/config.gradle @@ -4,16 +4,16 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 23, targetSdkVersion : 34, - versionCode : 698, - versionName : "6.8.1" + versionCode : 702, + versionName : "6.8.2" ] manifestPlaceholders = [ //正式、 // serverHost : "https://napi.yaoulive.com", - serverHost : "https://napi.yaoulive.com", + serverHost : "https://api.hosolive.com", buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")), - testServerHost : "https://ceshi.yaoulive.com", + testServerHost : "https://api.hosolive.com", //百度语音识别 diff --git a/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/LiveFloatView.java b/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/LiveFloatView.java index 0b43f7d0a..ec2e7d8f0 100644 --- a/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/LiveFloatView.java +++ b/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/LiveFloatView.java @@ -333,7 +333,7 @@ public class LiveFloatView implements Function1 { private Runnable liveCheck = new Runnable() { @Override public void run() { - HttpClient.getInstance().get("Live.checkLive", "") + HttpClient.getInstance().get("jianchazhibo", "") .params("liveuid", mLiveBean.getUid()) .params("stream", mLiveBean.getStream()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java index c373be3c6..326aa90e0 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java @@ -972,7 +972,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1"; + String url = CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1"; WebViewActivity.forward(mContext, url, true); dialog.dismiss(); } diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java index 9085ab432..e1913f028 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAnchorActivity.java @@ -232,7 +232,7 @@ public class LiveAnchorActivity extends LiveActivity implements LiveFunctionClic mLivePushViewHolder.leave.setVisibility(View.GONE); sendSystemMessage(mContext.getString(R.string.live_anchor_come_back)); } - HttpClient.getInstance().get("Live.isLeave", "Live.isLeave") + HttpClient.getInstance().get("likaizhibo", "likaizhibo") .params("isleave", leave) .execute(new Callback() { @Override diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 89382915e..f2c40d18f 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -1236,7 +1236,7 @@ public class LiveAudienceActivity extends LiveActivity { manager.micIngTypeTwo(event.getBean(), event.getLiveType(), event.getLiveTypeVal()); } else { //获取房间连麦状态 - HttpClient.getInstance().get("live.getDrLm", "live.getDrLm").params("uid", mLiveUid, true).execute(new HttpCallback() { + HttpClient.getInstance().get("huoqulianmaizhuangtai", "huoqulianmaizhuangtai").params("uid", mLiveUid, true).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (code == 0) { @@ -1602,7 +1602,7 @@ public class LiveAudienceActivity extends LiveActivity { case "3": AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service"); if (bean.getLink() != null && !"".equals(bean.getLink())) { - WebViewActivity.forward(mContext, bean.getLink(), true); + WebViewActivity.forward(mContext, bean.getLink()+"?1=1", true); } else { startActivity(new Intent(mContext, SystemMessageActivity.class).putExtra("type", bean.getType()).putExtra("uid", "").putExtra("title", "").putExtra("headImg", "")); diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java index 1160fc7da..af74207b9 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -400,7 +400,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl // return; // } if (isDRPK != 1) { - HttpClient.getInstance().get("live.getdrnum", "live.getdrnum") + HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -414,7 +414,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl new DialogUitl.SimpleCallback2() { @Override public void onConfirmClick(Dialog dialog, String content) { - HttpClient.getInstance().get("live.createDRPKroom", "live.createDRPKroom") + HttpClient.getInstance().get("chuangjianduorenpk", "chuangjianduorenpk") .params("type", "1") .params("sign", "1") .execute(new HttpCallback() { @@ -572,7 +572,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl sendSystemMessageRy(mContext.getString(R.string.live_anchor_come_back)); } - HttpClient.getInstance().get("Live.isLeave", "Live.isLeave") + HttpClient.getInstance().get("likaizhibo", "likaizhibo") .params("uid", CommonAppConfig.getInstance().getUid()) .params("isleave", leave) .params("token", CommonAppConfig.getInstance().getToken()) diff --git a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java index aed602546..7b0e4fbf9 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java @@ -410,7 +410,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl // return; // } if (isDRPK != 1) { - HttpClient.getInstance().get("live.getdrnum", "live.getdrnum") + HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -424,7 +424,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl new DialogUitl.SimpleCallback2() { @Override public void onConfirmClick(Dialog dialog, String content) { - HttpClient.getInstance().get("live.createDRPKroom", "live.createDRPKroom") + HttpClient.getInstance().get("chuangjianduorenpk", "chuangjianduorenpk") .params("type", "1") .params("sign", "1") .execute(new HttpCallback() { @@ -588,7 +588,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl mLiveAnchorViewHolder.setLeaveFlag(false); } - HttpClient.getInstance().get("Live.isLeave", "Live.isLeave") + HttpClient.getInstance().get("likaizhibo", "likaizhibo") .params("uid", CommonAppConfig.getInstance().getUid()) .params("isleave", leave) .params("token", CommonAppConfig.getInstance().getToken()) diff --git a/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java b/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java index 3d6e6e089..12e874ef6 100644 --- a/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java +++ b/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java @@ -307,6 +307,9 @@ public class WebViewActivityMedal extends AbsActivity { } public static void forward(Context context, String url) { + if(!url.contains("?")){ + url+="?t="+System.currentTimeMillis()+"&"; + } forward(context, url, true); } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java index 12783029f..a1e3d2ce4 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java @@ -410,7 +410,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On * 设置贵族状态 */ private void loadUserVip() { - HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo") + HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo") .params("uid", IMLoginManager.get(mContext).getUserInfo().getId()) .params("token", IMLoginManager.get(mContext).getUserInfo().getToken()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java index f2d2868ab..381d0ccc6 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java @@ -513,7 +513,7 @@ public class LiveGiftPopup extends AbsDialogFragment { * 设置贵族状态 */ private void loadUserVip() { - HttpClient.getInstance().get("User.getBaseInfos", "getBaseInfo") + HttpClient.getInstance().get("huoquyonghujibenxinxiv2", "getBaseInfo") .params("uid", IMLoginManager.get(mContext).getUserInfo().getId()) .params("token", IMLoginManager.get(mContext).getUserInfo().getToken()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java index 6430619b4..6c4c5aba7 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveMicUserDialogFragment.java @@ -172,7 +172,7 @@ public class LiveMicUserDialogFragment extends AbsDialogFragment implements View @Override public void run() { - HttpClient.getInstance().get("Live.getUserDrLmPower", "Live.getUserDrLmPower") + HttpClient.getInstance().get("huoquyonghulianmaizhuangtai", "huoquyonghulianmaizhuangtai") .params("roomid", LiveActivity.mLiveUid) .params("uid", CommonAppConfig.getInstance().getUid()) .execute(new HttpCallback() { @@ -280,7 +280,7 @@ public class LiveMicUserDialogFragment extends AbsDialogFragment implements View public void onConfirmClick(Dialog dialog, String content) { Log.e("ry", "退出112"); // //退出多人房间 - HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm") + HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai") .params("roomid", LiveActivity.mLiveUid) .params("uid", CommonAppConfig.getInstance().getUid()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java b/live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java index 69d279a7f..4eeb4cdb2 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveTrickeryDialogFragment4Audience.java @@ -63,8 +63,8 @@ public class LiveTrickeryDialogFragment4Audience extends AbsDialogFragment { EventBus.getDefault().register(this); RelativeLayout rlWebview= (RelativeLayout) findViewById(R.id.rlWebview); if (mWishWebViewHolder == null) { - String url= CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=prank"; - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + String url= CommonAppConfig.HOST + "/h5/Turntable/prank.html?"; + url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchor_id="+mLiveUid+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Log.i("tag",url); mWishWebViewHolder = new WishlistWebViewHolder(mContext, rlWebview, url); diff --git a/live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java b/live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java index e8a4c64bb..f8cf08ec6 100644 --- a/live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java +++ b/live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java @@ -151,7 +151,7 @@ public class MenuPopuwWindow implements View.OnClickListener { private Runnable setBlackRunnable = new Runnable() { @Override public void run() { - HttpClient.getInstance().get("User.setBlack", "setBlack") + HttpClient.getInstance().get("shezhilaheizhuangtai", "setBlack") .params("touid", userId); } }; diff --git a/live/src/main/java/com/yunbao/live/http/ImHttpConsts.java b/live/src/main/java/com/yunbao/live/http/ImHttpConsts.java index ff0669945..c1e3ad8ea 100644 --- a/live/src/main/java/com/yunbao/live/http/ImHttpConsts.java +++ b/live/src/main/java/com/yunbao/live/http/ImHttpConsts.java @@ -9,7 +9,7 @@ public class ImHttpConsts { public static final String GET_SYSTEM_MESSAGE_LIST = "getSystemMessageList"; public static final String GET_COMMUNITYLIST_LIST = "getCommunityList"; public static final String CHECK_BLACK = "checkBlack"; - public static final String SEND_DYNAMICCOMMENT = "sendDynamicComment"; + public static final String SEND_DYNAMICCOMMENT = "fabudongtaipinglun"; public static final String SET_BLACK = "setBlack"; public static final String GET_MESSAGEGIFTINFO = "getMessageGiftInfo"; diff --git a/live/src/main/java/com/yunbao/live/http/ImHttpUtil.java b/live/src/main/java/com/yunbao/live/http/ImHttpUtil.java index dfa65a318..27f0f7ceb 100644 --- a/live/src/main/java/com/yunbao/live/http/ImHttpUtil.java +++ b/live/src/main/java/com/yunbao/live/http/ImHttpUtil.java @@ -20,7 +20,7 @@ public class ImHttpUtil { * 私信聊天页面用于获取用户信息 */ public static void getImUserInfo(String uids, HttpCallback callback) { - HttpClient.getInstance().get("Message.getLists", ImHttpConsts.GET_IM_USER_INFO) + HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", ImHttpConsts.GET_IM_USER_INFO) .execute(callback); } @@ -28,7 +28,7 @@ public class ImHttpUtil { * 互动消息回复 */ public static void sendDynamicComment(String dynamic_id, String content, String to_comment_id, HttpCallback callback) { - HttpClient.getInstance().get("Community.sendDynamicComment", ImHttpConsts.SEND_DYNAMICCOMMENT) + HttpClient.getInstance().get("fabudongtaipinglun", ImHttpConsts.SEND_DYNAMICCOMMENT) .params("dynamic_id", dynamic_id) .params("content", content) .params("to_comment_id", to_comment_id) @@ -39,7 +39,7 @@ public class ImHttpUtil { * 获取系统消息列表 */ public static void getSystemMessageList(String type, int p, HttpCallback callback) { - HttpClient.getInstance().get("Message.getListInfo", ImHttpConsts.GET_SYSTEM_MESSAGE_LIST) + HttpClient.getInstance().get("huoquxitongxiaoxixiangqing", ImHttpConsts.GET_SYSTEM_MESSAGE_LIST) .params("p", p) .params("type", type) .execute(callback); @@ -49,7 +49,7 @@ public class ImHttpUtil { * 猜你喜欢 */ public static void getCommunityList(int p, HttpCallback callback) { - HttpClient.getInstance().get("Community.guessYouLike", ImHttpConsts.GET_COMMUNITYLIST_LIST) + HttpClient.getInstance().get("cainixihuandongtailiebiao", ImHttpConsts.GET_COMMUNITYLIST_LIST) .params("p", p) .execute(callback); } @@ -59,7 +59,7 @@ public class ImHttpUtil { * 判断自己有没有被对方拉黑，聊天的时候用到 */ public static void checkBlack(String touid, HttpCallback callback) { - HttpClient.getInstance().get("User.checkBlack", ImHttpConsts.CHECK_BLACK) + HttpClient.getInstance().get("jiancelaheizhuangtai", ImHttpConsts.CHECK_BLACK) .params("touid", touid) .execute(callback); } @@ -68,7 +68,7 @@ public class ImHttpUtil { * 拉黑对方， 解除拉黑 */ public static void setBlack(String touid, HttpCallback callback) { - HttpClient.getInstance().get("User.setBlack", ImHttpConsts.SET_BLACK) + HttpClient.getInstance().get("shezhilaheizhuangtai", ImHttpConsts.SET_BLACK) .params("touid", touid) .execute(callback); } @@ -78,7 +78,7 @@ public class ImHttpUtil { * 获取补偿消息详情 */ public static void getMessageGiftInfo(String msgid, HttpCallback callback) { - HttpClient.getInstance().get("Message.getMessageGiftInfo", ImHttpConsts.GET_MESSAGEGIFTINFO) + HttpClient.getInstance().get("chakanxiaoxilibanxiangqing", ImHttpConsts.GET_MESSAGEGIFTINFO) .params("message_id", msgid) .execute(callback); } @@ -87,7 +87,7 @@ public class ImHttpUtil { * 删除系统消息 */ public static void delMsg(String msgid, HttpCallback callback) { - HttpClient.getInstance().get("Message.deleteSystemMessage", ImHttpConsts.GET_MESSAGEGIFTINFO) + HttpClient.getInstance().get("shanchuxitongxiaoxi", ImHttpConsts.GET_MESSAGEGIFTINFO) .params("message_id", msgid) .execute(callback); } @@ -96,7 +96,7 @@ public class ImHttpUtil { * 已读 系统消息 */ public static void readMsg(String msgid, HttpCallback callback) { - HttpClient.getInstance().get("Message.systemMessageRead", ImHttpConsts.GET_MESSAGEGIFTINFO) + HttpClient.getInstance().get("xitongxiaoxiyiduzhuangtai", ImHttpConsts.GET_MESSAGEGIFTINFO) .params("message_id", msgid) .execute(callback); } @@ -105,7 +105,7 @@ public class ImHttpUtil { * 领取礼物 */ public static void receiveGift(String msgid, HttpCallback callback) { - HttpClient.getInstance().get("Message.getMessageGiftDetails", ImHttpConsts.GET_MESSAGEGIFTINFO) + HttpClient.getInstance().get("lingquxitongxiaoxilibao", ImHttpConsts.GET_MESSAGEGIFTINFO) .params("message_id", msgid) .execute(callback); } @@ -114,7 +114,7 @@ public class ImHttpUtil { * 处罚通知是否有未读消息 */ public static void getPenalizeStatus(HttpCallback callback) { - HttpClient.getInstance().get("Message.penalizeStatus", "Message.penalizeStatus") + HttpClient.getInstance().get("jianchaweiduchufanxiaoxi", "jianchaweiduchufanxiaoxi") .execute(callback); } @@ -122,7 +122,7 @@ public class ImHttpUtil { * 处罚通知列表 */ public static void getPenalizeList(int p, HttpCallback callback) { - HttpClient.getInstance().get("Message.penalizeList", "Message.penalizeList") + HttpClient.getInstance().get("chufantongzhiliebiao", "chufantongzhiliebiao") .params("p", p) .execute(callback); } diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPkPresenter.java index ccd32ba92..c05b8ae41 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPkPresenter.java @@ -251,7 +251,7 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener { mLiveLinkMicPkViewHolder.setTime(s + " " + s1); if (i == 0 && s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) { i = 1; - HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK") + HttpClient.getInstance().get("jieshupk", "jieshupk") .params("uid", CommonAppConfig.getInstance().getUid()) .params("addtime", "00:00") .params("type", "0") @@ -272,13 +272,13 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener { String pkUid = datas.getString("pkuid"); Log.i("seed", seed_msg.mResult.toString()); - HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + pkUid) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @@ -768,7 +768,7 @@ public class LiveLinkMicPkPresenter implements View.OnClickListener { //把画面设置成九宫格 dr_pk_view.setVisibility(View.VISIBLE); - HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive") + HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi") .params("uid", CommonAppConfig.getInstance().getUid()) .params("pkuid", u.getId()) .params("type", "1") diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java index 79ecd5f25..27a9edeaf 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java @@ -546,7 +546,7 @@ public class LiveLinkMicPresenter implements View.OnClickListener { //获取活动 private void getEvent() { if (btn_onecz_event != null) { - HttpClient.getInstance().get("Charge2.isFirstChargeIcons", "Charge2.isFirstChargeIcons") + HttpClient.getInstance().get("xinbanshifouxianshishouchongtubiao", "xinbanshifouxianshishouchongtubiao") .params("uid", CommonAppConfig.getInstance().getUid()) .params("token", CommonAppConfig.getInstance().getToken()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java index 039232dcc..8f90f78d5 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java @@ -397,7 +397,7 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V Log.i("tts2", s1); mLiveLinkMicPkViewHolder.setTime(s + " " + s1); if (s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) { - HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK") + HttpClient.getInstance().get("jieshupk", "jieshupk") .params("uid", CommonAppConfig.getInstance().getUid()) .params("addtime", "00:00") .params("type", "0") @@ -420,13 +420,13 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V Log.e("ry1", datas.getString("win_uid") + "VVVVVV" + datas.getString("pkuid")); - HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + pkUid) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @@ -940,7 +940,7 @@ public class LiveRyLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V @Override protected void onDRPkApply(UserBean u) { - HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive") + HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi") .params("uid", CommonAppConfig.getInstance().getUid()) .params("pkuid", u.getId()) .params("type", "1") diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java index 2c25aac46..ac7863546 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java @@ -350,7 +350,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V Log.i("tts2", s1); mLiveLinkMicPkViewHolder.setTime(s + " " + s1); if (s1.equals("00:01") && mIsAnchor && !s.contains("懲罰")) { - HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "00:00").params("type", "0").params("sign", "1").execute(new HttpCallback() { + HttpClient.getInstance().get("jieshupk", "jieshupk").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "00:00").params("type", "0").params("sign", "1").execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (code == 0) { @@ -363,10 +363,10 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V Log.e("ry1", datas.getString("win_uid") + "VVVVVV" + datas.getString("pkuid")); - HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { + HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { + HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -456,7 +456,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V public void onLinkDRMicPkQuit(String uid) { - HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() { + HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (info.length > 0) { @@ -697,12 +697,12 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V @Override protected void onDRPkApply(UserBean u) { - HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive").params("uid", CommonAppConfig.getInstance().getUid()).params("pkuid", u.getId()).params("type", "1").params("sign", "1").execute(new HttpCallback() { + HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi").params("uid", CommonAppConfig.getInstance().getUid()).params("pkuid", u.getId()).params("type", "1").params("sign", "1").execute(new HttpCallback() { @Override public void onSuccess(int code, String msgs, String[] info) { if (code == 0) { Log.i("多人PK", "1code = " + code + ", msgs = " + msgs + ", info = " + Arrays.deepToString(info) + " mApplyUid = " + mApplyUid); - HttpClient.getInstance().get("live.getdrnum", "live.getdrnum").execute(new HttpCallback() { + HttpClient.getInstance().get("huoqushengyupkshu", "huoqushengyupkshu").execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { Log.i(TAG, "code = " + code + ", msg = " + msg + ", info = " + Arrays.deepToString(info)); @@ -715,7 +715,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V } boolean finalAgree = agree; if (finalAgree) { - HttpClient.getInstance().get("live.joinDRPKroom", "live.joinDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", u.getId()).execute(new HttpCallback() { + HttpClient.getInstance().get("jiaruduorenpkfangjian", "jiaruduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", u.getId()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -738,7 +738,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V L.eSw("将自己从多人pk列表里剔除" + new Gson().toJson(drPkbeans)); } - HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() { + HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (info.length > 0) { @@ -1279,7 +1279,7 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V public void dRjoinOtherRoom(UserBean u) { L.eSw("dRjoinOtherRoom UserBeanUserBeanUserBeanUserBeanUserBeanUserBeanUserBeanUserBean "); setMyDrPkDetailsView(); - HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() { + HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", mApplyUid).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (info.length > 0) { diff --git a/live/src/main/java/com/yunbao/live/socket/SocketClient.java b/live/src/main/java/com/yunbao/live/socket/SocketClient.java index f84d455b3..c0c1f9f0d 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketClient.java @@ -796,7 +796,7 @@ public class SocketClient { params.topMargin = 0; LivePushTxViewHolder.mPreView.setLayoutParams(params); //断开连麦 - HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout") + HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { diff --git a/live/src/main/java/com/yunbao/live/socket/SocketLinkMicPkUtil.java b/live/src/main/java/com/yunbao/live/socket/SocketLinkMicPkUtil.java index 867e0c7c1..8118f3e67 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketLinkMicPkUtil.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketLinkMicPkUtil.java @@ -43,7 +43,7 @@ public class SocketLinkMicPkUtil { */ public static void linkMicPkAccept(SocketClient client, String pkUid, String url, String name) { Log.i("pksend", "发送的pkurl=" + url + "****发送的pkname=" + name); - HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive") + HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi") .params("pkuid", pkUid) .params("type", "1") .params("sign", "1") @@ -51,7 +51,7 @@ public class SocketLinkMicPkUtil { @Override public void onSuccess(int code, String msgs, String[] info) { if (code == 0) { - HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK") + HttpClient.getInstance().get("kaishipk", "kaishipk") .params("pkuid", pkUid) .params("type", "1") .params("sign", "1") diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index 492773d4b..bad505369 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -457,7 +457,7 @@ public class SocketRyClient { } else if (TextUtils.equals(boxType, "2")) { boxTypeName = WordUtil.isNewZh() ? "典藏盲盒" : "Collection blind box"; } else { - boxTypeName = WordUtil.isNewZh() ? "PD盲盒" : "PD blind box"; + boxTypeName = WordUtil.isNewZh() ? "HOSO盲盒" : "HOSO blind box"; } AllServerNotifyEvent allServerNotifyEvent = new AllServerNotifyEvent() @@ -838,7 +838,7 @@ public class SocketRyClient { stringBuffer.append(sendQuickGiftModel.getUserNicename()) .append(WordUtil.isNewZh() ? " 送出了 " : " sent ") .append(sendQuickGiftModel.getQuickGiftNumber()) - .append(WordUtil.isNewZh() ? " 個小PD " : " small pandas "); + .append(WordUtil.isNewZh() ? " 個小HOSO " : " small pandas "); systemChatMessage2(stringBuffer.toString()); Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum())); break; @@ -1486,7 +1486,7 @@ public class SocketRyClient { } }); //断开连麦 - HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout") + HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java b/live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java index 6049239b0..523ee6447 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java @@ -39,7 +39,7 @@ public class SocketRyLinkMicPkUtil { * @param pkUid 对方主播的uid */ public static void linkMicPkAccept(SocketRyClient client, String pkUid, String url, String name) { - HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive") + HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi") .params("uid", CommonAppConfig.getInstance().getUid()) .params("pkuid", pkUid) .params("type", "1") @@ -49,7 +49,7 @@ public class SocketRyLinkMicPkUtil { public void onSuccess(int code, String msgs, String[] info) { if (code == 0) { - HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK") + HttpClient.getInstance().get("kaishipk", "kaishipk") .params("uid", CommonAppConfig.getInstance().getUid()) .params("pkuid", pkUid) .params("type", "1") diff --git a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java index 4bcc60620..c96a14f87 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java @@ -463,7 +463,7 @@ public class SocketSwClient { } else if (TextUtils.equals(boxType, "2")) { boxTypeName = WordUtil.isNewZh() ? "典藏盲盒" : "Collection blind box"; } else { - boxTypeName = WordUtil.isNewZh() ? "PD盲盒" : "PD blind box"; + boxTypeName = WordUtil.isNewZh() ? "HOSO盲盒" : "HOSO blind box"; } AllServerNotifyEvent allServerNotifyEvent = new AllServerNotifyEvent().setBlindBoxId(map.getString("blind_box_id")).setBoxType(boxType).setBoxTypeName(boxTypeName).setDressName(WordUtil.isNewZh() ? map.getString("dress_name") : TextUtils.isEmpty(map.getString("dress_nameen")) ? map.getString("dress_name") : map.getString("dress_nameen")).setGiftNotification(map.getString("gift_notification")).setGiftName(WordUtil.isNewZh() ? mCt.getString("giftname") : mCt.getString("giftnameen")).setUserNiceName(map.getString("uname")).setGiftIcon(map.getString("gifticon")).setAnchorName(map.getString("ancherName")).setDisplaySrc(map.getString("display_src")); Log.e("AllServerNotifyEvent", allServerNotifyEvent.toString()); @@ -767,7 +767,7 @@ public class SocketSwClient { case "sendQuickGift": SendQuickGiftModel sendQuickGiftModel = GsonUtils.fromJson(map.toString(), SendQuickGiftModel.class); StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小PD " : " small pandas "); + stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小HOSO " : " small pandas "); systemChatMessage2(stringBuffer.toString()); Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum())); break; @@ -1416,7 +1416,7 @@ public class SocketSwClient { // if (rtcRoom != null) { Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.DISCONNEXT_PK_TIME)); //断开连麦 - HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout").execute(new HttpCallback() { + HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu").execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { diff --git a/live/src/main/java/com/yunbao/live/socket/SocketSwLinkMicPkUtil.java b/live/src/main/java/com/yunbao/live/socket/SocketSwLinkMicPkUtil.java index 34cc7bb6f..3051d196e 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketSwLinkMicPkUtil.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketSwLinkMicPkUtil.java @@ -39,7 +39,7 @@ public class SocketSwLinkMicPkUtil { * @param pkUid 对方主播的uid */ public static void linkMicPkAccept(SocketSwClient client, String pkUid, String url, String name) { - HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive") + HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi") .params("uid", CommonAppConfig.getInstance().getUid()) .params("pkuid", pkUid) .params("type", "1") @@ -49,7 +49,7 @@ public class SocketSwLinkMicPkUtil { public void onSuccess(int code, String msgs, String[] info) { if (code == 0) { L.eSw("1111111111111111111111111111"); - HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK") + HttpClient.getInstance().get("kaishipk", "kaishipk") .params("uid", CommonAppConfig.getInstance().getUid()) .params("pkuid", pkUid) .params("type", "1") diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index fdf3883ba..b7ab67045 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java @@ -144,7 +144,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { @Override public void onClick(View v) { //获取房间连麦状态 - HttpClient.getInstance().get("live.getDrLm", "live.getDrLm") + HttpClient.getInstance().get("huoqulianmaizhuangtai", "huoqulianmaizhuangtai") .params("uid", mLiveUid, true) .execute(new HttpCallback() { @Override @@ -729,8 +729,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { * 观众打开主播的整蛊惑单窗口 */ public void openZGListWindow() { - String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky"; - url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + String url = CommonAppConfig.HOST + "/h5/activity/Turntable/index.html?"; + url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); Log.i("tag", url); Bundle bundle1 = new Bundle(); diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java index 0be3d139a..d2df95907 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java @@ -29,6 +29,7 @@ import com.lxj.xpopup.core.BasePopupView; import com.lxj.xpopup.interfaces.XPopupCallback; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; +import com.yunbao.common.activity.WebViewActivity; import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.bean.LiveAnchorCallMeModel; import com.yunbao.common.bean.LiveAnchorSayModel; @@ -546,17 +547,13 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl IMLoginModel model = IMLoginManager.get(mContext).getUserInfo(); StringBuffer url = new StringBuffer(); url.append(CommonAppConfig.HOST); - if (TextUtils.equals(ct, "zh")) { - url.append("/index.php?g=portal&m=page&a=index&id=671"); - } else { - url.append("/index.php?g=portal&m=page&a=index&id=672"); - } + url.append("/h5/page/index.html?id=708"); url.append("&uid=") .append(model.getId()) .append("&token=") .append(model.getToken()).append("&isZh=") .append(WordUtil.isNewZh() ? "1" : 0); - RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false); + WebViewActivity.forward(mContext, url.toString(), false); } else if (i == R.id.btn_live_anchor_say) { openAnchorSayDialog(); } else if (i == R.id.btn_live_anchor_call_me) { diff --git a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java index e6a66e1e7..61525b6d5 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java @@ -1276,7 +1276,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION); audioManager.setSpeakerphoneOn(true); - HttpClient.getInstance().get("live.joinDrLm", "live.joinDrLm") + HttpClient.getInstance().get("jiaruduorenlianmai", "jiaruduorenlianmai") .params("roomid", LiveActivity.mLiveUid) .execute(new HttpCallback() { @Override diff --git a/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java index d7e1eed2a..77ecab073 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java @@ -319,7 +319,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder { } } - HttpClient.getInstance().get("Live.getDRPKroom", "Live.getDRPKroom").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", liveUid).execute(new HttpCallback() { + HttpClient.getInstance().get("huoquduorenpkfangjian", "huoquduorenpkfangjian").params("uid", CommonAppConfig.getInstance().getUid()).params("roomid", liveUid).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (info.length > 0) { @@ -404,7 +404,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder { */ private void joinLiveMic() { L.eSw("joinLiveMic"); - HttpClient.getInstance().get("live.joinDrLm", "live.joinDrLm").params("roomid", LiveActivity.mLiveUid).execute(new HttpCallback() { + HttpClient.getInstance().get("jiaruduorenlianmai", "jiaruduorenlianmai").params("roomid", LiveActivity.mLiveUid).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { Log.e("ry", code + "热热热"); diff --git a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java index 169b32dce..c38a2b902 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java @@ -506,7 +506,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX aheadOfScheduleEndPK(mPkUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName(), (String) tv_avatarOther_name.getTag()); //断开连麦 LiveRyAnchorActivity.isDRPK = 0; - HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout") + HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -514,7 +514,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX }); - HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK") + HttpClient.getInstance().get("jieshupk", "jieshupk") .params("uid", CommonAppConfig.getInstance().getUid()) .params("addtime", "1") .params("type", "1") @@ -559,14 +559,14 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX .param("uid", CommonAppConfig.getInstance().getUid()); seed_msg.create(); Log.i("seed", seed_msg.mResult.toString()); - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + pkUid) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @@ -584,13 +584,13 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX seed_msgs.create(); Log.i("seed", seed_msgs.mResult.toString()); - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + LiveRyLinkMicPkPresenter.oldmPkUid) .params("jsonstr", seed_msgs.mResult.toString()) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msgs.mResult.toString()) .execute(new HttpCallback() { @@ -1045,13 +1045,13 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX seed_msg.create(); - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + pkUid) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java index add57ceb0..5df1fabf7 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePushSwViewHolder.java @@ -177,13 +177,13 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX aheadOfScheduleEndPK(mPkUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName(), (String) tv_avatarOther_name.getTag()); //断开连麦 LiveSwAnchorActivity.isDRPK = 0; - HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout").execute(new HttpCallback() { + HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu").execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { } }); - HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "1").params("type", "1").params("sign", "1").execute(new HttpCallback() { + HttpClient.getInstance().get("jieshupk", "jieshupk").params("uid", CommonAppConfig.getInstance().getUid()).params("addtime", "1").params("type", "1").params("sign", "1").execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (code == 0) { @@ -201,11 +201,11 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX SocketSendBean seed_msg = new SocketSendBean().param("_method_", Constants.SOCKET_LINK_MIC_PK).param("action", 9).param("msgtype", 10).param("win_uid", datas.getString("win_uid")).param("uid", CommonAppConfig.getInstance().getUid()); seed_msg.create(); Log.i("seed", seed_msg.mResult.toString()); - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -213,10 +213,10 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX seed_msgs.create(); Log.i("seed", seed_msgs.mResult.toString()); - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + LiveSwLinkMicPkPresenter.oldmPkUid).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() { + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + LiveSwLinkMicPkPresenter.oldmPkUid).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() { + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msgs.mResult.toString()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -292,7 +292,7 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX swManager.joinChannelEx(CommonAppConfig.getInstance().getUid(), CommonAppConfig.SWToken, u.getId(), SWAuManager.getChannelName(u.getId())); } - HttpClient.getInstance().get("Livepk.changeLive", "Livepk.changeLive") + HttpClient.getInstance().get("xiugaizhiboxinxi", "xiugaizhiboxinxi") .params("uid", CommonAppConfig.getInstance().getUid()) .params("pkuid", u.getId()) .params("type", "1") @@ -301,7 +301,7 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX @Override public void onSuccess(int code, String msgs, String[] info) { if (code == 0) { - HttpClient.getInstance().get("Livepk.setPK", "Livepk.setPK") + HttpClient.getInstance().get("kaishipk", "kaishipk") .params("uid", CommonAppConfig.getInstance().getUid()) .params("pkuid", u.getId()) .params("type", "1") @@ -600,10 +600,10 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX SocketSendBean seed_msg = new SocketSendBean().param("_method_", Constants.SOCKET_SYSTEM).param("action", 1).param("ct", ct); seed_msg.create(); - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + pkUid).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().post("Tx.sendmsgzs2", "Tx.sendmsgzs2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { + HttpClient.getInstance().post("fasongxiaoxiv2", "fasongxiaoxiv2").params("GroupId", "g" + CommonAppConfig.getInstance().getUid()).params("jsonstr", seed_msg.mResult.toString()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { diff --git a/live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java index 42a0219f6..e0d3496a2 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePushTxViewHolder.java @@ -108,7 +108,7 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi @Override public void onConfirmClick(Dialog dialog, String content) { //断开连麦 - HttpClient.getInstance().post("livepk.setliveuserout", "livepk.setliveuserout") + HttpClient.getInstance().post("chaxunshoudongpkcishu", "chaxunshoudongpkcishu") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -116,7 +116,7 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi } }); - HttpClient.getInstance().get("Livepk.endPK", "Livepk.endPK") + HttpClient.getInstance().get("jieshupk", "jieshupk") .params("addtime", "00:00") .params("type", "0") .params("sign", "1") @@ -143,14 +143,14 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi params.topMargin = 0; LivePushTxViewHolder.mPreView.setLayoutParams(params); } - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + pkUid) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msg.mResult.toString()) .execute(new HttpCallback() { @@ -168,13 +168,13 @@ public class LivePushTxViewHolder extends AbsLivePushViewHolder implements ITXLi seed_msgs.create(); Log.i("seed", seed_msgs.mResult.toString()); - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + LiveLinkMicPkPresenter.oldmPkUid) .params("jsonstr", seed_msgs.mResult.toString()) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { - HttpClient.getInstance().get("Tx.sendmsgzs2", "Tx.sendmsgzs2") + HttpClient.getInstance().get("fasongxiaoxiv2", "fasongxiaoxiv2") .params("GroupId", "g" + CommonAppConfig.getInstance().getUid()) .params("jsonstr", seed_msgs.mResult.toString()) .execute(new HttpCallback() { diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 9e811c460..aceda8ca5 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -5523,7 +5523,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis @Override public void run() { BannerBean bannerBean = new BannerBean(); - bannerBean.setWishlistIcon(model.getWishlistIcon()).setWishlistName(model.getWishlistName()).setWishlistNum(model.getWishlistNum()).setWishlistProgress(model.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1); + bannerBean.setWishlistIcon(model.getWishlistIcon()).setWishlistName(model.getWishlistName()).setWishlistNum(model.getWishlistNum()).setWishlistProgress(model.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/h5/wish/index.html").setType(1); bannerBean.setShow_type("2"); mTopBannerList.add(bannerBean); LiveChatBean bean = new LiveChatBean(); @@ -6243,7 +6243,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } BannerBean bannerBean = new BannerBean(); - bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/index.php").setType(1); + bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon()).setWishlistName(wishListProgress.getWishlistName()).setWishlistNum(wishListProgress.getWishlistNum()).setWishlistProgress(wishListProgress.getWishlistProgress()).setmLink(CommonAppConfig.HOST + "/h5/wish/index.html").setType(1); bannerBean.setShow_type("2"); if (mTopBannerList.size() == 1 || mTopBannerList.size() == 0) { mTopBannerList.add(bannerBean); @@ -6302,7 +6302,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); String type = ""; StringBuffer htmlUrl = new StringBuffer(); - htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); if (TextUtils.equals(type, "1")) { ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1); } else { @@ -6357,7 +6357,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo(); String type = ""; StringBuffer htmlUrl = new StringBuffer(); - htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&g=Appapi&m=Wish&a=index").append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + htmlUrl.append(bean.getLink()).append(bean.getLink().contains("?") ? "&uid=" : "?uid=").append(userInfo.getId()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&liveUid=").append(mLiveUid).append("&t=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); if (TextUtils.equals(type, "1")) { ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 1); } else { diff --git a/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java index c40d4f83d..f7a5afea9 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java @@ -160,7 +160,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { ToastUtil.show("多人PK次数已用完"); } else { //開始多人PK - HttpClient.getInstance().get("live.startDRPK", "live.startDRPK") + HttpClient.getInstance().get("kaishiduorenpk", "kaishiduorenpk") .params("roomid", CommonAppConfig.getInstance().getUid()) .execute(new HttpCallback() { @Override @@ -182,7 +182,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { btn_end_pk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - HttpClient.getInstance().get("live.endDRpk", "live.endDRpk") + HttpClient.getInstance().get("jieshuduorenpkv2", "jieshuduorenpkv2") .params("roomid", CommonAppConfig.getInstance().getUid()) .execute(new HttpCallback() { @Override @@ -450,7 +450,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { if (model != null && model.getWishlist().size() > 0) { BannerBean bannerModel = new BannerBean(); bannerModel.setShow_type("2"); - bannerModel.setLink(CommonAppConfig.HOST + "/index.php"); + bannerModel.setLink(CommonAppConfig.HOST + "/h5/wish/index.html"); bannerModel.setImageUrl(model.getImg()); addWishList(bannerModel); diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index b01ac66e1..1d1524deb 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -1201,7 +1201,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe if (isSw) { if (mLivePlayViewHolder != null) { mLivePlayViewHolder.endLiveMic(); - HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm") + HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai") .params("roomid", liveID) .execute(new HttpCallback() { @Override @@ -1238,7 +1238,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe Log.e("ry", "下麦成功"); // 该用户切换为观众成功，可以以观众身份进行音视频 //退出多人房间 - HttpClient.getInstance().get("live.leaveDrLm", "live.leaveDrLm") + HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai") .params("roomid", liveID) .execute(new HttpCallback() { @Override diff --git a/live/src/main/res/layout/dialog_live_task.xml b/live/src/main/res/layout/dialog_live_task.xml index 46ffd45a9..64caeb5c6 100644 --- a/live/src/main/res/layout/dialog_live_task.xml +++ b/live/src/main/res/layout/dialog_live_task.xml @@ -47,9 +47,8 @@ diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml index dd1cd4331..1e8bc007b 100644 --- a/main/src/main/AndroidManifest.xml +++ b/main/src/main/AndroidManifest.xml @@ -175,6 +175,7 @@ + \ No newline at end of file diff --git a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java index 0881d7c37..0bd4cc421 100644 --- a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java @@ -417,7 +417,7 @@ public class EditProfileActivity extends AbsActivity { dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1"; + String url = CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1"; WebViewActivity.forward(mContext, url,false); dialog.dismiss(); } diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java index 951927855..626880de7 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java @@ -27,6 +27,7 @@ import android.provider.Settings; import android.util.Base64; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.webkit.JavascriptInterface; @@ -132,7 +133,7 @@ public class EntryActivity extends AppCompatActivity { private static boolean mShowInvite;//显示邀请码弹窗 private static Context Contexts; private ImageView img_view; - private LinearLayout lt_btn_twitter, lt_btn_facebook, lt_customer; + private ViewGroup lt_btn_twitter, lt_btn_facebook, lt_customer; private String kefuUrl = ""; private boolean mBtnClick = false; private Dialog loginLoadingDialog; @@ -403,6 +404,12 @@ public class EntryActivity extends AppCompatActivity { webViewLayout.setVisibility(View.GONE); } }); + //隐藏第三方登陆入口 + lt_btn_facebook.setVisibility(View.GONE); + findViewById(R.id.lt_btn_twitter).setVisibility(View.GONE); + btn_line.setVisibility(View.GONE); + googleLayout.setVisibility(View.GONE); + } private void verfiy(int loginType) { @@ -719,7 +726,7 @@ public class EntryActivity extends AppCompatActivity { if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2 || CommonAppConfig.IS_GOOGLE_PLAY == 3) { EntryActivity.this.startActivity(new Intent(EntryActivity.this, OneLoginActivity.class)); } else { - HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor").execute(new HttpCallback() { + HttpClient.getInstance().post("huoquxinyonghusuijiid", "huoquxinyonghusuijiid").execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (info[0] != null) { diff --git a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java index 1ad1c7c07..7e4c8e0ab 100644 --- a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java @@ -303,7 +303,7 @@ public class LoginActivity extends AbsActivity { public void callback(UserBean bean) { //融云连接服务器 RongcloudIMManager.connectIM(activity); - HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor") + HttpClient.getInstance().post("huoquxinyonghusuijiid", "huoquxinyonghusuijiid") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index 4097a2884..0813207a2 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -61,6 +61,7 @@ import com.yunbao.common.bean.QiniuLog; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.server.DownloadService; import com.yunbao.common.utils.AppManager; +import com.yunbao.common.utils.L; import com.yunbao.common.utils.LogUtil; import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.CommonAppConfig; @@ -135,6 +136,7 @@ import com.yunbao.main.interfaces.MainAppBarLayoutListener; import com.yunbao.main.manager.imrongcloud.ConversationIMListManager; import com.yunbao.main.utils.GenerateTestUserSig; import com.yunbao.main.views.FloatBannerView; +import com.yunbao.main.views.MainGameViewHolder; import com.yunbao.main.views.MainHomeCommunityViewHolder; import com.yunbao.main.views.MainHomeLiveViewHolder; import com.yunbao.main.views.MainHomeViewHolder; @@ -178,7 +180,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene private MainHomeLiveViewHolder mHomeLiveViewHolder; private MainHomeViewHolder mainHomeViewHolder; private MainHomeCommunityViewHolder mMainHomeCommunityViewHolder; - private MainMessageViewHolder mainMessageViewHolder; + private MainGameViewHolder mainMessageViewHolder; private MainMeViewHolder mMeViewHolder; private AbsMainViewHolder[] mViewHolders; private View mBottom; @@ -558,7 +560,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene } } } - } else if (index == 2) { + } else if (index == 1) { floatBanner.setVisibility(View.GONE); floatRedPacket.setVisibility(View.GONE); floatWarOrder.setVisibility(View.GONE); @@ -1307,7 +1309,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene vh = mMainHomeCommunityViewHolder; } else if (position == 1) { - mainMessageViewHolder = new MainMessageViewHolder(this, parent); + mainMessageViewHolder = new MainGameViewHolder(this, parent); vh = mainMessageViewHolder; @@ -1503,9 +1505,10 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene //消息中心 @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) public void onMessageIMEvent(MessageIMEvent event) { + //TODO 消息红点 messageNumber = event.getNumber(); if (event.getNumber() > 0) { - v_table_redpoint.setVisibility(View.VISIBLE); + v_table_redpoint.setVisibility(View.GONE); if (event.getNumber() > 99) { v_table_redpoint.setText("99+"); } else { @@ -1572,7 +1575,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene if (mViewPager != null) { mViewPager.setCurrentItem(2); mTabButtonGroup.setCurPosition(2); - mainMessageViewHolder.setHomeZdyPop(NoviceInstructorManager.get(this).getHomeZdyPop()); + // mainMessageViewHolder.setHomeZdyPop(NoviceInstructorManager.get(this).getHomeZdyPop()); } } diff --git a/main/src/main/java/com/yunbao/main/activity/MainMessageActivity.java b/main/src/main/java/com/yunbao/main/activity/MainMessageActivity.java new file mode 100644 index 000000000..61638c42f --- /dev/null +++ b/main/src/main/java/com/yunbao/main/activity/MainMessageActivity.java @@ -0,0 +1,47 @@ +package com.yunbao.main.activity; + +import android.os.Bundle; +import android.view.View; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.yunbao.common.activity.AbsActivity; +import com.yunbao.common.utils.RouteUtil; +import com.yunbao.main.R; +import com.yunbao.main.views.MainMessageViewHolder; + +@Route(path = RouteUtil.PATH_MAIN_MESSAGE) +public class MainMessageActivity extends AbsActivity { + MainMessageViewHolder messageViewHolder; + + @Override + protected int getLayoutId() { + return R.layout.view_game_holder; + } + + @Override + protected void main(Bundle savedInstanceState) { + super.main(savedInstanceState); + messageViewHolder = new MainMessageViewHolder(mContext, findViewById(R.id.rootView)); + messageViewHolder.getContentView().findViewById(R.id.btn_back).setVisibility(View.VISIBLE); + messageViewHolder.addToParent(); + } + + + @Override + public void onDestroy() { + super.onDestroy(); + messageViewHolder.onDestroy(); + } + + @Override + public void onResume() { + super.onResume(); + messageViewHolder.onResume(); + } + + @Override + public void onPause() { + super.onPause(); + messageViewHolder.onPause(); + } +} diff --git a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java b/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java index a89ec5c31..c89b26e6c 100644 --- a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java @@ -181,66 +181,66 @@ public class MyWalletActivity extends AbsActivity { rView.setVisibility(View.VISIBLE); walletFragment = new WalletFragment(); Bundle bundle = new Bundle(); - bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); walletFragment.setArguments(bundle); googleFragment1 = new GoogleFragment(); Bundle bundle1 = new Bundle(); - bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); googleFragment1.setArguments(bundle1); googleFragment2 = new GoogleFragment(); Bundle bundle2 = new Bundle(); - bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); googleFragment2.setArguments(bundle2); } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { //华为 rView.setVisibility(View.VISIBLE); walletFragment = new WalletFragment(); Bundle bundle = new Bundle(); - bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); walletFragment.setArguments(bundle); huaWeiFragment1 = new HuaWeiFragment(); Bundle bundle1 = new Bundle(); - bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"); + bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName()); huaWeiFragment1.setArguments(bundle1); huaWeiFragment2 = new HuaWeiFragment(); Bundle bundle2 = new Bundle(); - bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"); + bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName()); huaWeiFragment2.setArguments(bundle2); } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) { rView.setVisibility(View.VISIBLE); walletFragment = new WalletFragment(); Bundle bundle = new Bundle(); - bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); walletFragment.setArguments(bundle); samsungFragment1 = new SamsungFragment(); Bundle bundle1 = new Bundle(); - bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); samsungFragment1.setArguments(bundle1); samsungFragment2 = new SamsungFragment(); Bundle bundle2 = new Bundle(); - bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); samsungFragment2.setArguments(bundle2); } else { walletFragment = new WalletFragment(); Bundle bundle = new Bundle(); - bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); walletFragment.setArguments(bundle); googleFragment1 = new GoogleFragment(); Bundle bundle1 = new Bundle(); - bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&first_page=1&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/walletcoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); googleFragment1.setArguments(bundle1); googleFragment2 = new GoogleFragment(); Bundle bundle2 = new Bundle(); - bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/walletgold.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); googleFragment2.setArguments(bundle2); } } else { @@ -249,50 +249,50 @@ public class MyWalletActivity extends AbsActivity { walletFragment = new WalletFragment(); Bundle bundle = new Bundle(); - bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); walletFragment.setArguments(bundle); googleFragment1 = new GoogleFragment(); Bundle bundle1 = new Bundle(); - bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/googlepaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); googleFragment1.setArguments(bundle1); googleFragment2 = new GoogleFragment(); Bundle bundle2 = new Bundle(); - bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/googlepaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); googleFragment2.setArguments(bundle2); } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { rView.setVisibility(View.VISIBLE); walletFragment = new WalletFragment(); Bundle bundle = new Bundle(); - bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); walletFragment.setArguments(bundle); huaWeiFragment1 = new HuaWeiFragment(); Bundle bundle1 = new Bundle(); - bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"); + bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName()); huaWeiFragment1.setArguments(bundle1); huaWeiFragment2 = new HuaWeiFragment(); Bundle bundle2 = new Bundle(); - bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd"); + bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName()); huaWeiFragment2.setArguments(bundle2); } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) { rView.setVisibility(View.VISIBLE); walletFragment = new WalletFragment(); Bundle bundle = new Bundle(); - bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); walletFragment.setArguments(bundle); samsungFragment1 = new SamsungFragment(); Bundle bundle1 = new Bundle(); - bundle1.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaycoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); samsungFragment1.setArguments(bundle1); samsungFragment2 = new SamsungFragment(); Bundle bundle2 = new Bundle(); - bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/samsungpaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); samsungFragment2.setArguments(bundle2); } else { Log.i("tss", "不是首充"); @@ -300,17 +300,17 @@ public class MyWalletActivity extends AbsActivity { walletFragment = new WalletFragment(); Bundle bundle = new Bundle(); - bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle.putString("url", CommonAppConfig.HOST + "/h5/mall/walletbean.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); walletFragment.setArguments(bundle); googleFragment1 = new GoogleFragment(); Bundle bundle1 = new Bundle(); - bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletcoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle1.putString("url", CommonAppConfig.HOST + "/h5/mall/walletcoin.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); googleFragment1.setArguments(bundle1); googleFragment2 = new GoogleFragment(); Bundle bundle2 = new Bundle(); - bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=walletgold&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); + bundle2.putString("url", CommonAppConfig.HOST + "/h5/mall/walletgold.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name="+mContext.getPackageName() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); googleFragment2.setArguments(bundle2); } } @@ -425,7 +425,7 @@ public class MyWalletActivity extends AbsActivity { @Override protected void onPause() { super.onPause(); - CommonHttpUtil.cancel("Charge.Google_sec_pay"); + CommonHttpUtil.cancel("gugedingdanyanzheng"); if (payHandler != null) { payHandler.removeCallbacks(runnable1); payHandler.removeCallbacks(runnable2); @@ -435,7 +435,7 @@ public class MyWalletActivity extends AbsActivity { @Override protected void onDestroy() { super.onDestroy(); - CommonHttpUtil.cancel("Charge.Google_sec_pay"); + CommonHttpUtil.cancel("gugedingdanyanzheng"); if (payHandler != null) { payHandler.removeCallbacks(runnable1); payHandler.removeCallbacks(runnable2); diff --git a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java index 82fcf0718..c30ff6b51 100644 --- a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java @@ -46,6 +46,7 @@ import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.NoviceInstructorManager; import com.yunbao.common.manager.imrongcloud.RongcloudIMManager; import com.yunbao.common.utils.DialogUitl; +import com.yunbao.common.utils.L; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.http.LiveHttpUtil; @@ -241,6 +242,7 @@ public class RegisterActivity extends AbsActivity { webview.addJavascriptInterface(new JsBridge(), "jsBridge"); // 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html")) webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0)); + L.e(webview.getUrl()); } @@ -485,7 +487,7 @@ public class RegisterActivity extends AbsActivity { @Override public void run() { IMLoginModel userInfo = IMLoginManager.get(activity).getUserInfo(); - HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor").params("uid", userInfo.getId()).params("token", userInfo.getToken()).execute(new HttpCallback() { + HttpClient.getInstance().post("huoquxinyonghusuijiid", "huoquxinyonghusuijiid").params("uid", userInfo.getId()).params("token", userInfo.getToken()).execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (info[0] != null) { diff --git a/main/src/main/java/com/yunbao/main/activity/RewardActivity.java b/main/src/main/java/com/yunbao/main/activity/RewardActivity.java index 47655f3bb..ac22b6657 100644 --- a/main/src/main/java/com/yunbao/main/activity/RewardActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RewardActivity.java @@ -328,6 +328,9 @@ public class RewardActivity extends AbsActivity { } public static void forward(Context context, String url) { + if(!url.contains("?")){ + url+="?t="+System.currentTimeMillis()+"&"; + } forward(context, url, true); } diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java index 4f58b217e..010485285 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java @@ -52,6 +52,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter { private Context context; private int Height; private int getWeekIntIndex = 0; + private boolean isHideBanner = false; public MainHomeLiveAdapter(Context context, int h) { super(context); @@ -67,10 +68,10 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public int getItemViewType(int position) { - if (position == 0) { + if (position == 0 && !isHideBanner) { return HEAD; } else if (position > 0) { - LiveBean mode = mList.get(position - 1); + LiveBean mode = getBean(position); if (TextUtils.equals(mode.getIs_week(), "1")) { return WEEKLAYOUT; } else { @@ -81,6 +82,20 @@ public class MainHomeLiveAdapter extends RefreshAdapter { } return LEFT; } + private LiveBean getBean(int position) { + if(isHideBanner){ + return mList.get(position); + }else{ + return mList.get(position-1); + } + } + private int getPosition(int position) { + if(isHideBanner){ + return position; + }else{ + return position-1; + } + } @NonNull @Override @@ -115,7 +130,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) { if (vh instanceof MainHomeLiveWeekItemViewHolder) { - ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() { + ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(getBean(position), getPosition(position), Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() { @Override public void onItemClick(LiveBean bean, int position) { if (mOnItemClickListener != null) { @@ -124,7 +139,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter { } }); } else if (vh instanceof MainHomeLiveItemViewHolder) { - ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() { + ((MainHomeLiveItemViewHolder) vh).loadViewDate(getBean(position), getPosition(position), Height, new MainHomeLiveItemViewHolder.OnItemClickListener() { @Override public void onItemClick(LiveBean bean, int position) { if (mOnItemClickListener != null) { @@ -137,9 +152,18 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public int getItemCount() { + if(isHideBanner){ + return super.getItemCount(); + } return super.getItemCount() + 1; } + public void hideBanner() { + getHeadView().setVisibility(View.GONE); + isHideBanner = true; + notifyItemChanged(0); + } + class HeadVh extends RecyclerView.ViewHolder { public HeadVh(View itemView) { diff --git a/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java b/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java index fc6406056..072066386 100644 --- a/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java +++ b/main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java @@ -89,14 +89,14 @@ public class OneLoginDialog extends AbsDialogFragment { btn_enter.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - HttpClient.getInstance().get("User.userBindAgentAdmin", "User.userBindAgentAdmin") + HttpClient.getInstance().get("yonghubangdingdaili", "yonghubangdingdaili") .params("invitation_code", bundle.getString("code")) .params("user_nicename", bundle.getString("name")) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { if (code == 0) { - HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor") + HttpClient.getInstance().post("huoquxinyonghusuijiid", "huoquxinyonghusuijiid") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java index eef8e6b27..9fc79a0a3 100644 --- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java +++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java @@ -45,7 +45,7 @@ public class MainHttpUtil { * 手机号 密码登录 */ public static void login(String phoneNum, String pwd, String uuid, HttpCallback callback) { - HttpClient.getInstance().get("Login.userLogin", MainHttpConsts.LOGIN) + HttpClient.getInstance().get("huiyuandenglu", MainHttpConsts.LOGIN) .params("user_login", phoneNum) .params("user_pass", pwd) .params("pushid", "") @@ -67,7 +67,7 @@ public class MainHttpUtil { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { appSource = "2"; } - HttpClient.getInstance().get("Login.userLoginByThird", MainHttpConsts.LOGIN_BY_THIRD) + HttpClient.getInstance().get("disanfangdenglu", MainHttpConsts.LOGIN_BY_THIRD) .params("openid", openid) .params("nicename", nicename) .params("app_source", appSource) @@ -93,7 +93,7 @@ public class MainHttpUtil { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { appSource = "2"; } - HttpClient.getInstance().get("Login.userLoginByThird", MainHttpConsts.LOGIN_BY_THIRD) + HttpClient.getInstance().get("disanfangdenglu", MainHttpConsts.LOGIN_BY_THIRD) .params("openid", openid) .params("app_source", appSource) .params("admin_id", promoCode) @@ -115,7 +115,7 @@ public class MainHttpUtil { */ public static void requestBonus(HttpCallback callback) { String appVer = AppUtils.getAppVersionName(); - HttpClient.getInstance().get("User.bonus", MainHttpConsts.REQUEST_BONUS) + HttpClient.getInstance().get("yonghudenglujiangli", MainHttpConsts.REQUEST_BONUS) .params("appAndroidVersion", appVer) .execute(callback); } @@ -124,7 +124,7 @@ public class MainHttpUtil { * 新版本签到奖励 */ public static void requestNewBonus(HttpCallback callback) { - HttpClient.getInstance().get("Sign.userSign", MainHttpConsts.REQUEST_BONUS) + HttpClient.getInstance().get("huiyuanqiandao", MainHttpConsts.REQUEST_BONUS) .params("uuid_Device", DeviceUtils.getUniqueDeviceId()) .params("lastlogindevice", "Android") .params("model", android.os.Build.BRAND + android.os.Build.MODEL) @@ -135,7 +135,7 @@ public class MainHttpUtil { * 获取签到奖励 */ public static void getBonus(HttpCallback callback) { - HttpClient.getInstance().get("User.getBonus", MainHttpConsts.GET_BONUS) + HttpClient.getInstance().get("lingquyonghudenglujiangli", MainHttpConsts.GET_BONUS) .execute(callback); } @@ -143,7 +143,7 @@ public class MainHttpUtil { * 用于用户首次登录设置分销关系 */ public static void setDistribut(String code, HttpCallback callback) { - HttpClient.getInstance().get("User.setDistribut", MainHttpConsts.SET_DISTRIBUT) + HttpClient.getInstance().get("shezhifenxiaoshangji", MainHttpConsts.SET_DISTRIBUT) .params("code", code) .execute(callback); } @@ -152,7 +152,7 @@ public class MainHttpUtil { * 首页直播 */ public static void getHot(int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.getHot", MainHttpConsts.GET_HOT) + HttpClient.getInstance().get("huoquremenzhubo", MainHttpConsts.GET_HOT) .params("p", p) .execute(callback); } @@ -161,7 +161,7 @@ public class MainHttpUtil { * 首页推荐直播 */ public static void getRandom(int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.getRandom", MainHttpConsts.GET_RANDOM) + HttpClient.getInstance().get("huoqutuijianzhubo", MainHttpConsts.GET_RANDOM) .execute(callback); } @@ -169,7 +169,7 @@ public class MainHttpUtil { * 首页关注直播 */ public static void getHomeFollow(int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.getFollow", MainHttpConsts.GET_HOME_FOLLOW) + HttpClient.getInstance().get("huoquguanzhuzhuboliebiao", MainHttpConsts.GET_HOME_FOLLOW) .params("p", p) .execute(callback); } @@ -178,7 +178,7 @@ public class MainHttpUtil { * 首页红包专区 */ public static void getRedPacket(int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.getRedPacket", MainHttpConsts.GET_RANDOM) + HttpClient.getInstance().get("huoquhongbaozhuanquliebiao", MainHttpConsts.GET_RANDOM) .execute(callback); } @@ -186,7 +186,7 @@ public class MainHttpUtil { * 首页 */ public static void getFollow(int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.getFollow", MainHttpConsts.GET_FOLLOW) + HttpClient.getInstance().get("huoquguanzhuzhuboliebiao", MainHttpConsts.GET_FOLLOW) .params("p", p) .execute(callback); } @@ -195,7 +195,7 @@ public class MainHttpUtil { * 首页 附近 */ public static void getNear(int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.getNearby", MainHttpConsts.GET_NEAR) + HttpClient.getInstance().get("huoqufujinzhubo", MainHttpConsts.GET_NEAR) .params("lng", CommonAppConfig.getInstance().getLng()) .params("lat", CommonAppConfig.getInstance().getLat()) .params("p", p) @@ -205,7 +205,7 @@ public class MainHttpUtil { //排行榜 魅力榜 public static void profitList(String type, int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.profitList", MainHttpConsts.PROFIT_LIST) + HttpClient.getInstance().get("shouyibangdan", MainHttpConsts.PROFIT_LIST) .params("type", type) .params("p", p) .execute(callback); @@ -213,7 +213,7 @@ public class MainHttpUtil { //排行榜 豪气榜 public static void consumeList(String type, int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.consumeList", MainHttpConsts.CONSUME_LIST) + HttpClient.getInstance().get("gongxianbangdan", MainHttpConsts.CONSUME_LIST) .params("type", type) .params("p", p) .execute(callback); @@ -222,7 +222,7 @@ public class MainHttpUtil { //排行榜 盲盒榜 public static void blindBoxList(String type, int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.blindBoxList", MainHttpConsts.BLIND_BOX_LIST) + HttpClient.getInstance().get("manghebangdan", MainHttpConsts.BLIND_BOX_LIST) .params("type", type) .params("p", p) .execute(callback); @@ -233,7 +233,7 @@ public class MainHttpUtil { * 获取谷歌 */ public static void getGoogle(String token, final CommonCallback commonCallback) { - HttpClient.getInstance().get("Charge.getChargeHide", MainHttpConsts.GET_BASE_INFO) + HttpClient.getInstance().get("huoqucongzhijiekouxinxi", MainHttpConsts.GET_BASE_INFO) .params("terminal", "1") .params("token", token) .execute(new HttpCallback() { @@ -262,7 +262,7 @@ public class MainHttpUtil { * 获取用户信息 */ public static void getBaseInfo(String uid, String token, final CommonCallback commonCallback) { - HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO) + HttpClient.getInstance().get("huoquyonghujibenxinxiv2", MainHttpConsts.GET_BASE_INFO) .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -297,7 +297,7 @@ public class MainHttpUtil { } public static void getBaseInfos(String uid, String token, HttpCallback callback) { - HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO) + HttpClient.getInstance().get("huoquyonghujibenxinxiv2", MainHttpConsts.GET_BASE_INFO) .execute(callback); } @@ -314,7 +314,7 @@ public class MainHttpUtil { * 获取用户钱 */ public static void getBalance(HttpCallback callback) { - HttpClient.getInstance().get("User.getUserBalance", "User.getUserBalance") + HttpClient.getInstance().get("chaxunyonghuyue", "chaxunyonghuyue") .execute(callback); } @@ -330,7 +330,7 @@ public class MainHttpUtil { * 拉黑对方， 解除拉黑 */ public static void setBlack(String toUid, HttpCallback callback) { - HttpClient.getInstance().get("User.setBlack", MainHttpConsts.SET_BLACK) + HttpClient.getInstance().get("shezhilaheizhuangtai", MainHttpConsts.SET_BLACK) .params("touid", toUid) .execute(callback); } @@ -339,8 +339,9 @@ public class MainHttpUtil { * 获取个性设置列表 */ public static void getSettingList(HttpCallback callback) { - HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST) + HttpClient.getInstance().get("huoqugexingshezhiliebiao", MainHttpConsts.GET_SETTING_LIST) .params("version", VersionUtil.getVersion()) + .params("package_name","hoso") .execute(callback); } @@ -348,7 +349,7 @@ public class MainHttpUtil { * 搜索 */ public static void search(String key, int type, int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.search", MainHttpConsts.SEARCH) + HttpClient.getInstance().get("shouyesousuohuiyuan", MainHttpConsts.SEARCH) .params("key", key) .params("type", type) .params("p", p) @@ -371,7 +372,7 @@ public class MainHttpUtil { * 获取我的拉黑列表 */ public static void getBlackList(int p, HttpCallback callback) { - HttpClient.getInstance().get("User.getBlackList", "User.getBlackList") + HttpClient.getInstance().get("huoquheimingdanliebiao", "huoquheimingdanliebiao") .params("p", p) .execute(callback); } @@ -382,7 +383,7 @@ public class MainHttpUtil { * @param touid 对方的uid */ public static void getFollowList(String touid, int p, HttpCallback callback) { - HttpClient.getInstance().get("User.getFollowsList", MainHttpConsts.GET_FOLLOW_LIST) + HttpClient.getInstance().get("huoquguanzhuliebiao", MainHttpConsts.GET_FOLLOW_LIST) .params("touid", touid) .params("p", p) .execute(callback); @@ -394,7 +395,7 @@ public class MainHttpUtil { * @param touid 对方的uid */ public static void getFansList(String touid, int p, HttpCallback callback) { - HttpClient.getInstance().get("User.getFansList", MainHttpConsts.GET_FANS_LIST) + HttpClient.getInstance().get("huoqufensiliebiao", MainHttpConsts.GET_FANS_LIST) .params("touid", touid) .params("p", p) .execute(callback); @@ -405,7 +406,7 @@ public class MainHttpUtil { * 上传头像，用post */ public static void updateAvatar(File file, HttpCallback callback) { - HttpClient.getInstance().post("User.updateAvatar", MainHttpConsts.UPDATE_AVATAR) + HttpClient.getInstance().post("shangchuantouxiang", MainHttpConsts.UPDATE_AVATAR) .isMultipart(true) .params("file", file) .execute(callback); @@ -417,7 +418,7 @@ public class MainHttpUtil { * @param fields 用户资料 ,以json形式出现 */ public static void updateFields(String fields, HttpCallback callback) { - HttpClient.getInstance().get("User.updateFields", MainHttpConsts.UPDATE_FIELDS) + HttpClient.getInstance().get("xiugaiyonghuxinxi", MainHttpConsts.UPDATE_FIELDS) .params("fields", fields) .execute(callback); } @@ -427,7 +428,7 @@ public class MainHttpUtil { * 获取 我的收益 可提现金额数 */ public static void getProfit(HttpCallback callback) { - HttpClient.getInstance().get("User.getProfit", MainHttpConsts.GET_PROFIT) + HttpClient.getInstance().get("huoquwodeshouyi", MainHttpConsts.GET_PROFIT) .execute(callback); } @@ -435,7 +436,7 @@ public class MainHttpUtil { * 获取 提现账户列表 */ public static void getCashAccountList(HttpCallback callback) { - HttpClient.getInstance().get("User.getUserAccountList", MainHttpConsts.GET_USER_ACCOUNT_LIST) + HttpClient.getInstance().get("huoquyonghutixianzhanghao", MainHttpConsts.GET_USER_ACCOUNT_LIST) .execute(callback); } @@ -444,7 +445,7 @@ public class MainHttpUtil { * 添加 提现账户 */ public static void addCashAccount(String account, String name, String bank, int type, HttpCallback callback) { - HttpClient.getInstance().get("User.setUserAccount", MainHttpConsts.ADD_CASH_ACCOUNT) + HttpClient.getInstance().get("shezhiyonghutixianzhanghao", MainHttpConsts.ADD_CASH_ACCOUNT) .params("account", account) .params("name", name) .params("account_bank", bank) @@ -456,7 +457,7 @@ public class MainHttpUtil { * 删除 提现账户 */ public static void deleteCashAccount(String accountId, HttpCallback callback) { - HttpClient.getInstance().get("User.delUserAccount", MainHttpConsts.DEL_CASH_ACCOUNT) + HttpClient.getInstance().get("shanchuyonghutixianzhanghao", MainHttpConsts.DEL_CASH_ACCOUNT) .params("id", accountId) .execute(callback); } @@ -465,7 +466,7 @@ public class MainHttpUtil { * 提现 */ public static void doCash(String votes, String accountId, HttpCallback callback) { - HttpClient.getInstance().get("User.setCash", MainHttpConsts.DO_CASH) + HttpClient.getInstance().get("yonghutixian", MainHttpConsts.DO_CASH) .params("cashvote", votes)//提现的票数 .params("accountid", accountId)//账号ID .execute(callback); @@ -476,7 +477,7 @@ public class MainHttpUtil { * 分类直播 */ public static void getClassLive(int classId, int p, HttpCallback callback) { - HttpClient.getInstance().get("Home.getClassLive", MainHttpConsts.GET_CLASS_LIVE) + HttpClient.getInstance().get("huoqufenleizhibo", MainHttpConsts.GET_CLASS_LIVE) .params("liveclassid", classId) .params("p", p) .execute(callback); @@ -486,7 +487,7 @@ public class MainHttpUtil { * 获取自己收到的主播印象列表 */ public static void getMyImpress(HttpCallback callback) { - HttpClient.getInstance().get("User.getMyLabel", MainHttpConsts.GET_MY_IMPRESS) + HttpClient.getInstance().get("huoquyingxiangbiaoqian", MainHttpConsts.GET_MY_IMPRESS) .execute(callback); } @@ -494,7 +495,7 @@ public class MainHttpUtil { * 用于用户首次登录推荐 */ public static void getRecommend(HttpCallback callback) { - HttpClient.getInstance().get("Home.getRecommend", MainHttpConsts.GET_RECOMMEND) + HttpClient.getInstance().get("huoqutuijian", MainHttpConsts.GET_RECOMMEND) .execute(callback); } @@ -503,7 +504,7 @@ public class MainHttpUtil { * 用于用户首次登录推荐,关注主播 */ public static void recommendFollow(String touid, HttpCallback callback) { - HttpClient.getInstance().get("Home.attentRecommend", MainHttpConsts.RECOMMEND_FOLLOW) + HttpClient.getInstance().get("guanzhutuijianzhubo", MainHttpConsts.RECOMMEND_FOLLOW) .params("touid", touid) .execute(callback); } @@ -513,7 +514,7 @@ public class MainHttpUtil { */ public static void getRegisterCode(String mobile, HttpCallback callback) { String sign = MD5Util.getMD5("mobile=" + mobile + "&" + SALT); - HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_REGISTER_CODE) + HttpClient.getInstance().get("huoquduanxiyanzhengma", MainHttpConsts.GET_REGISTER_CODE) .params("mobile", mobile) .params("sign", sign) .params("source", "1") @@ -531,7 +532,7 @@ public class MainHttpUtil { MacUitl macUitl = new MacUitl(); String uuid = DeviceUtils.getUniqueDeviceId(); - HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_REGISTER_CODE) + HttpClient.getInstance().get("huoquduanxiyanzhengma", MainHttpConsts.GET_REGISTER_CODE) .params("mobile", mobile) .params("country_code", countryCode + "") .params("sign", sign) @@ -548,7 +549,7 @@ public class MainHttpUtil { * 第三方绑定手机号 */ public static void bindPhone(String mobile, int countryCode, String uid, String token, String user_pass, String user_pass2, String code, HttpCallback callback) { - HttpClient.getInstance().get("Login.bindMobile", MainHttpConsts.BINDMOBILE) + HttpClient.getInstance().get("bangdingshoujihao", MainHttpConsts.BINDMOBILE) .params("mobile", mobile) .params("country_code", countryCode + "") .params("uid", uid, true) @@ -563,7 +564,7 @@ public class MainHttpUtil { * 修改绑定手机号 */ public static void updateBindMobile(String mobile, int countryCode, String uid, String token, String code, HttpCallback callback) { - HttpClient.getInstance().get("Login.updateBindMobile", MainHttpConsts.UPDATEBINDMOBILE) + HttpClient.getInstance().get("genghuanshoujihao", MainHttpConsts.UPDATEBINDMOBILE) .params("mobile", mobile) .params("country_code", countryCode + "") .params("uid", uid, true) @@ -595,7 +596,7 @@ public class MainHttpUtil { } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { appSource = "2"; } - HttpClient.getInstance().get("Login.userReg", MainHttpConsts.REGISTER) + HttpClient.getInstance().get("huiyuanzhuce", MainHttpConsts.REGISTER) .params("user_login", user_login) .params("app_source", appSource) //增加参数：推广码 @@ -619,7 +620,7 @@ public class MainHttpUtil { * 找回密码 */ public static void findPwd(String user_login, String pass, String pass2, String code, HttpCallback callback) { - HttpClient.getInstance().get("Login.userFindPass", MainHttpConsts.FIND_PWD) + HttpClient.getInstance().get("yonghuzhaohuimima", MainHttpConsts.FIND_PWD) .params("user_login", user_login) .params("user_pass", pass) .params("user_pass2", pass2) @@ -632,7 +633,7 @@ public class MainHttpUtil { * 重置密码 */ public static void modifyPwd(String oldpass, String pass, String pass2, HttpCallback callback) { - HttpClient.getInstance().get("User.updatePass", MainHttpConsts.MODIFY_PWD) + HttpClient.getInstance().get("xiugaimima", MainHttpConsts.MODIFY_PWD) .params("oldpass", oldpass) .params("pass", pass) .params("pass2", pass2) @@ -645,7 +646,7 @@ public class MainHttpUtil { */ public static void getFindPwdCode(String mobile, String country_code, HttpCallback callback) { // String sign = MD5Util.getMD5("mobile=" + mobile + "&" + SALT); - HttpClient.getInstance().get("Login.getCode", MainHttpConsts.GET_FIND_PWD_CODE) + HttpClient.getInstance().get("huoquduanxiyanzhengma", MainHttpConsts.GET_FIND_PWD_CODE) .params("mobile", mobile) .params("country_code", country_code) .params("source", "1") @@ -658,7 +659,7 @@ public class MainHttpUtil { * 三级分销页面 获取二维码 */ public static void getQrCode(HttpCallback callback) { - HttpClient.getInstance().get("Agent.getCode", MainHttpConsts.GET_QR_CODE) + HttpClient.getInstance().get("huoqufenxiangxinxi", MainHttpConsts.GET_QR_CODE) .params("source", "1") .execute(callback); } @@ -668,7 +669,7 @@ public class MainHttpUtil { * 首页的排行榜轮播 */ public static void getHomeTop(HttpCallback callback) { - HttpClient.getInstance().get("Home.consumeproList", MainHttpConsts.HOME_TOP) + HttpClient.getInstance().get("gongxianzhoubang", MainHttpConsts.HOME_TOP) .params("type", "month") .params("p", "1") .execute(callback); @@ -678,7 +679,7 @@ public class MainHttpUtil { * 动态赠送礼物 */ public static void sendDynamicGift(String id, int gift_num, String gift_id, HttpCallback callback) { - HttpClient.getInstance().get("Community.sendDynamicGift", MainHttpConsts.SEND_DYNAMICGIFT) + HttpClient.getInstance().get("zengsongdongtailiwu", MainHttpConsts.SEND_DYNAMICGIFT) .params("dynamic_id", id) .params("gift_num", gift_num) .params("gift_id", gift_id) @@ -689,7 +690,7 @@ public class MainHttpUtil { * 动态赠送礼物列表 */ public static void getDynamicGiftInfo(HttpCallback callback) { - HttpClient.getInstance().get("Community.getDynamicGiftInfo", MainHttpConsts.GET_DYNAMICGIFTINFO) + HttpClient.getInstance().get("huoqushequdongtailiwuxinxi", MainHttpConsts.GET_DYNAMICGIFTINFO) .execute(callback); } @@ -697,7 +698,7 @@ public class MainHttpUtil { * 社区动态礼物信息列表 */ public static void getDynamicSendGiftList(String id, int page, HttpCallback callback) { - HttpClient.getInstance().get("Community.getDynamicSendGiftList", MainHttpConsts.GET_DYNAMICSENDGIFTLIST) + HttpClient.getInstance().get("huoqushequdongtailiwuliebiao", MainHttpConsts.GET_DYNAMICSENDGIFTLIST) .params("dynamic_id", id) .params("page", page) .execute(callback); @@ -709,7 +710,7 @@ public class MainHttpUtil { * 是否是主播 */ public static void isAnchor(HttpCallback callback) { - HttpClient.getInstance().get("User.isAnchor", MainHttpConsts.ISANCHOR) + HttpClient.getInstance().get("shifouweizhubozhanghao", MainHttpConsts.ISANCHOR) .execute(callback); } @@ -717,7 +718,7 @@ public class MainHttpUtil { * 是否是完成任务 */ public static void getUserFrontTaskType(HttpCallback callback) { - HttpClient.getInstance().get("Task.getUserFrontTaskType", MainHttpConsts.GET_USER_FRONTTASKTYPE) + HttpClient.getInstance().get("huoquqianzhirenwushifouwancheng", MainHttpConsts.GET_USER_FRONTTASKTYPE) .execute(callback); } @@ -725,7 +726,7 @@ public class MainHttpUtil { * 客服地址 */ public static void getCustomerService(HttpCallback callback) { - HttpClient.getInstance().get("Home.getCustomerService", MainHttpConsts.GETCUSTOMERSERVICE) + HttpClient.getInstance().get("huoqudengluyekefu", MainHttpConsts.GETCUSTOMERSERVICE) .execute(callback); } @@ -733,7 +734,7 @@ public class MainHttpUtil { * 获取im备注信息 */ public static void getInstructorRemark(HttpCallback callback) { - HttpClient.getInstance().get("User.getInstructorRemark", MainHttpConsts.GETINSTRUCTORREMARK) + HttpClient.getInstance().get("huoqutuiguangbeizhumingliebiao", MainHttpConsts.GETINSTRUCTORREMARK) .execute(callback); } @@ -741,13 +742,13 @@ public class MainHttpUtil { * 是否管理员 */ public static void isInstructor(HttpCallback callback) { - HttpClient.getInstance().get("User.isInstructor", MainHttpConsts.ISINSTRUCTOR) + HttpClient.getInstance().get("shifouweituiguangzhanghao", MainHttpConsts.ISINSTRUCTOR) .execute(callback); } // public static void setMessageReadAll() { - HttpClient.getInstance().get("User.getUserInstructor", "") + HttpClient.getInstance().get("huoquyonghuzhidaoyuan", "") .execute(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -770,7 +771,7 @@ public class MainHttpUtil { * 订单通知 */ public static void hwNotify(String InAppPurchaseData, String Signature, String orderId, HttpCallback callback) { - HttpClient.getInstance().get("Charge.HuaweiNotify", "Charge.HuaweiNotify") + HttpClient.getInstance().get("huaweizhifuhuidiao", "huaweizhifuhuidiao") .params("InAppPurchaseData", InAppPurchaseData) .params("InAppDataSignature", Signature) .params("SelfOrderId", orderId) diff --git a/main/src/main/java/com/yunbao/main/views/HonorViewHolder.java b/main/src/main/java/com/yunbao/main/views/HonorViewHolder.java index 195613565..cb7319d01 100644 --- a/main/src/main/java/com/yunbao/main/views/HonorViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/HonorViewHolder.java @@ -74,7 +74,7 @@ public class HonorViewHolder extends AbsUserHomeViewHolder { /** * 获取用户荣誉和座骑 */ - HttpClient.getInstance().get("User.medalCarList", LiveHttpConsts.GET_USER_LIST) + HttpClient.getInstance().get("xunzhangzuoqiliebiao", LiveHttpConsts.GET_USER_LIST) .params("uid", mToUid,true) .execute(new HttpCallback() { @Override diff --git a/main/src/main/java/com/yunbao/main/views/MainGameViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainGameViewHolder.java new file mode 100644 index 000000000..6c1660415 --- /dev/null +++ b/main/src/main/java/com/yunbao/main/views/MainGameViewHolder.java @@ -0,0 +1,59 @@ +package com.yunbao.main.views; + +import android.content.Context; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.LinearLayout; + +import com.yunbao.common.activity.AbsActivity; +import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.views.AbsMainViewHolder; +import com.yunbao.main.R; + +public class MainGameViewHolder extends AbsMainViewHolder { + MainHomeGameViewHolder mGameViewHolder; + + + public MainGameViewHolder(Context context, ViewGroup parentView) { + super(context, parentView); + } + + @Override + public void onCreateHolder() { + super.onCreateHolder(); + } + + @Override + protected int getLayoutId() { + return R.layout.view_game_holder; + } + + @Override + public void init() { + ViewGroup rootGroup= (ViewGroup) findViewById(R.id.rootView); + mGameViewHolder = new MainHomeGameViewHolder((AbsActivity) mContext,rootGroup); + mGameViewHolder.addToParent(); + FrameLayout.LayoutParams params= (FrameLayout.LayoutParams) rootGroup.getLayoutParams(); + params.topMargin= DpUtil.dp2px(20); + rootGroup.setLayoutParams(params); + + } + + @Override + public void onDestroy() { + super.onDestroy(); + mGameViewHolder.onDestroy(); + } + + @Override + public void onResume() { + super.onResume(); + mGameViewHolder.onResume(); + } + + @Override + public void onPause() { + super.onPause(); + mGameViewHolder.onPause(); + } +} diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java index e1b31fa0e..51dec167b 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java @@ -174,7 +174,6 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl String[] titles; private void initTab() { - //TODO 短剧 titles = new String[]{"社區"/*, "短劇"*/}; if (!WordUtil.isNewZh()) { titles = new String[]{"Community"/*, "Theater"*/}; diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java index 605e2e89f..4a7586195 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java @@ -13,6 +13,7 @@ import android.widget.TextView; import androidx.recyclerview.widget.LinearLayoutManager; +import com.blankj.utilcode.util.LogUtils; import com.google.gson.Gson; import com.lxj.xpopup.XPopup; import com.lxj.xpopup.enums.PopupPosition; @@ -150,7 +151,7 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement }); mRefreshView.initData(); mRefreshView.setEmptyLayoutId(R.layout.sud_no_data); - ViewClicksAntiShake.clicksAntiShake(findViewById(com.yunbao.common.R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() { + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { LiveNetManager.get(mContext) diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java index 1fe92a305..349150cad 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java @@ -163,9 +163,9 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { @Override public int getSpanSize(int position) { - if (position == 0) { + /* if (position == 0) { return 2; - } + }*/ return 1; } }); @@ -174,6 +174,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement decoration.setOnlySetItemOffsetsButNoDraw(true); mRefreshView.setItemDecoration(decoration); mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); + mAdapter.hideBanner(); mAdapter.setOnItemClickListener(MainHomeLiveViewHolder.this); mAdapter.setHasStableIds(true);// mRefreshView.setLoadMoreEnable(true); @@ -344,6 +345,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement } View headView = mAdapter.getHeadView(); mBanner = (Banner) headView.findViewById(R.id.banner); + mBanner.setVisibility(View.GONE); mRefreshView.initData(); mBanner.setOutlineProvider(new ViewOutlineProvider() { @Override @@ -431,6 +433,15 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement private void showBanner() { if (mBannerList == null || mBannerList.size() == 0 || mBanner == null) { + mBanner.setVisibility(View.GONE); + mAdapter.hideBanner(); + GridLayoutManager gridLayoutManager=mRefreshView.getLayoutManager(); + gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { + @Override + public int getSpanSize(int position) { + return 1; + } + }); return; } if (mBannerShowed) { diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java index 5fc84cd3f..3a761306a 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java @@ -14,13 +14,16 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.NotificationCompat; +import com.alibaba.fastjson.JSON; import com.lxj.xpopup.XPopup; import com.lxj.xpopup.core.BottomPopupView; import com.yunbao.common.dialog.GiftWallDialog; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.RandomSudGameManager; +import com.yunbao.common.utils.AesUtils; import com.yunbao.common.utils.AppManager; import com.yunbao.common.utils.DebugUtils; +import com.yunbao.common.utils.L; import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.event.FloatWarOrderEvent; @@ -33,6 +36,8 @@ import com.yunbao.main.R; import org.greenrobot.eventbus.EventBus; +import java.util.Base64; + /** * Created by cxf on 2018/9/22. * MainActivity 首页 删除 @@ -79,7 +84,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null , false).setFullWindows(true).setTab2(true).showDialog();*/ // RouteUtil.forwardBattlePass(); - RandomSudGameManager.getManager().random(mContext); + //RandomSudGameManager.getManager().random(mContext); } }); return true; @@ -93,7 +98,6 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { } }); } - public void setCurPosition(int position) { mViewPager.setCurrentItem(position); } diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index 6ff717a41..d19ae3485 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -470,6 +470,12 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi case 17: RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY); break; + case 100: + RouteUtil.forwardCommunityActivity(); + break; + case 101: + RouteUtil.forwardActivity(RouteUtil.PATH_MAIN_MESSAGE); + break; } } else { //21 在线客服 @@ -540,7 +546,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi } else if (i == R.id.btn_gold) { MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮"); // mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2)); - String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index"; + String url = CommonAppConfig.HOST + "/h5/task/index.html?1=1"; RewardActivity.forward(mContext, url); } else if (i == R.id.rt_kefu) { WebViewActivity.forward(mContext, beanKefu.getHref(), false); diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java index 865fda8bf..532d04c2e 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java @@ -1,6 +1,7 @@ package com.yunbao.main.views; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Handler; import android.text.TextUtils; @@ -73,7 +74,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { private LinearLayout topLayout, ltNodataMsg; private ImageView imgNewsNotice, imgNewsInteraction, imgNewsOnline, imgSystemMessages; private Handler netHandler; - private MainActivity mContext; + private Activity mContext; private String homeZdyPop; @@ -86,7 +87,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { return this; } - public MainMessageViewHolder(MainActivity context, ViewGroup parentView) { + public MainMessageViewHolder(Activity context, ViewGroup parentView) { super(context, parentView); mContext = context; } diff --git a/main/src/main/res/drawable/icon_community.webp b/main/src/main/res/drawable/icon_community.webp new file mode 100644 index 0000000000000000000000000000000000000000..0476e0c2abb1825d92496b3c9d6ce1642825854b GIT binary patch literal 2354 zcmV-23C;FWNk&F02><|BMM6+kP&il$0000G0000V0RSHX06|PpNJIw!00Hn80E`yd z*0x1L9PBvQIG`NNH~bJ>m}q*^~I0n4hVi33*2G6EWM ziG=KI#k368BS*5HW;HFX3oCJuoTr!+vOc#s4trxu%1U1$u^IxdYHyY) zA+z^)2vWoS7^h0974p-H> zv(n9G(e4*T)<1W{;mAcb2UdD%;qXO?hpm?q&Uj6;c~tBKW(h?nxMp!-wHJW-2!lts z=wd##AAq4np!ILK?B>M2Is%|sobiHi-DF<5D*zaqAKgZ{^ybD&X8^Q_3tkW|Ui|Fc z0l*jcrrQXYKbvE806YFx% zERy+VM*#C%D&(;_v*HPU-mpO;#T&ZYQ21$q`GqL_b0SM{U@ ziEIH_b%lD)mSHMpRByzS;i>va~k_m~0 zU4cA9iI^=|a#f#bkjNvN<_h%@C1SR4$rEf381je`54##3Oo{l%0{->{{EI*yXNy?L z6N#A#<$*LLJ3Ik=)d?YuBo=gYl}Zu|d%XvPSm4_o_)!b}pzPsp(aV%NT-7eHQQB}- zyU0ctg@u2|cUBV5?7o2UGgP3_vHQD$&q%OFo#8CJC{%1Q|- zY`JVD7r3hBQzlA7VasYO8NgL7vohhu6}I$hqwB&|Eyp}vQ`yz>ERC)Pm&3Bn-&ayL zwT#OTT>~y`d2c1YvZ>`>CW;IfwmaB{sD@STE*?`r_|0}JrBN)ns@+d6f&8f5(?&ty zzjj;YI|MrH&aMHV*u7o-?RIy+y{&e8m3)!iVD{DSkQGm4x0pR`_sGzZ+@!@1*-hU4 zeBUMYQ}2?Yo9#CJ<)+=H!OiyZsJH1aH}hRma7%ZI{ea%2&Czy~Mn~ly33%pPG`T8w zNWk}YgGOg4x2J-4lAE)Gf0A2sU;sdJV>Sq~-W6RSOlo&TD?+5y> zO>Ti!gt&1&(#Ky2!H+F-x{Yv!G)vNWLAcDZHFmRrot8DA5S`{Kw3!tv|6)^8KqFD|LH0XmrAE@gXM13n6x2Y-i9D)Ffh~?5e9rb*vNFUm zI^id*Bn3DM0iR^gZdoZ&OitQUib(;9LC}djWnWpTF*NWw+w+_i)DXxCzhIaYs1Y>q zN%m^Z3PmtFX)hgF0rn^0R9>=@mEv!5@@=ngSpoJY;B-GhF)NF==A&$O=1NIHbw&=# zrgrwRP)4BoYS4RG#oo&kVYxABVZFIe_Y=L7(DlPXc-wJE^|5B*5kkQ&-1E*i@ zP1;6CDr$Fw7XY03G;Je7Ubo&DT+^&)$b^vE(%a+Qk z6!o_uRrJ0o5@^31kn8%c2BDT;rep!XM<^B$GZV}f$vc!FSYqP=(oJ%n4)7VI<18Wg z7}j%kgbyO^uki>UMr!hm@(7>EacRuVZ5a{%`2Wv!0aj2rAix0t05B>5odGH!0U!ZB zZ8Dcfq$46BDF`Tl4T))P;ci|}{yXjKMoMP+FZc)G2j~aq?|*`r$UwnSb+_ah2pB3Z zw)}B_t4@C)$Ut?YqkAK;Av?lMj&)Phb+_Y|bw~EJ1ktK2ht?Nb{WI3KIwlN*#v+ps zRl7Q?H4*EE0?`#T9{`Bk6%r>2i?rvQoL^2#|$+v>G^aMpSY!h z(2FLei}>q*6=@KaY^ZqYdo*VKBgxf74NUE{QexP7xd-^`LTzx;`DT1L?#!NH1!YA= z!NGvt<+ZQVw75G=sHnQz@(hFw6%YUb{M{FP zbz}yJRQKa7n-NuWRs+e`3ri7utw24f&&J~CVRvPE_&C0X|NR6>#mYsnzLr=^z$-sJ YjsMfbj$aw2)XY3)d{b1zJBwfd0CK5ky#N3J literal 0 HcmV?d00001 diff --git a/main/src/main/res/drawable/icon_community_p.webp b/main/src/main/res/drawable/icon_community_p.webp new file mode 100644 index 0000000000000000000000000000000000000000..0d902e6f64e75c02c7f993ce80233d84bffac4ed GIT binary patch literal 4322 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 QE8L0BT_FGf000000E~S&Jpcdz literal 0 HcmV?d00001 diff --git a/main/src/main/res/drawable/icon_home.webp b/main/src/main/res/drawable/icon_home.webp new file mode 100644 index 0000000000000000000000000000000000000000..bd3b6e169c78f6e2403442e6e85a9d59afd9776b GIT binary patch literal 1556 zcmV+v2J87!Nk&Et1^@t8MM6+kP&il$0000G0000V0RSHX06|PpNT~z>00E#@+jiA# zi-b7nk$?l@pg0H)S_i=ab&%Hq5+VT!M?xf=?|$joWb^NdhzSTk{{KO)tfe09&$TSm z-4I``+rRAXCAUF*HT#dxEO$WMy8Vy63VU(u_J40e-P-L7HS?C5eW_;7q}dlA!dKkv z%d3#}?)LS%F_qL@YGx@lbF0Eo{Fv)1?8L2`_f4o-)c|VdB{c)7Pfp}8pjG&YTQ{s# z$ar^yt8XTf8f48ZOwC|7VIY1CdX>?OTQ~Gu9J)pA0yU3YYIc#D#!RYRXqEAbTeoYi zGFb0!m#cZCQnO3eJWA5+vYU)h{Me;e8J?}%#rJJ&lG*@j9+%W?5Oo?8sWy;R#v^Xs z#&VOvSi23U=8;IvhE($?NV8!*WCY@7LtEwY-rWXQw`)sk1FZSFQnNum<(lHh2D-}i z#I4&{Z*noK+Hh;WlGJR-^?4O?*sxc*g1B`X`6}?<-3DLZ*peE7nsH6dNNj>BevHT} zfVOU2ZfK^{=v0C7HcB@jA0u@~5f7vFj2M~`dqxBwqqYLrjNHv#GJ2CUQGPV~sz&hc zN{r&B9}832M`3FBaWGYVG^W}; zrA(=h#?ZS2?dZ|1$ zFFQ|%m%`KTW#y@OS$N7`CZ3*Ngs0g{?<(z zaHa&s+aow{{HV9e&*^RFr+F*@7Hr{FLifby_(2|j<}nK1-JIe0w>Me)?&Ryvx;sED6X z&_oaoP7RJDngFuGnLUMuMN#ZqG`SaOGUBpvZF{tF<~hv1daMy zuw)bwjYU^GmKjBW^KzwQqG+0@WLO_CPBfMrRWK380q69y8rT4{!m-_pC>X`D6+aFUS(r9`0YjA($G7}>FePKbahe6#>Ib~>JDLSf?! zaAPM!@Pvhn8W0~$s6dKJ#1t@3orYIHomeOV_sT&D$d^t)3D`wPujhbX>e!tUE^yUx z>m^)d(Lt*cE>l(=uU=xf)_Ffis@FM&3yyQCt(`iyt<{nr;m7|!dIbPhP&gnw0RR9n z9{`;JDj)$M0X}Uumq;WdA|WQo0DujNX>Q?jCGKNzw4DI_0Q~^`{qOKU8t5TZKspFj z5DtMHy2~=CGnJS<#lt=ZX%xV>hhW^0BCC;=85v3U7Yp%RwERchI`^?xDzP@qWG8uW zxf!-^s`@nE%$Oe4;SBg0#ls0|?LlwzcR>4#hI|a+(MLrt8SpcUh7eKuz^Wh}1S((a zE+$?!)CI`Cgt8O43reFl&Cv6*6S)gYqc(gN_(L;Jw`HX|xC&pKH5c*QlURLQm82X@ zV&Fj8t3DgX&=AR0Al`x=;^ChH`z}fUAsigx1ir|qUS1p_lC!pW+fWxHHq-^jzySXL zSOD|e6$PQ`JHD0%h2L-f+F}d8pZ#q0tVmAzJEU9@daHmJX<_OAH_9bDrUFZUNM`@0 GXaE4Z;qIpZ literal 0 HcmV?d00001 diff --git a/main/src/main/res/drawable/icon_home_p.webp b/main/src/main/res/drawable/icon_home_p.webp new file mode 100644 index 0000000000000000000000000000000000000000..5283849905f5a7208ad785f5d807afb9e25c71c4 GIT binary patch literal 2560 zcmV+b3jg&|Nk&Ha2><|BMM6+kP&il$0000G0000V0RSHX06|PpNT~z>00E#@+jiA# zi-b7nk$?l@pg0H)S_i=ab&%Hq5+VT!M?xf=?|$joWb^NdhzSTk{{KO)tfe09&$TSm z-4I``+rRAXCAUF*HT#dxEO$WMy8Vy63VU(u_J40e-P-L7HS?C5eW_;7q}dlA!dKkv z%d3#}?)LS%F_qL@YGx@lbF0Eo{Fv)1?8L2`_f4o-)c|VdB{c)7Pfp}8pjG&YTQ{s# z$ar^yt8XTf8f48ZOwC|7VIY1CdX>?OTQ~Gu9J)pA0yU3YYIc#D#!RYRXqEAbTeoYi zGFb0!m#cZCQnO3eJWA5+vYU)h{Me;e8J?}%#rJJ&lG*@j9+%W?5Oo?8sWy;R#v^Xs z#&VOvSi23U=8;IvhE($?NV8!*WCY@7LtEwY-rWXQw`)sk1FZSFQnNum<(lHh2D-}i z#I4&{Z*noK+Hh;WlGJR-^?4O?*sxc*g1B`X`6}?<-3DLZ*peE7nsH6dNNj>BevHT} zfVOU2ZfK^{=v0C7HcB@jA0u@~5f7vFj2M~`dqxBwqqYLrjNHv#GJ2CUQGPV~sz&hc zN{r&B9}832M`3FBaWGYVG^W}; zrA(=h#?ZS2?dZ|1$ zFFQ|%m%`KTW#y@OS$N7`CZ3*Ngs0g{?<(z zaHa&s+aow{{HV9e&*^RFr+F*@7Hr{FLifby_(2|j<}nK1-JIe0w>Me)?&Ryvx;sED6X z&_oaoP7RJDngFuGnLUMuMN#ZqG`SaOGUBpvZF{tF<~hv1daMy zuw)bwjYU^GmKjBW^KzwQqG+0@WLO_CPBfMrRWK380q69y8rT4{!m-_pC>X`D6+aFUS(r9`0YjA($G7}>FePKbahe6#>Ib~>JDLSf?! zaAPM!@Pvhn8W0~$s6dKJ#1t@3orYIHomeOV_sT&D$d^t)3D`wPujhbX>e!tUE^yUx z>m^)d(Lt*cE>l(=uU=xf)_Ffis@FM&3yyQCt(`iyt<{nr;m7|!dIbPhP&gnc1pol> zEC8JWDj)$M0X}UunMoufqM;))2?&4-R&R zT{!8uy&;$Etq93SF zpa<%2rVs81z_0Dc?mx6w|E{nOtNs9f0Dgdee)sq&xwfMWyltq%FB@s|_itZxY9EV` zsvsQ%C&bu4>ol94u$s6z%`>{=t{9oVtXq#!iBPlT;R}03QF@k!NX^hfsDyo&1Qo~} z+0lHFSr^T<7-i@h%hsj)@o8wPGi^p0clEn07%DSuMj3bYyHXYm;^ChIH9|!%-Pav( z%f`^F>gPE_i-vp*)gXd7&BT;IItWnOLC!La%}c+kY84@13T`9;vtD#v3M?0?R3qYb zGxA1@akyZEK#H9!$L+^~!p<%k@BSxZxQwfNX~G?PcxmM1{S0qiaH>|g_TS(W6^gP#?8jK>leVzjKzI3`ENJmcwVHObha@%mXMO5&(ra)~~v-0X;<_XA;V3+SY*f zAk9XXR#%P-=}CuR)*%0*uTS~0VFKo9T*#(v!`J8^O7yH@7hMXvKynsw`U*RPUpHTp zRh;YW)v~j!B>ilm0jdMJql#KxeP@w?2Y_1@pvYU8chy`;EvRU`>v*p#p20TouQTnb zSw&pcgs%jzWbGk3u!=yLtT`Dv4P_J_6y!?J3T=Gm>CHC4dL0smv?Dv;uyeNR3T$*MfWFF_Hrs z(A&~P&brnN)c|$==$vGz_1w`vMU6)Sy zmTmrnNEtc9&doyVzi9XW-uNS~IHNo1VxK>Yf$dnQ&*I>FR_&<@5_JIQy>?@&=-7O5 Wr`YGpJNDv&l;Sr#!XsJ$0000t|N2q@ literal 0 HcmV?d00001 diff --git a/main/src/main/res/drawable/icon_main_start.webp b/main/src/main/res/drawable/icon_main_start.webp new file mode 100644 index 0000000000000000000000000000000000000000..7010a92df15f82cc8c9d626409e52ae5ef519c49 GIT binary patch literal 25864 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 UhL!xrIAJO+!XO|3000000DfR9>i_@% literal 0 HcmV?d00001 diff --git a/main/src/main/res/drawable/icon_message.webp b/main/src/main/res/drawable/icon_message.webp new file mode 100644 index 0000000000000000000000000000000000000000..c65a03b3445ce50fc72850bcfe0fb8f786909b19 GIT binary patch literal 1558 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 UBlZ_woqWgBbKbxJ000000QQLuv;Y7A literal 0 HcmV?d00001 diff --git a/main/src/main/res/layout/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml index 536d0fc60..8c66aa88c 100644 --- a/main/src/main/res/layout/activity_entry.xml +++ b/main/src/main/res/layout/activity_entry.xml @@ -233,12 +233,15 @@ android:layout_gravity="center" android:layout_weight="1" android:src="@mipmap/login_line" - android:visibility="visible" /> + android:visibility="visible" + tools:visibility="gone" /> + android:layout_weight="1" + tools:visibility="gone"> diff --git a/main/src/main/res/layout/view_game_holder.xml b/main/src/main/res/layout/view_game_holder.xml new file mode 100644 index 000000000..b87077f76 --- /dev/null +++ b/main/src/main/res/layout/view_game_holder.xml @@ -0,0 +1,8 @@ + + + \ No newline at end of file diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml index 4f0ccaa39..0cc07a179 100644 --- a/main/src/main/res/layout/view_homemain.xml +++ b/main/src/main/res/layout/view_homemain.xml @@ -144,7 +144,7 @@ android:layout_height="60dp" android:layout_centerInParent="true" android:onClick="mainClick" - android:src="@mipmap/icon_main_start" /> + android:src="@drawable/icon_main_start" /> diff --git a/main/src/main/res/layout/view_main_community.xml b/main/src/main/res/layout/view_main_community.xml index f56d4dc3c..3df795dac 100644 --- a/main/src/main/res/layout/view_main_community.xml +++ b/main/src/main/res/layout/view_main_community.xml @@ -10,8 +10,9 @@ android:id="@+id/indicator" android:layout_width="wrap_content" android:layout_height="45dp" - android:overScrollMode="never" android:layout_gravity="center" + android:overScrollMode="never" + android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/main/src/main/res/layout/view_main_community_video.xml b/main/src/main/res/layout/view_main_community_video.xml index d687eed6b..dc18dbaf0 100644 --- a/main/src/main/res/layout/view_main_community_video.xml +++ b/main/src/main/res/layout/view_main_community_video.xml @@ -23,6 +23,7 @@ android:gravity="center"> diff --git a/main/src/main/res/layout/view_main_me.xml b/main/src/main/res/layout/view_main_me.xml index 0c7cf9798..f63c381a6 100644 --- a/main/src/main/res/layout/view_main_me.xml +++ b/main/src/main/res/layout/view_main_me.xml @@ -45,7 +45,7 @@ - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout6" /> - + @@ -446,7 +453,7 @@ android:background="@color/gray_dcdcdc" /> - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout7" /> - + - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/linearLayout8" /> - + diff --git a/main/src/main/res/layout/view_main_message.xml b/main/src/main/res/layout/view_main_message.xml index a783924f1..a38cca295 100644 --- a/main/src/main/res/layout/view_main_message.xml +++ b/main/src/main/res/layout/view_main_message.xml @@ -5,10 +5,21 @@ android:orientation="vertical" android:paddingTop="20dp"> - - + - + - @mipmap/home_00000 - @mipmap/home_00001 - @mipmap/home_00002 - @mipmap/home_00003 - @mipmap/home_00004 - @mipmap/home_00005 - @mipmap/home_00006 - @mipmap/home_00007 - @mipmap/home_00008 - @mipmap/home_00009 - @mipmap/home_00010 - @mipmap/home_00011 - @mipmap/home_00012 - @mipmap/home_00013 - @mipmap/home_00014 - @mipmap/home_00015 - @mipmap/home_00016 - @mipmap/home_00017 - @mipmap/home_00018 - @mipmap/home_00019 - @mipmap/home_00020 - @mipmap/home_00021 - @mipmap/home_00022 - @mipmap/home_00023 - @mipmap/home_00024 - @mipmap/home_00025 - @mipmap/home_00026 - @mipmap/home_00027 - @mipmap/home_00028 - @mipmap/home_00029 - @mipmap/home_00030 - @mipmap/home_00031 - @mipmap/home_00032 - @mipmap/home_00033 - @mipmap/home_00034 - @mipmap/home_00035 - @mipmap/home_00036 - @mipmap/home_00037 - @mipmap/home_00038 - @mipmap/home_00039 - @mipmap/home_00040 - @mipmap/home_00041 - @mipmap/home_00042 - @mipmap/home_00043 - @mipmap/home_00044 - @mipmap/home_00045 - @mipmap/home_00046 - @mipmap/home_00047 - @mipmap/home_00048 - @mipmap/home_00049 - @mipmap/home_00050 - @mipmap/home_00051 - @mipmap/home_00052 - @mipmap/home_00053 - @mipmap/home_00054 - @mipmap/home_00055 - @mipmap/home_00056 - @mipmap/home_00057 - @mipmap/home_00058 - @mipmap/home_00059 + @drawable/icon_home + @drawable/icon_home_p - @mipmap/community_00000 - @mipmap/community_00001 - @mipmap/community_00002 - @mipmap/community_00003 - @mipmap/community_00004 - @mipmap/community_00005 - @mipmap/community_00006 - @mipmap/community_00007 - @mipmap/community_00008 - @mipmap/community_00009 - @mipmap/community_00010 - @mipmap/community_00011 - @mipmap/community_00012 - @mipmap/community_00013 - @mipmap/community_00014 - @mipmap/community_00015 - @mipmap/community_00016 - @mipmap/community_00017 - @mipmap/community_00018 - @mipmap/community_00019 - @mipmap/community_00020 - @mipmap/community_00021 - @mipmap/community_00022 - @mipmap/community_00023 - @mipmap/community_00024 - @mipmap/community_00025 - @mipmap/community_00026 - @mipmap/community_00027 - @mipmap/community_00028 - @mipmap/community_00029 - @mipmap/community_00030 - @mipmap/community_00031 - @mipmap/community_00032 - @mipmap/community_00033 - @mipmap/community_00034 - @mipmap/community_00035 - @mipmap/community_00036 - @mipmap/community_00037 - @mipmap/community_00038 - @mipmap/community_00039 - @mipmap/community_00040 - @mipmap/community_00041 - @mipmap/community_00042 - @mipmap/community_00043 - @mipmap/community_00044 - @mipmap/community_00045 - @mipmap/community_00046 - @mipmap/community_00047 - @mipmap/community_00048 - @mipmap/community_00049 - @mipmap/community_00050 - @mipmap/community_00051 - @mipmap/community_00052 - @mipmap/community_00053 - @mipmap/community_00054 - @mipmap/community_00055 - @mipmap/community_00056 - @mipmap/community_00057 - @mipmap/community_00058 - @mipmap/community_00059 + @drawable/icon_community + @drawable/icon_community_p @@ -139,127 +23,11 @@ - @mipmap/message_00000 - @mipmap/message_00001 - @mipmap/message_00002 - @mipmap/message_00003 - @mipmap/message_00004 - @mipmap/message_00005 - @mipmap/message_00006 - @mipmap/message_00007 - @mipmap/message_00008 - @mipmap/message_00009 - @mipmap/message_00010 - @mipmap/message_00011 - @mipmap/message_00012 - @mipmap/message_00013 - @mipmap/message_00014 - @mipmap/message_00015 - @mipmap/message_00016 - @mipmap/message_00017 - @mipmap/message_00018 - @mipmap/message_00019 - @mipmap/message_00020 - @mipmap/message_00021 - @mipmap/message_00022 - @mipmap/message_00023 - @mipmap/message_00024 - @mipmap/message_00025 - @mipmap/message_00026 - @mipmap/message_00027 - @mipmap/message_00028 - @mipmap/message_00029 - @mipmap/message_00030 - @mipmap/message_00031 - @mipmap/message_00032 - @mipmap/message_00033 - @mipmap/message_00034 - @mipmap/message_00035 - @mipmap/message_00036 - @mipmap/message_00037 - @mipmap/message_00038 - @mipmap/message_00039 - @mipmap/message_00040 - @mipmap/message_00041 - @mipmap/message_00042 - @mipmap/message_00043 - @mipmap/message_00044 - @mipmap/message_00045 - @mipmap/message_00046 - @mipmap/message_00047 - @mipmap/message_00048 - @mipmap/message_00049 - @mipmap/message_00050 - @mipmap/message_00051 - @mipmap/message_00052 - @mipmap/message_00053 - @mipmap/message_00054 - @mipmap/message_00055 - @mipmap/message_00056 - @mipmap/message_00057 - @mipmap/message_00058 - @mipmap/message_00059 + @drawable/icon_message + @drawable/icon_message_p - @mipmap/me_00000 - @mipmap/me_00001 - @mipmap/me_00002 - @mipmap/me_00003 - @mipmap/me_00004 - @mipmap/me_00005 - @mipmap/me_00006 - @mipmap/me_00007 - @mipmap/me_00008 - @mipmap/me_00009 - @mipmap/me_00010 - @mipmap/me_00011 - @mipmap/me_00012 - @mipmap/me_00013 - @mipmap/me_00014 - @mipmap/me_00015 - @mipmap/me_00016 - @mipmap/me_00017 - @mipmap/me_00018 - @mipmap/me_00019 - @mipmap/me_00020 - @mipmap/me_00021 - @mipmap/me_00022 - @mipmap/me_00023 - @mipmap/me_00024 - @mipmap/me_00025 - @mipmap/me_00026 - @mipmap/me_00027 - @mipmap/me_00028 - @mipmap/me_00029 - @mipmap/me_00030 - @mipmap/me_00031 - @mipmap/me_00032 - @mipmap/me_00033 - @mipmap/me_00034 - @mipmap/me_00035 - @mipmap/me_00036 - @mipmap/me_00037 - @mipmap/me_00038 - @mipmap/me_00039 - @mipmap/me_00040 - @mipmap/me_00041 - @mipmap/me_00042 - @mipmap/me_00043 - @mipmap/me_00044 - @mipmap/me_00045 - @mipmap/me_00046 - @mipmap/me_00047 - @mipmap/me_00048 - @mipmap/me_00049 - @mipmap/me_00050 - @mipmap/me_00051 - @mipmap/me_00052 - @mipmap/me_00053 - @mipmap/me_00054 - @mipmap/me_00055 - @mipmap/me_00056 - @mipmap/me_00057 - @mipmap/me_00058 - @mipmap/me_00059 + @drawable/icon_me + @drawable/icon_me_p \ No newline at end of file diff --git a/package_config.gradle b/package_config.gradle index 1234cc581..00ef890e0 100644 --- a/package_config.gradle +++ b/package_config.gradle @@ -47,7 +47,7 @@ android { google_test { dimension 'packageApk' if (project.getPluginManager().hasPlugin("com.android.application")) { - applicationId "com.newpdlive.sy" + applicationId "com.yhosolive.oy" } manifestPlaceholders = [ serverHost : rootProject.ext.manifestPlaceholders.testServerHost, @@ -62,7 +62,7 @@ android { google_online { dimension 'packageApk' if (project.getPluginManager().hasPlugin("com.android.application")) { - applicationId "com.newpdlive.sy" + applicationId "com.yhosolive.oy" } manifestPlaceholders = [ serverHost : rootProject.ext.manifestPlaceholders.serverHost, diff --git a/video/src/main/java/com/yunbao/video/http/VideoHttpUtil.java b/video/src/main/java/com/yunbao/video/http/VideoHttpUtil.java index 167407ed8..ec06002ef 100644 --- a/video/src/main/java/com/yunbao/video/http/VideoHttpUtil.java +++ b/video/src/main/java/com/yunbao/video/http/VideoHttpUtil.java @@ -29,7 +29,7 @@ public class VideoHttpUtil { * 获取首页视频列表 */ public static void getHomeVideoList(int p, HttpCallback callback) { - HttpClient.getInstance().get("Video.getVideoList", VideoHttpConsts.GET_HOME_VIDEO_LIST) + HttpClient.getInstance().get("zhhuoqurenmenshipin", VideoHttpConsts.GET_HOME_VIDEO_LIST) .params("p", p) .execute(callback); } @@ -39,7 +39,7 @@ public class VideoHttpUtil { * 视频点赞 */ public static void setVideoLike(String tag, String videoid, HttpCallback callback) { - HttpClient.getInstance().get("Video.addLike", tag) + HttpClient.getInstance().get("zhshipindianzan", tag) .params("videoid", videoid) .execute(callback); } @@ -48,7 +48,7 @@ public class VideoHttpUtil { * 获取视频评论 */ public static void getVideoCommentList(String videoid, int p, HttpCallback callback) { - HttpClient.getInstance().get("Video.getComments", VideoHttpConsts.GET_VIDEO_COMMENT_LIST) + HttpClient.getInstance().get("zhshipinpinglunliebiao", VideoHttpConsts.GET_VIDEO_COMMENT_LIST) .params("videoid", videoid) .params("p", p) .execute(callback); @@ -58,7 +58,7 @@ public class VideoHttpUtil { * 评论点赞 */ public static void setCommentLike(String commentid, HttpCallback callback) { - HttpClient.getInstance().get("Video.addCommentLike", VideoHttpConsts.SET_COMMENT_LIKE) + HttpClient.getInstance().get("zhpinglundianzan", VideoHttpConsts.SET_COMMENT_LIKE) .params("commentid", commentid) .execute(callback); } @@ -67,7 +67,7 @@ public class VideoHttpUtil { * 发表评论 */ public static void setComment(String toUid, String videoId, String content, String commentId, String parentId, HttpCallback callback) { - HttpClient.getInstance().get("Video.setComment", VideoHttpConsts.SET_COMMENT) + HttpClient.getInstance().get("zhfabupinglun", VideoHttpConsts.SET_COMMENT) .params("touid", toUid) .params("videoid", videoId) .params("commentid", commentId) @@ -82,7 +82,7 @@ public class VideoHttpUtil { * 获取评论回复 */ public static void getCommentReply(String commentid, int p, HttpCallback callback) { - HttpClient.getInstance().get("Video.getReplys", VideoHttpConsts.GET_COMMENT_REPLY) + HttpClient.getInstance().get("zhpinglunhuifuliebiao", VideoHttpConsts.GET_COMMENT_REPLY) .params("commentid", commentid) .params("p", p) .execute(callback); @@ -149,7 +149,7 @@ public class VideoHttpUtil { * 上传视频，获取七牛云token的接口 */ public static void getQiNiuToken(HttpCallback callback) { - HttpClient.getInstance().get("Video.getQiniuToken", VideoHttpConsts.GET_QI_NIU_TOKEN) + HttpClient.getInstance().get("zhhuoquqiniushangchuanlingpai", VideoHttpConsts.GET_QI_NIU_TOKEN) .execute(callback); } @@ -163,7 +163,7 @@ public class VideoHttpUtil { * @param musicId 背景音乐Id */ public static void saveUploadVideoInfo(String title, String thumb, String href, int musicId, boolean openLocation, HttpCallback callback) { - HttpClient.getInstance().get("Video.setVideo", VideoHttpConsts.SAVE_UPLOAD_VIDEO_INFO) + HttpClient.getInstance().get("zhfabuduanshipin", VideoHttpConsts.SAVE_UPLOAD_VIDEO_INFO) .params("lat", openLocation ? String.valueOf(CommonAppConfig.getInstance().getLat()) : "") .params("lng", openLocation ? String.valueOf(CommonAppConfig.getInstance().getLng()) : "") .params("city", openLocation ? CommonAppConfig.getInstance().getCity() : "") @@ -186,7 +186,7 @@ public class VideoHttpUtil { * 获取某人发布的视频 */ public static void getHomeVideo(String toUid, int p, HttpCallback callback) { - HttpClient.getInstance().get("Video.getHomeVideo", VideoHttpConsts.GET_HOME_VIDEO) + HttpClient.getInstance().get("zhgerenzhuyeshipin", VideoHttpConsts.GET_HOME_VIDEO) .params("touid", toUid) .params("p", p) .execute(callback); @@ -197,7 +197,7 @@ public class VideoHttpUtil { * 获取举报内容列表 */ public static void getVideoReportList(HttpCallback callback) { - HttpClient.getInstance().get("Video.getReportContentlist", VideoHttpConsts.GET_VIDEO_REPORT_LIST) + HttpClient.getInstance().get("zhhuoqushipinjubaofenlei", VideoHttpConsts.GET_VIDEO_REPORT_LIST) .execute(callback); } @@ -205,7 +205,7 @@ public class VideoHttpUtil { * 举报视频接口 */ public static void videoReport(String videoId, String reportId, String content, HttpCallback callback) { - HttpClient.getInstance().get("Video.report", VideoHttpConsts.VIDEO_REPORT) + HttpClient.getInstance().get("zhjubaoshipin", VideoHttpConsts.VIDEO_REPORT) .params("videoid", videoId) .params("type", reportId) .params("content", content) @@ -216,7 +216,7 @@ public class VideoHttpUtil { * 删除自己的视频 */ public static void videoDelete(String videoid, HttpCallback callback) { - HttpClient.getInstance().get("Video.del", VideoHttpConsts.VIDEO_DELETE) + HttpClient.getInstance().get("zhshanchushipin", VideoHttpConsts.VIDEO_DELETE) .params("videoid", videoid) .execute(callback); } @@ -227,7 +227,7 @@ public class VideoHttpUtil { public static void setVideoShare(String videoid, HttpCallback callback) { String uid = CommonAppConfig.getInstance().getUid(); String s = MD5Util.getMD5(uid + "-" + videoid + "-" + VIDEO_SALT); - HttpClient.getInstance().get("Video.addShare", VideoHttpConsts.SET_VIDEO_SHARE) + HttpClient.getInstance().get("zhshipinfenxiang", VideoHttpConsts.SET_VIDEO_SHARE) .params("uid", uid,true) .params("videoid", videoid) .params("random_str", s) @@ -245,7 +245,7 @@ public class VideoHttpUtil { } VideoHttpUtil.cancel(VideoHttpConsts.VIDEO_WATCH_START); String s = MD5Util.getMD5(uid + "-" + videoId + "-" + VIDEO_SALT); - HttpClient.getInstance().get("Video.addView", VideoHttpConsts.VIDEO_WATCH_START) + HttpClient.getInstance().get("zhshipinyuedushuleiji", VideoHttpConsts.VIDEO_WATCH_START) .params("uid", uid,true) .params("videoid", videoId) .params("random_str", s) @@ -262,7 +262,7 @@ public class VideoHttpUtil { } VideoHttpUtil.cancel(VideoHttpConsts.VIDEO_WATCH_END); String s = MD5Util.getMD5(uid + "-" + videoId + "-" + VIDEO_SALT); - HttpClient.getInstance().get("Video.setConversion", VideoHttpConsts.VIDEO_WATCH_END) + HttpClient.getInstance().get("zhgengxinshipinkanwancishu", VideoHttpConsts.VIDEO_WATCH_END) .params("uid", uid,true) .params("videoid", videoId) .params("random_str", s) diff --git a/video/src/main/java/com/yunbao/video/upload/VideoUploadFtpImpl.java b/video/src/main/java/com/yunbao/video/upload/VideoUploadFtpImpl.java index 107b9a46c..414dfe6f3 100644 --- a/video/src/main/java/com/yunbao/video/upload/VideoUploadFtpImpl.java +++ b/video/src/main/java/com/yunbao/video/upload/VideoUploadFtpImpl.java @@ -32,7 +32,7 @@ public class VideoUploadFtpImpl implements VideoUploadStrategy { if (videoUploadBean == null || callback == null) { return; } - PostRequest postRequest = OkGo.post("http://www.mytoday.net/api/public/?service=Video.uploadvideo") + PostRequest postRequest = OkGo.post("http://www.mytoday.net/Video.uploadvideo") .params("uid", "13640") .params("token", "0e6371c5a642e8b48748a4d994303473") .params("file", videoUploadBean.getVideoFile())