From 407b21c33f6a9d16efe214b050a7b8455fb93019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Wed, 24 Sep 2025 15:59:41 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=95=B0=E6=8D=AE=E7=9A=84=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8B=8D?= =?UTF-8?q?=E5=8D=96=E6=88=BF=E7=9A=84=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/release/output-metadata.json | 10 +- .../com/xscm/midi/LaunchPageActivity.java | 34 +- gradle.properties | 4 +- .../moduleutil/dialog/RealNameDialog.java | 28 +- .../dialog/RoomAuctionWebViewDialog.java | 228 +++ .../com/xscm/moduleutil/http/ApiServer.java | 116 +- .../moduleutil/http/DefaultTransformer.java | 41 +- .../xscm/moduleutil/http/RetrofitClient.java | 1295 ++++++++++++++--- .../xscm/moduleutil/widget/GiftAnimView.java | 51 + .../layout/dialog_room_auction_webview.xml | 32 + .../fragment/RoomAuctionFragment.java | 14 +- .../activity/PersonalityActivity.java | 14 +- .../modulevocal/activity/SettingActivity.java | 21 +- .../modulevocal/fragment/MyAlbumFragment.java | 29 +- .../zhuangb/ZhuangBanShangChengConactos.java | 4 +- .../zhuangb/ZhuangBanShangChengFragment.java | 174 ++- .../zhuangb/ZhuangBanShangChengPresenter.java | 4 +- .../main/res/layout/activity_created_room.xml | 2 +- .../main/res/layout/activity_personality.xml | 9 +- .../res/layout/me_fagment_user_gift_wall.xml | 3 +- .../res/layout/me_item_user_gift_wall.xml | 3 +- .../classicui/page/TUIC2CChatFragment.java | 10 +- .../message/viewholder/TipsMessageHolder.java | 8 +- 23 files changed, 1790 insertions(+), 344 deletions(-) create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RoomAuctionWebViewDialog.java create mode 100644 moduleUtil/src/main/res/layout/dialog_room_auction_webview.xml diff --git a/app/release/release/output-metadata.json b/app/release/release/output-metadata.json index 80e7458..233fdea 100644 --- a/app/release/release/output-metadata.json +++ b/app/release/release/output-metadata.json @@ -11,9 +11,9 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 102, - "versionName": "1.0.0", - "outputFile": "秘地_1.0.0_102.apk" + "versionCode": 158, + "versionName": "1.0.5", + "outputFile": "秘地_1.0.5_158.apk" } ], "elementType": "File", @@ -22,14 +22,14 @@ "minApi": 28, "maxApi": 30, "baselineProfiles": [ - "baselineProfiles/1/秘地_1.0.0_102.dm" + "baselineProfiles/1/秘地_1.0.5_158.dm" ] }, { "minApi": 31, "maxApi": 2147483647, "baselineProfiles": [ - "baselineProfiles/0/秘地_1.0.0_102.dm" + "baselineProfiles/0/秘地_1.0.5_158.dm" ] } ], diff --git a/app/src/main/java/com/xscm/midi/LaunchPageActivity.java b/app/src/main/java/com/xscm/midi/LaunchPageActivity.java index eddb6fb..73ccdc0 100644 --- a/app/src/main/java/com/xscm/midi/LaunchPageActivity.java +++ b/app/src/main/java/com/xscm/midi/LaunchPageActivity.java @@ -19,7 +19,39 @@ import com.xscm.moduleutil.dialog.PolicyDialog; import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.SpUtil; import com.xscm.midi.databinding.ActivityLaunchPageBinding; - +/** + APP准备启动 + * + * _oo0oo_ + * o8888888o + * 88" . "88 + * (| -_- |) + * 0\ = /0 + * ___/`---'\___ + * .' \\| |// '. + * / \\||| : |||// \ + * / _||||| -卍-|||||- \ + * | | \\\ - /// | | + * | \_| ''\---/'' |_/ | + * \ .-\__ '-' ___/-. / + * ___'. .' /--.--\ `. .'___ + * ."" '< `.___\_<|>_/___.' >' "". + * | | : `- \`.;`\ _ /`;.`/ - ` : | | + * \ \ `_. \_ __\ /__ _/ .-` / / + *=====`-.____`.___ \_____/___.-`___.-'===== + * `=---=' + * + * 佛祖保佑 永无BUG + * 佛曰: + * 写字楼里写字间，写字间里程序员； + * 程序人员写程序，又拿程序换酒钱。 + * 酒醒只在网上坐，酒醉还来网下眠； + * 酒醉酒醒日复日，网上网下年复年。 + * 但愿老死电脑间，不愿鞠躬老板前； + * 奔驰宝马贵者趣，公交自行程序员。 + * 别人笑我忒疯癫，我笑自己命太贱； + * 不见满街漂亮妹，哪个归得程序员？ + */ public class LaunchPageActivity extends BaseAppCompatActivity { private Handler handler; private PolicyDialog policyDialog; diff --git a/gradle.properties b/gradle.properties index 56b9890..c7c4173 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,8 +29,8 @@ isBuildModule=false #org.gradle.deamon=false android.injected.testOnly=false -APP_VERSION_NAME=1.0.3 -APP_VERSION_CODE=155 +APP_VERSION_NAME=1.0.5 +APP_VERSION_CODE=158 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RealNameDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RealNameDialog.java index 297262b..59dfca0 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RealNameDialog.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RealNameDialog.java @@ -8,6 +8,7 @@ import androidx.annotation.NonNull; import com.blankj.utilcode.util.ScreenUtils; import com.xscm.moduleutil.R; +import com.xscm.moduleutil.bean.FirstChargeGiftBean; import com.xscm.moduleutil.color.ThemeableDrawableUtils; import com.xscm.moduleutil.databinding.DialogRealNameBinding; import com.xscm.moduleutil.databinding.IndexDialogYouthModelBinding; @@ -20,6 +21,18 @@ import com.xscm.moduleutil.widget.dialog.BaseDialog; */ public class RealNameDialog extends BaseDialog { + + + public interface OnFirstChargeListener { + void onFirstChargeConfirmed(String giftBean, int type); + void onFirstChargeCancelled(); + } + private OnFirstChargeListener listener; + // 设置监听器的方法 + public void setOnFirstChargeListener(OnFirstChargeListener listener) { + this.listener = listener; + } + public RealNameDialog(@NonNull Context context) { super(context); } @@ -36,8 +49,19 @@ public class RealNameDialog extends BaseDialog { Window window = getWindow(); window.setLayout((int) (ScreenUtils.getScreenWidth() * 315.f / 375), WindowManager.LayoutParams.WRAP_CONTENT); - mBinding.tvIKnow.setOnClickListener(v -> dismiss()); - mBinding.ivClose.setOnClickListener(v -> dismiss()); +// mBinding.tvIKnow.setOnClickListener(v -> dismiss()); +// mBinding.ivClose.setOnClickListener(v -> dismiss()); + + mBinding.tvIKnow.setOnClickListener(v -> { + if (listener != null) { + listener.onFirstChargeConfirmed(null, 0); + } + }); + mBinding.ivClose.setOnClickListener(v -> { + if (listener != null) { + listener.onFirstChargeCancelled(); + } + }); ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.tvIKnow, ColorManager.getInstance().getPrimaryColorInt(), 53); mBinding.tvIKnow.setTextColor(ColorManager.getInstance().getButtonColorInt()); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RoomAuctionWebViewDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RoomAuctionWebViewDialog.java new file mode 100644 index 0000000..ed1ff08 --- /dev/null +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RoomAuctionWebViewDialog.java @@ -0,0 +1,228 @@ +package com.xscm.moduleutil.dialog; + +import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; +import android.graphics.Color; +import android.os.Bundle; +import android.view.Gravity; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.webkit.JavascriptInterface; +import android.webkit.WebSettings; +import android.webkit.WebViewClient; +import android.widget.Toast; + +import androidx.annotation.NonNull; + +import com.alibaba.android.arouter.launcher.ARouter; +import com.blankj.utilcode.util.LogUtils; +import com.blankj.utilcode.util.ScreenUtils; +import com.tencent.imsdk.v2.V2TIMConversation; +import com.tencent.mm.opensdk.modelbiz.WXOpenCustomerServiceChat; +import com.tencent.mm.opensdk.openapi.IWXAPI; +import com.tencent.mm.opensdk.openapi.WXAPIFactory; +import com.tencent.qcloud.tuicore.TUIConstants; +import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIC2CChatActivity; +import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIGroupChatActivity; +import com.xscm.moduleutil.R; +import com.xscm.moduleutil.base.CommonAppContext; +import com.xscm.moduleutil.base.RoomManager; +import com.xscm.moduleutil.databinding.DialogRoomAuctionWebviewBinding; +import com.xscm.moduleutil.databinding.WebViewDialogBinding; +import com.xscm.moduleutil.utils.ARouteConstants; +import com.xscm.moduleutil.widget.dialog.BaseDialog; +/** + *@author qx + *@data 2025/9/24 + *@description: 这是拍卖房的规则界面 + */ +public class RoomAuctionWebViewDialog extends BaseDialog { + + String mUrl; + int type;//10：天空之境 11：岁月之城 12：时空之巅 + + public RoomAuctionWebViewDialog(@NonNull Context context, Bundle args) { + super(context, R.style.BaseDialogStyleH); + this.mUrl = args.getString("url"); + this.type = args.getInt("type"); + initData1(); + } + @Override + public void onStart() { + super.onStart(); + if (getWindow() != null) { + // 获取屏幕尺寸 + android.util.DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics(); + // 设置高度为屏幕高度的80% + android.view.WindowManager.LayoutParams params = getWindow().getAttributes(); + params.height = (int) (displayMetrics.heightPixels * 0.9); + params.width = android.view.ViewGroup.LayoutParams.MATCH_PARENT; + getWindow().setAttributes(params); + } + } + @Override + public int getLayoutId() { + return R.layout.dialog_room_auction_webview; + } + + @Override + public void initView() { + setCancelable(true); + setCanceledOnTouchOutside(true); + Window window = getWindow(); + assert window != null; + window.setGravity(Gravity.BOTTOM); + window.setLayout((int) (ScreenUtils.getScreenWidth() * 320.f / 375), WindowManager.LayoutParams.MATCH_PARENT); + mBinding.topBar.setTitle("规则"); + mBinding.topBar.getIvBack().setOnClickListener(v -> dismiss()); + + } + + @Override + public void initData() { + + } + + + public void initData1() { +// WebSettings webSettings = mBinding.webView.getSettings(); +// webSettings.setUseWideViewPort(true); +// webSettings.setLoadWithOverviewMode(true); +// webSettings.setJavaScriptEnabled(true); +// webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); //关闭webview中缓存 +// //增加JSBridge +// mBinding.webView.addJavascriptInterface(new WebAppInterface(getContext()), "Android"); +//// mBinding.webView.addJavascriptInterface(new WebViewBridgeConfig(title), WebViewBridgeConfig.NAME); +// webSettings.setBuiltInZoomControls(false); +// webSettings.setSupportZoom(false); +// webSettings.setDomStorageEnabled(true); +// webSettings.setBlockNetworkImage(false);//解决图片不显示 +// // 启用 WebView 内容的滚动 +// mBinding.webView.setVerticalScrollBarEnabled(true); +// mBinding.webView.setScrollbarFadingEnabled(true); +// webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); +// webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN); +// mBinding.webView.setHorizontalScrollBarEnabled(false);//水平不显示 +// mBinding.webView.setVerticalScrollBarEnabled(false); //垂直不显示 +// mBinding.webView.setWebViewClient(new WebViewClient()); +// mBinding.webView.setBackgroundColor(Color.TRANSPARENT); +// mBinding.webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null); +// +// mBinding.webView.requestFocus(); +// mBinding.webView.loadUrl(mUrl); + + WebSettings webSettings = mBinding.webView.getSettings(); + webSettings.setUseWideViewPort(true); + webSettings.setLoadWithOverviewMode(true); + webSettings.setJavaScriptEnabled(true); + webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); //关闭webview中缓存 + //增加JSBridge + mBinding.webView.addJavascriptInterface(new WebAppInterface(getContext()), "Android"); +// mBinding.webView.addJavascriptInterface(new WebViewBridgeConfig(title), WebViewBridgeConfig.NAME); + webSettings.setBuiltInZoomControls(false); + webSettings.setSupportZoom(false); + webSettings.setDomStorageEnabled(true); + webSettings.setBlockNetworkImage(false);//解决图片不显示 + webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN); + // 启用 WebView 内容的滚动，但隐藏滚动条 + mBinding.webView.setHorizontalScrollBarEnabled(false);//水平不显示 + mBinding.webView.setVerticalScrollBarEnabled(false); //垂直不显示滚动条 + mBinding.webView.setWebViewClient(new WebViewClient()); + mBinding.webView.setBackgroundColor(Color.TRANSPARENT); + mBinding.webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null); + + // 确保内容可以滚动 + webSettings.setDomStorageEnabled(true); + + mBinding.webView.requestFocus(); + mBinding.webView.loadUrl(mUrl); + } + + private Resources getResources() { + return getContext().getResources(); + } + + public class WebAppInterface { + Context mContext; + + WebAppInterface(Context c) { + mContext = c; + } + + // 被 H5 调用的方法 + @JavascriptInterface + public void showToast(String toast) { + Toast.makeText(mContext, toast, Toast.LENGTH_SHORT).show(); + } + + @JavascriptInterface + public void closeWeb() { + LogUtils.e("value: "); + dismiss(); + } + + @JavascriptInterface + public void customerService() { + String appId = CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(); // 填移动应用(App)的 AppId + IWXAPI api = WXAPIFactory.createWXAPI(mContext, appId); + +// 判断当前版本是否支持拉起客服会话 + WXOpenCustomerServiceChat.Req req = new WXOpenCustomerServiceChat.Req(); + req.corpId = "ww1de4300858c0b461"; // 企业ID + req.url = "https://work.weixin.qq.com/kfid/kfcb3d23a59c188a0e7"; // 客服URL + api.sendReq(req); + } + + @JavascriptInterface + public void jumpRoomPage(String room_id) { + RoomManager.getInstance().fetchRoomDataAndEnter(getContext(), room_id,""); + +// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", room_id).navigation(); + } + @JavascriptInterface + public void jumpWebPage(String objects) { +// ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).navigation(); + ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", objects).navigation(); + } + + @JavascriptInterface + public void enterGroupChat(String group_id,String cover,String guild_name) { + Intent intent = new Intent(mContext, TUIGroupChatActivity.class); + intent.putExtra(TUIConstants.TUIChat.CHAT_ID, group_id); + intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_GROUP); + mContext.startActivity(intent); + } + + @JavascriptInterface + public void chatWithUser(String user_id,String nickname) { + Intent intent = new Intent(mContext, TUIC2CChatActivity.class); + intent.putExtra(TUIConstants.TUIChat.CHAT_ID, user_id); + intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C); + mContext.startActivity(intent); + } + @JavascriptInterface + public void exchange(){ + ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation(); + + } + + @JavascriptInterface + public void Withdrawal() { + ARouter.getInstance().build(ARouteConstants.WITHDRAWAL_ACTIVITY).navigation(); + } + + @JavascriptInterface + public void enterAuthent() {//实名认证 + ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation(); + } + + @JavascriptInterface + public void Recharge(){ + ARouter.getInstance().build(ARouteConstants.RECHARGE_ACTIVITY).navigation(); + } + } + +} diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java index 9f9b046..0dba532 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java @@ -171,7 +171,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_ROOM_RANK) - Observable>> getRoomRank(@Field("room_id") String room_id, @Field("type") String type, @Field("time_type") String time_type, @Field("page") String page, @Field("page_limit") String page_limit); + Call>> getRoomRank(@Field("room_id") String room_id, @Field("type") String type, @Field("time_type") String time_type, @Field("page") String page, @Field("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.POST_ROOM_RANKING) @@ -182,16 +182,16 @@ public interface ApiServer { Observable> loveRanking(@Field("type") String type); @GET(Constants.GET_REAL_NAME) - Observable> realNameInfo(); + Call> realNameInfo(); @GET(Constants.GET_DAILY_TASK_BOX) - Observable>> dailyTasksBoxRecord(); + Call>> dailyTasksBoxRecord(); @GET(Constants.GET_MY_BAG_DATA) - Observable>> packIncome(@Query("page") String page, @Query("page_limit") String page_size); + Call>> packIncome(@Query("page") String page, @Query("page_limit") String page_size); @GET(Constants.GET_MY_BAG_OUTCOME) - Observable>> packOutcome(@Query("page") String page, @Query("page_limit") String page_size); + Call>> packOutcome(@Query("page") String page, @Query("page_limit") String page_size); @GET(Constants.GET_GIFT_PACK) Call>> giftPack(); @@ -213,7 +213,7 @@ public interface ApiServer { Call endPk(@Field("pk_id") String is_pk, @Field("type") String type, @Field("user_id") String user_id); @GET(Constants.GET_RECHARGE) - Observable>> recharge(); + Call>> recharge(); @FormUrlEncoded @POST(Constants.POST_START_PK) @@ -225,7 +225,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.SWITCH_ACCOUNTS) - Observable>> switchAccounts(@Field("user_login") String user_id); + Call>> switchAccounts(@Field("user_login") String user_id); @FormUrlEncoded @POST(Constants.FORGOT_PASSWORD) @@ -233,7 +233,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.USER_UPDATE) - Observable> userUpdate(@Field("nickname") String nickname, @Field("birthday") String birthday, @Field("sex") String sex, @Field("avatar") String avatar, @Field("init_code") String init_code, @Field("user_id") String user_id); + Call> userUpdate(@Field("nickname") String nickname, @Field("birthday") String birthday, @Field("sex") String sex, @Field("avatar") String avatar, @Field("init_code") String init_code, @Field("user_id") String user_id); @GET(Constants.AUTHORIZATION) Call authorization(); @@ -263,18 +263,18 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.REAL_NAME) - Observable> realName(@Field("real_name") String real_name, @Field("card_number") String card_number); + Call> realName(@Field("real_name") String real_name, @Field("card_number") String card_number); @FormUrlEncoded @POST(Constants.GET_EXPAND_COLUMN) - Observable>> getExpandColumn(@Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit); + Call>> getExpandColumn(@Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit); @GET(Constants.GET_OFFICIAL_NOTICE) - Observable> getOfficialNotice(); + Call> getOfficialNotice(); @FormUrlEncoded @POST(Constants.GET_ALBUM_LIST) - Observable>> getAlbumList(@Field("page") String page, @Field("page_limit") String page_limit, @Field("user_id") String user_id); + Call>> getAlbumList(@Field("page") String page, @Field("page_limit") String page_limit, @Field("user_id") String user_id); @FormUrlEncoded @POST(Constants.CREATE_ALBUM) @@ -289,19 +289,19 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_FOLLOW_LIST) - Observable>> getUserFollowList(@Field("page") String page, @Field("page_limit") String page_limit); + Call>> getUserFollowList(@Field("page") String page, @Field("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.POST_FANS_LIST) - Observable>> getUserFansList(@Field("page") String page, @Field("page_limit") String page_limit); + Call>> getUserFansList(@Field("page") String page, @Field("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.POST_BLACK_LIST) - Observable>> getBlacklist(@Field("page") String page, @Field("page_limit") String page_limit); + Call>> getBlacklist(@Field("page") String page, @Field("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.POST_LOCK_MI_LIST) - Observable>> getLockMiniList(@Field("page") String page, @Field("page_limit") String page_limit); + Call>> getLockMiniList(@Field("page") String page, @Field("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.GET_MY_ROOM) @@ -316,7 +316,7 @@ public interface ApiServer { Call>> getTopRooms(@Field("page") String page, @Field("page_limit") String page_limit, @Field("is_top") String is_top, @Field("label_id") String label_id); @GET(Constants.GET_ROOM_TYPE) - Observable>> getRoomCategories(); + Call>> getRoomCategories(); @FormUrlEncoded @POST(Constants.CHECK_TXT) @@ -324,35 +324,35 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.GET_REWARD_LIST) - Observable>> getRewardList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit); + Call>> getRewardList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit); @GET(Constants.GET_GIFT_LABEL) - Observable>> getGiftLabel(@Query("have_hot") String have_hot); + Call>> getGiftLabel(@Query("have_hot") String have_hot); @GET(Constants.GIFT_LIST) //获取礼物列表 - Observable>> getGiftList(@Query("label") int label,@Query("room_id")String room_id); + Call>> getGiftList(@Query("label") int label,@Query("room_id")String room_id); @GET(Constants.TOPIC_LIST) //获取话题 - Observable>> topicList(@Query("page") String page, @Query("page_limit") String page_limit); + Call>> topicList(@Query("page") String page, @Query("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.PUBLISH_ZONE) Call> publishZone(@Field("images") String images, @Field("content") String content, @Field("topic_id") String topic_id, @Field("room_id") String room_id, @Field("ip") String ip); @GET(Constants.GET_CATEGORIES) - Observable>> getCategories(); + Call>> getCategories(); @GET(Constants.GET_CIRCLE_LIST) Call>> getCircleList(@Query("page") String page, @Query("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.GET_USER_HOME_ZONE) - Observable>> getCircleUserList(@Field("user_id") String user_id, @Field("page") String page, @Field("page_limit") String page_limit); + Call>> getCircleUserList(@Field("user_id") String user_id, @Field("page") String page, @Field("page_limit") String page_limit); @GET(Constants.GET_MY_FOOT) - Observable>> getMyFoot(@Query("page") String page, @Query("page_limit") String page_limit); + Call>> getMyFoot(@Query("page") String page, @Query("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.LIKE_ZONE) @@ -360,15 +360,15 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.TOPIC_ID) - Observable>> topicId(@Field("topic_id") String topic_id); + Call>> topicId(@Field("topic_id") String topic_id); @FormUrlEncoded @POST(Constants.ZONE_DETAIL) - Observable> zoneDetail(@Field("id") String topic_id); + Call> zoneDetail(@Field("id") String topic_id); @FormUrlEncoded @POST(Constants.GET_USER_HOME) - Observable> getUserHome(@Field("user_id") String user_id); + Call> getUserHome(@Field("user_id") String user_id); @FormUrlEncoded @POST(Constants.DELETE_COMMENT) @@ -376,11 +376,11 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.GET_COMMENT_LIST) - Observable> getCommentList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit); + Call> getCommentList(@Field("id") String id, @Field("page") String page, @Field("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.POST_SONG) - Observable>> song(@Field("room_id") String roomId, @Field("user_id") String userId, @Field("song_code") String songCode, @Field("song_name") String songName, @Field("singer") String singer, @Field("poster") String poster, @Field("duration") String duration); + Call>> song(@Field("room_id") String roomId, @Field("user_id") String userId, @Field("song_code") String songCode, @Field("song_name") String songName, @Field("singer") String singer, @Field("poster") String poster, @Field("duration") String duration); @FormUrlEncoded @POST(Constants.COMMENT_ZONE) @@ -403,7 +403,7 @@ public interface ApiServer { Call> deleteZone(@Field("id") String id); @GET(Constants.GET_MY_INFO) - Observable> getMyInfo(); + Call> getMyInfo(); @FormUrlEncoded @POST(Constants.ED_USER_INFO) @@ -414,25 +414,25 @@ public interface ApiServer { Call> editUserBg(@Field("images") String images); @GET(Constants.GET_USER_TAG_LIST) - Observable>> getUserTagList(); + Call>> getUserTagList(); @FormUrlEncoded @POST(Constants.GET_LIKE_LIST) - Observable>> getLikeList(@Field("id") String id); + Call>> getLikeList(@Field("id") String id); @FormUrlEncoded @POST(Constants.GET_ALBUM_DETAIL) - Observable> getAlbumDetail(@Field("album_id") String albumId, @Field("pwd") String pwd, @Field("page") String page, @Field("page_limit") String page_limit); + Call> getAlbumDetail(@Field("album_id") String albumId, @Field("pwd") String pwd, @Field("page") String page, @Field("page_limit") String page_limit); @GET(Constants.GET_PERSONALTY) - Observable>> getPersonaltyList(); + Call>> getPersonaltyList(); @FormUrlEncoded @POST(Constants.GET_SUBSIDY) - Observable> getSubsidy(@Field("room_id") String roomId); + Call> getSubsidy(@Field("room_id") String roomId); @GET(Constants.GET_DECORATE) - Observable>> getDecorateList(@Query("type") String type); + Call>> getDecorateList(@Query("type") String type); @FormUrlEncoded @POST(Constants.POST_GZ) @@ -497,11 +497,11 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.UPDATEPASSWORD) - Observable> updatePassword(@Field("room_id") String roomId, @Field("password") String password); + Call> updatePassword(@Field("room_id") String roomId, @Field("password") String password); @FormUrlEncoded @POST(Constants.GET_ROOM_ONLINE) - Observable> getRoomOnline(@Field("room_id") String roomId, @Field("page") String page, @Field("page_limit") String page_limit); + Call> getRoomOnline(@Field("room_id") String roomId, @Field("page") String page, @Field("page_limit") String page_limit); @FormUrlEncoded @POST(Constants.GET_GIVE_GIFT) @@ -512,29 +512,29 @@ public interface ApiServer { Call> roomGift(@Field("room_id") String room_id, @Field("gift_id") String gift_id, @Field("gift_num") String num, @Field("to_uid") String to_uid, @Field("type") String gift_type, @Field("pit_number") String pit_number, @Field("heart_id") String heat_id); @GET(Constants.GET_FIRST_CHARGE_GIFT) - Observable> firstChargeGift(); + Call> firstChargeGift(); @GET(Constants.GET_WALLET) - Observable> wallet(); + Call> wallet(); @FormUrlEncoded @POST(Constants.POST_APPLY_Pay) - Observable> appPay(@Field("user_id") String user_id, @Field("money") String money, @Field("coin") String coin, @Field("type") String type); + Call> appPay(@Field("user_id") String user_id, @Field("money") String money, @Field("coin") String coin, @Field("type") String type); @FormUrlEncoded @POST(Constants.POST_APPLY_LIST) - Observable> roomApplyListBean(@Field("room_id") String room_id); + Call> roomApplyListBean(@Field("room_id") String room_id); @FormUrlEncoded @POST(Constants.GET_ROOM_USER) - Observable> getRoomUserInfo(@Field("room_id") String roomId, @Field("user_id") String userId); + Call> getRoomUserInfo(@Field("room_id") String roomId, @Field("user_id") String userId); @FormUrlEncoded @POST(Constants.POST_BIND_TYPE) - Observable> bindType(@Field("user_id") String userId); + Call> bindType(@Field("user_id") String userId); @GET(Constants.GET_WALLET_CONFIG) - Observable> getWalletConfig(); + Call> getWalletConfig(); @FormUrlEncoded @POST(Constants.POST_BIND) @@ -542,7 +542,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_SONG_LIST) - Observable>> songList(@Field("room_id") String room_id); + Call>> songList(@Field("room_id") String room_id); @FormUrlEncoded @POST(Constants.APPLY_PIT) @@ -626,23 +626,23 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_HOST_LIST) - Observable>> getHostList(@Query("room_id") String room_id, @Field("type") String type); + Call>> getHostList(@Query("room_id") String room_id, @Field("type") String type); @FormUrlEncoded @POST(Constants.GET_CHARM_RANK) - Observable>> getCharmRank(@Field("room_id") String roomId); + Call>> getCharmRank(@Field("room_id") String roomId); @FormUrlEncoded @POST(Constants.POST_ROOM_RELATION_LIST) - Observable>> roomRelationList(@Field("type") String type); + Call>> roomRelationList(@Field("type") String type); @FormUrlEncoded @POST(Constants.POST_ROOM_AUCTION_LIST) - Observable>> roomAuctionList(@Field("auction_id") String auction_id); + Call>> roomAuctionList(@Field("auction_id") String auction_id); @FormUrlEncoded @POST(Constants.POST_SEARCH) - Observable>> getSearch(@Query("search") String room_id, @Field("type") String type); + Call>> getSearch(@Query("search") String room_id, @Field("type") String type); @FormUrlEncoded @POST(Constants.SET_PRESIDED_RATIO) @@ -670,11 +670,11 @@ public interface ApiServer { Call> setLockPit(@Field("room_id") String room_id, @Field("pit_number") String pit_number, @Field("is_lock") String is_lock); @GET(Constants.GET_ROOM_BJ) - Observable> getBackgroundList(); + Call> getBackgroundList(); @FormUrlEncoded @POST(Constants.POST_CHARM_LIST) - Observable> getCharmList(@Field("room_id") String room_id, @Field("start_time") String start_time, @Field("end_time") String end_time, @Field("page") String page); + Call> getCharmList(@Field("room_id") String room_id, @Field("start_time") String start_time, @Field("end_time") String end_time, @Field("page") String page); @FormUrlEncoded @POST(Constants.POST_SET_UPLOAD_BG_IMG) @@ -707,7 +707,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_RELATION_CARD) - Observable> relationCard(@Field("user_id") String user_id); + Call> relationCard(@Field("user_id") String user_id); @FormUrlEncoded @POST(Constants.POST_TOP_RELATION_CARD) @@ -720,11 +720,11 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_ROOM_AUCTION) - Observable> roomAuction(@Field("room_id") String room_id, @Field("user_id") String user_id, @Field("gift_id") String gift_id, @Field("relation_id") String relation_id, @Field("auction_type") String auction_type, @Field("time_day") String time_day); + Call> roomAuction(@Field("room_id") String room_id, @Field("user_id") String user_id, @Field("gift_id") String gift_id, @Field("relation_id") String relation_id, @Field("auction_type") String auction_type, @Field("time_day") String time_day); @FormUrlEncoded @POST(Constants.POST_ROOM_AUCTION_TIME) - Observable> roomAuctionTime(@Field("gift_id") String gift_id); + Call> roomAuctionTime(@Field("gift_id") String gift_id); @FormUrlEncoded @POST(Constants.POST_ROOM_AUCTION_JOIN) @@ -733,7 +733,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_SEARCH_PK_ROOM) - Observable>> searchPkRoom(@Field("room_id") String room_id, @Field("page") String page, @Field("limit") String limit); + Call>> searchPkRoom(@Field("room_id") String room_id, @Field("page") String page, @Field("limit") String limit); @GET(Constants.GET_BOX_GIFT_LIST) Call> getBoxGiftList(@Query("gift_bag_id") String gift_bag_id, @Query("room_id") String room_id); @@ -779,6 +779,6 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.ROOM_USER_RECONNECT) - Observable> roomUserReconnect(@Field("room_id") String room_id); + Call> roomUserReconnect(@Field("room_id") String room_id); } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/DefaultTransformer.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/DefaultTransformer.java index 5d8d0af..4be2166 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/DefaultTransformer.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/DefaultTransformer.java @@ -46,26 +46,9 @@ public class DefaultTransformer implements ObservableTransformer T data = response.getData(); if (data == null) { return getDefaultValue(); - // 根据类型返回默认值 -// if (data instanceof String) { -// data = (T) ""; -// } else if (data instanceof List) { -// data = (T) new ArrayList<>(); -// } else if (data instanceof Integer) { -// data = (T) Integer.valueOf(0); -// } else if (data instanceof Long) { -// data = (T) Long.valueOf(0L); -// } else if (data instanceof Double) { -// data = (T) Double.valueOf(0.0); -// } else if (data instanceof Float) { -// data = (T) Float.valueOf(0.0f); -// } else if (data instanceof Boolean) { -// data = (T) Boolean.FALSE; -// } else { -// data= ; -// } } return data; +// return response.getData(); }) .onErrorResumeNext(throwable -> { // 可以在这里统一处理异常 @@ -81,8 +64,26 @@ public class DefaultTransformer implements ObservableTransformer @SuppressWarnings("unchecked") private T getDefaultValue() { try { - // 尝试返回合理类型的默认值 - return (T) new Object(); + // 根据类型返回合理的默认值 + Class type = (Class) Object.class; + if (String.class.isAssignableFrom(type)) { + return (T) ""; + } else if (List.class.isAssignableFrom(type)) { + return (T) new ArrayList<>(); + } else if (Integer.class.isAssignableFrom(type) || int.class.isAssignableFrom(type)) { + return (T) Integer.valueOf(0); + } else if (Long.class.isAssignableFrom(type) || long.class.isAssignableFrom(type)) { + return (T) Long.valueOf(0L); + } else if (Double.class.isAssignableFrom(type) || double.class.isAssignableFrom(type)) { + return (T) Double.valueOf(0.0); + } else if (Float.class.isAssignableFrom(type) || float.class.isAssignableFrom(type)) { + return (T) Float.valueOf(0.0f); + } else if (Boolean.class.isAssignableFrom(type) || boolean.class.isAssignableFrom(type)) { + return (T) Boolean.FALSE; + } else { + // 对于其他对象类型，返回一个新的Object实例 + return (T) new Object(); + } } catch (Exception e) { return null; } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 5e2e94c..e9aa99f 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -291,15 +291,15 @@ public class RetrofitClient { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code() == 200){ - BaseModel> listBaseModel=response.body(); - if (listBaseModel!=null){ - int code=listBaseModel.getCode(); - if (code==1){ + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel != null) { + int code = listBaseModel.getCode(); + if (code == 1) { observer.onNext(listBaseModel.getData()); - }else if (code==301){ + } else if (code == 301) { ToastUtils.showShort(listBaseModel.getMsg()); - }else { + } else { ToastUtils.showShort(listBaseModel.getMsg()); } } @@ -340,13 +340,13 @@ public class RetrofitClient { observer.onNext(string.getData()); } else if (code == 301) { // try { - ToastUtils.showShort(string.getMsg()); + ToastUtils.showShort(string.getMsg()); // ToastUtils.showShort("提示当前账号已在别的地方登陆，如果不是本人操作请修改密码"); // CommonAppContext.getInstance().clearLoginInfo(); // } catch (ClassNotFoundException e) { // throw new RuntimeException(e); // } - }else { + } else { ToastUtils.showShort(string.getMsg()); } @@ -458,7 +458,24 @@ public class RetrofitClient { } public void getRoomRank(String roomId, String type, String time_type, String page, String page_limit, BaseObserver> observer) { - sApiServer.getRoomRank(roomId, type, time_type, page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.getRoomRank(roomId, type, time_type, page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getRoomRank(roomId, type, time_type, page, page_limit).enqueue(new Callback>>() { + + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void wealthRanking(String ranking_type, String type, BaseObserver observer) { @@ -474,15 +491,60 @@ public class RetrofitClient { } public void dailyTasksBoxRecord(BaseObserver> observer) { - sApiServer.dailyTasksBoxRecord().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.dailyTasksBoxRecord().enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void packIncome(String page, String page_limit, BaseObserver> observer) { - sApiServer.packIncome(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.packIncome(page, page_limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void packOutcome(String page, String page_limit, BaseObserver> observer) { - sApiServer.packOutcome(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.packOutcome(page, page_limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void giftPack(BaseObserver> observer) { @@ -490,7 +552,7 @@ public class RetrofitClient { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code() == 200){ + if (response.code() == 200) { BaseModel> baseModel = response.body(); if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); @@ -507,15 +569,15 @@ public class RetrofitClient { }); } - public void getGiftPack(String roomId, String userId, String heart_id,String auction_id,BaseObserver observer){ - sApiServer.getGiftPack(roomId,userId,heart_id,auction_id).enqueue(new Callback>() { + public void getGiftPack(String roomId, String userId, String heart_id, String auction_id, BaseObserver observer) { + sApiServer.getGiftPack(roomId, userId, heart_id, auction_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - if (response.code() == 200){ + if (response.code() == 200) { BaseModel baseModel = response.body(); - if (baseModel.getCode() == 1){ + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getMsg()); - }else { + } else { observer.onNext(null); } } @@ -528,13 +590,13 @@ public class RetrofitClient { }); } - public void getGiftPackListCount(BaseObserver observer){ + public void getGiftPackListCount(BaseObserver observer) { sApiServer.getGiftPackListCount().enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - if (response.code() == 200){ + if (response.code() == 200) { BaseModel baseModel = response.body(); - if (baseModel.getCode() == 1){ + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); } } @@ -547,8 +609,19 @@ public class RetrofitClient { }); } - public void roomUserReconnect(String roomId){ - sApiServer.roomUserReconnect(roomId).compose(new DefaultTransformer<>()).subscribe(); + public void roomUserReconnect(String roomId) { + sApiServer.roomUserReconnect(roomId).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200){ + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void tasksLihen(BaseObserver observer) { @@ -687,7 +760,23 @@ public class RetrofitClient { } public void realNameInfo(BaseObserver observer) { - sApiServer.realNameInfo().compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.realNameInfo().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.realNameInfo().enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void addBlackList(String userId, BaseObserver observer) { @@ -713,23 +802,23 @@ public class RetrofitClient { public void upUserPic(String sex, BaseObserver observer) { sApiServer.upUserPic(sex).enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - try { - String json = response.body().string(); - BaseModel baseModel = GsonUtils.fromJson(json, BaseModel.class); - observer.onNext(baseModel.getData()); + @Override + public void onResponse(Call call, Response response) { + try { + String json = response.body().string(); + BaseModel baseModel = GsonUtils.fromJson(json, BaseModel.class); + observer.onNext(baseModel.getData()); - } catch (IOException e) { - e.printStackTrace(); - } - } + } catch (IOException e) { + e.printStackTrace(); + } + } - @Override - public void onFailure(Call call, Throwable t) { - t.printStackTrace(); - } - }); + @Override + public void onFailure(Call call, Throwable t) { + t.printStackTrace(); + } + }); // .enqueue(new Callback>() { // @Override @@ -793,7 +882,23 @@ public class RetrofitClient { } public void recharge(BaseObserver> observer) { - sApiServer.recharge().compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.recharge().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.recharge().enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void endPk(String pk_id, String type, String user_id, BaseObserver observer) { @@ -820,15 +925,63 @@ public class RetrofitClient { } public void switchAccounts(String loginId, BaseObserver> observer) { - sApiServer.switchAccounts(loginId).compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.switchAccounts(loginId).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.switchAccounts(loginId).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void searchPkRoom(String roomId, String page, String limit, BaseObserver> observer) { - sApiServer.searchPkRoom(roomId, page, limit).compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.searchPkRoom(roomId, page, limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.searchPkRoom(roomId, page, limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void userUpdate(String nickname, String birthday, String sex, String avatar, String init_code, String user_id, BaseObserver observer) { - sApiServer.userUpdate(nickname, birthday, sex, avatar, init_code, user_id).compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.userUpdate(nickname, birthday, sex, avatar, init_code, user_id).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.userUpdate(nickname, birthday, sex, avatar, init_code, user_id).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void authorization(BaseObserver observer) { @@ -860,9 +1013,9 @@ public class RetrofitClient { public void onResponse(Call>> call, Response>> response) { if (response.code() == 200) { BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1) { + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); - }else if (baseModel.getCode()==301){ + } else if (baseModel.getCode() == 301) { ToastUtils.showShort(baseModel.getMsg()); observer.onNext(null); } @@ -907,37 +1060,159 @@ public class RetrofitClient { } public void getUserFollowList(String page, String page_limit, BaseObserver> observer) { - sApiServer.getUserFollowList(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getUserFollowList(page, page_limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getUserFansList(String page, String page_limit, BaseObserver> observer) { - sApiServer.getUserFansList(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getUserFansList(page, page_limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getBlacklist(String page, String page_limit, BaseObserver> observer) { - sApiServer.getBlacklist(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getBlacklist(page, page_limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getLockMiniList(String page, String page_limit, BaseObserver> observer) { - sApiServer.getLockMiniList(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getLockMiniList(page, page_limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void realName(String real_name, String card_number, BaseObserver observer) { - sApiServer.realName(real_name, card_number).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.realName(real_name, card_number).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } //获取扩列数据 public void getExpandColumn(String type, String page, String page_limit, BaseObserver> observer) { - sApiServer.getExpandColumn(type, page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getExpandColumn(type, page, page_limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } //获取官方公告数据或者系统消息， public void getOfficialNotice(BaseObserver observer) { - sApiServer.getOfficialNotice().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getOfficialNotice().enqueue(new Callback>() { + + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void getAlbumList(String page, String page_limit, String userId, BaseObserver> observer) { - sApiServer.getAlbumList(page, page_limit, userId).compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.getAlbumList(page, page_limit, userId).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getAlbumList(page, page_limit, userId).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void sjRoomName(BaseObserver observer) { @@ -1029,30 +1304,121 @@ public class RetrofitClient { } public void getRoomCategories(BaseObserver> observer) { - sApiServer.getRoomCategories().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getRoomCategories().enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getRewardList(String id, int page, int page_limit, BaseObserver> observer) { - sApiServer.getRewardList(id, page + "", page_limit + "").compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.getRewardList(id, page + "", page_limit + "").compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getRewardList(id, page + "", page_limit + "").enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getGiftLabel(String have_hot, BaseObserver> observer) { - sApiServer.getGiftLabel(have_hot).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getGiftLabel(have_hot).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } - public void getGiftList(int type,String roomId, BaseObserver> observer) { - sApiServer.getGiftList(type,roomId).compose(new DefaultTransformer<>()).subscribe(observer); + public void getGiftList(int type, String roomId, BaseObserver> observer) { + sApiServer.getGiftList(type, roomId).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void topicList(String page, String page_limit, BaseObserver> observer) { - sApiServer.topicList(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.topicList(page, page_limit).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getCategories(BaseObserver> observer) {//动态顶部热门话题 - sApiServer.getCategories().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getCategories().enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getCircleList(String page, String page_limit, BaseObserver> observer) {//动态列表 @@ -1060,7 +1426,7 @@ public class RetrofitClient { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code() == 200){ + if (response.code() == 200) { BaseModel> listBaseModel = response.body(); if (listBaseModel != null) { observer.onNext(listBaseModel.getData()); @@ -1078,47 +1444,218 @@ public class RetrofitClient { } public void getCircleUserList(String user_id, String page, String page_limit, BaseObserver> observer) {//用户主页动态列表 - sApiServer.getCircleUserList(user_id, page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getCircleUserList(user_id, page, page_limit).enqueue(new Callback>>() { + + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel != null) { + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } else { + observer.onNext(null); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void topicId(String topic_id, BaseObserver> observer) {//动态列表 - sApiServer.topicId(topic_id).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.topicId(topic_id).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void zoneDetail(String topic_id, BaseObserver observer) {//动态列表 - sApiServer.zoneDetail(topic_id).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.zoneDetail(topic_id).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void getUserHome(String user_id, BaseObserver observer) { - sApiServer.getUserHome(user_id).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getUserHome(user_id).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void getCommentList(String id, String page, String page_limit, BaseObserver observer) { - sApiServer.getCommentList(id, page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getCommentList(id, page, page_limit).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void song(String roomId, String user_id, String song_code, String song_name, String singer, String poster, String duration, BaseObserver> observer) { - sApiServer.song(roomId, user_id, song_code, song_name, singer, poster, duration).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.song(roomId, user_id, song_code, song_name, singer, poster, duration).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getMyInfo(BaseObserver observer) {//点击我的获取数据 - sApiServer.getMyInfo().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getMyInfo().enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void getUserTagList(BaseObserver> observer) { - sApiServer.getUserTagList().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getUserTagList().enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getLikeList(String id, BaseObserver> observer) { - sApiServer.getLikeList(id).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getLikeList(id).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getAlbumDetail(String albumId, String pwd, String page, String page_limit, BaseObserver observer) { - sApiServer.getAlbumDetail(albumId, pwd, page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getAlbumDetail(albumId, pwd, page, page_limit).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void getSubsidy(String roomId, BaseObserver observer) { - sApiServer.getSubsidy(roomId).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getSubsidy(roomId).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void getSubsidyDetail(String roomId, BaseObserver observer) { @@ -1126,23 +1663,54 @@ public class RetrofitClient { } public void getPersonaltyList(BaseObserver> observer) { - sApiServer.getPersonaltyList().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getPersonaltyList().enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getDecorateList(String type, BaseObserver> observer) { - sApiServer.getDecorateList(type).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getDecorateList(type).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } - public void roomGetIn(String roomId, String password, BaseObserver observer) { + public void roomGetIn(String roomId, String + password, BaseObserver observer) { sApiServer.roomGetIn(roomId, password).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - if (response.code() == 200){ + if (response.code() == 200) { BaseModel roomInfoRespBaseModel = response.body(); - if (roomInfoRespBaseModel.getCode()==1){ + if (roomInfoRespBaseModel.getCode() == 1) { observer.onNext(roomInfoRespBaseModel.getData()); - }else { + } else { MessageListenerSingleton.getInstance().quitGroup(roomId); } } @@ -1156,11 +1724,42 @@ public class RetrofitClient { } public void updatePassword(String roomId, String password, BaseObserver observer) { - sApiServer.updatePassword(roomId, password).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.updatePassword(roomId, password).enqueue(new Callback>() { + + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel stringBaseModel = response.body(); + if (stringBaseModel.getCode() == 1) { + observer.onNext(stringBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void getMyFoot(String page, BaseObserver> observer) { - sApiServer.getMyFoot(page, "10").compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getMyFoot(page, "10").enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> listBaseModel = response.body(); + if (listBaseModel.getCode() == 1) { + observer.onNext(listBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void myCpRoom(BaseObserver> observer) { @@ -1208,27 +1807,105 @@ public class RetrofitClient { }); } - public void getRoomOnline(String roomId, String page, String page_limit, BaseObserver observer) { - sApiServer.getRoomOnline(roomId, page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); + public void getRoomOnline(String roomId, String page, String + page_limit, BaseObserver observer) { + sApiServer.getRoomOnline(roomId, page, page_limit).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel roomOnlineBaseModel = response.body(); + if (roomOnlineBaseModel.getCode() == 1) { + observer.onNext(roomOnlineBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void wallet(BaseObserver observer) { - sApiServer.wallet().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.wallet().enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel walletBeanBaseModel = response.body(); + if (walletBeanBaseModel.getCode() == 1) { + observer.onNext(walletBeanBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } - public void appPay(String user_id, String money, String coin, String type, BaseObserver observer) { - sApiServer.appPay(user_id, money, coin, type).compose(new DefaultTransformer<>()).subscribe(observer); + public void appPay(String user_id, String money, String coin, String + type, BaseObserver observer) { + sApiServer.appPay(user_id, money, coin, type).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel appPayBaseModel = response.body(); + if (appPayBaseModel.getCode() == 1) { + observer.onNext(appPayBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void bindType(String userId, BaseObserver observer) { - sApiServer.bindType(userId).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.bindType(userId).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel bindTypeBaseModel = response.body(); + if (bindTypeBaseModel.getCode() == 1) { + observer.onNext(bindTypeBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void getWalletConfig(BaseObserver observer) { - sApiServer.getWalletConfig().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getWalletConfig().enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel walletConfigBaseModel = response.body(); + if (walletConfigBaseModel.getCode() == 1) { + observer.onNext(walletConfigBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } - public void bind(String userId, String type, String alipayAccount, String bank_card_number, String bank_card, String open_bank, BaseObserver observer) { + public void bind(String userId, String type, String alipayAccount, String + bank_card_number, String bank_card, String open_bank, BaseObserver observer) { sApiServer.bind(userId, type, alipayAccount, bank_card_number, bank_card, open_bank).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1243,54 +1920,196 @@ public class RetrofitClient { } public void roomApplyListBean(String roomId, BaseObserver observer) { - sApiServer.roomApplyListBean(roomId).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.roomApplyListBean(roomId).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel roomApplyListBeanBaseModel = response.body(); + if (roomApplyListBeanBaseModel.getCode() == 1) { + observer.onNext(roomApplyListBeanBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } - public void getRoomUserInfo(String room_id, String user_id, BaseObserver observer) { - sApiServer.getRoomUserInfo(room_id, user_id).compose(new DefaultTransformer<>()).subscribe(observer); + public void getRoomUserInfo(String room_id, String + user_id, BaseObserver observer) { + sApiServer.getRoomUserInfo(room_id, user_id).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel userInfoBaseModel = response.body(); + if (userInfoBaseModel.getCode() == 1) { + observer.onNext(userInfoBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void songList(String room_id, BaseObserver> observer) { - sApiServer.songList(room_id).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.songList(room_id).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> musicSongBaseModel = response.body(); + if (musicSongBaseModel.getCode() == 1) { + observer.onNext(musicSongBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } // TODO: 2025/3/15 获取主持人列表 - public void getHostList(String roomId, String type, BaseObserver> observer) { - sApiServer.getHostList(roomId, type).compose(new DefaultTransformer<>()).subscribe(observer); + public void getHostList(String roomId, String + type, BaseObserver> observer) { + sApiServer.getHostList(roomId, type).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> hostBeanBaseModel = response.body(); + if (hostBeanBaseModel.getCode() == 1) { + observer.onNext(hostBeanBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } - public void getSearch(String keyWord, String type, BaseObserver> observer) { - sApiServer.getSearch(keyWord, type).compose(new DefaultTransformer<>()).subscribe(observer); + public void getSearch(String keyWord, String + type, BaseObserver> observer) { + sApiServer.getSearch(keyWord, type).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> roomSearchRespBaseModel = response.body(); + if (roomSearchRespBaseModel.getCode() == 1) { + observer.onNext(roomSearchRespBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void getBackgroundList(BaseObserver observer) { - sApiServer.getBackgroundList().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getBackgroundList().enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel roomBgBeanBaseModel = response.body(); + if (roomBgBeanBaseModel.getCode() == 1) { + observer.onNext(roomBgBeanBaseModel.getData()); + } + + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } - public void getCharmList(String roomId, String stime, String etime, String p, BaseObserver observer) { - sApiServer.getCharmList(roomId, stime, etime, p).compose(new DefaultTransformer<>()).subscribe(observer); + public void getCharmList(String roomId, String stime, String etime, String + p, BaseObserver observer) { + sApiServer.getCharmList(roomId, stime, etime, p).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel roomDetailsBaseModel = response.body(); + if (roomDetailsBaseModel.getCode() == 1) { + observer.onNext(roomDetailsBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } // TODO: 2025/6/28 房间竞拍开始 - public void roomAuction(String roomId, String userId, String giftId, String relation_id, String auction_type, String time_day, BaseObserver observer) { - sApiServer.roomAuction(roomId, userId, giftId, relation_id, auction_type, time_day).compose(new DefaultTransformer<>()).subscribe(observer); + public void roomAuction(String roomId, String userId, String giftId, String + relation_id, String auction_type, String time_day, BaseObserver observer) { + sApiServer.roomAuction(roomId, userId, giftId, relation_id, auction_type, time_day).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel auctionBeanBaseModel = response.body(); + if (auctionBeanBaseModel.getCode() == 1) { + observer.onNext(auctionBeanBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void roomAuctionTime(String gift_id, BaseObserver observer) { - sApiServer.roomAuctionTime(gift_id).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.roomAuctionTime(gift_id).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel roomTimeBaseModel = response.body(); + if (roomTimeBaseModel.getCode() == 1) { + observer.onNext(roomTimeBaseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } - public void roomAuctionJoin(String auctionId, String userId, String giftId, String num, String type, BaseObserver observer) { + public void roomAuctionJoin(String auctionId, String userId, String giftId, String + num, String type, BaseObserver observer) { sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - if (response.code() == 200){ + if (response.code() == 200) { BaseModel baseModel = response.body(); - if (baseModel.getCode()==1) { + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); - }else { + } else { ToastUtils.showShort(baseModel.getMsg()); } } @@ -1364,7 +2183,8 @@ public class RetrofitClient { } - public void editRoom(String room_id, String room_name, String room_cover, String room_intro, String room_background, BaseObserver observer) { + public void editRoom(String room_id, String room_name, String room_cover, String + room_intro, String room_background, BaseObserver observer) { sApiServer.editRoom(room_id, room_name, room_cover, room_intro, room_background).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1378,7 +2198,8 @@ public class RetrofitClient { }); } - public void setPresidedRatio(String room_id, String user_id, String ratio, BaseObserver observer) { + public void setPresidedRatio(String room_id, String user_id, String + ratio, BaseObserver observer) { sApiServer.setPresidedRatio(room_id, user_id, ratio).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1393,7 +2214,8 @@ public class RetrofitClient { } - public void postHostAdd(String roomId, String userId, String type, String is_add, BaseObserver observer) { + public void postHostAdd(String roomId, String userId, String type, String + is_add, BaseObserver observer) { sApiServer.getPresidedRatio(roomId, userId, type, is_add).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1407,7 +2229,8 @@ public class RetrofitClient { }); } - public void reward_zone(String id, String gift_id, String num, String is_pack, BaseObserver observer) { + public void reward_zone(String id, String gift_id, String num, String + is_pack, BaseObserver observer) { sApiServer.reward_zone(id, gift_id, num, is_pack).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1490,7 +2313,8 @@ public class RetrofitClient { }); } - public void setRoomApply(String room_id, String gift_id, String gift_price, BaseObserver observer) { + public void setRoomApply(String room_id, String gift_id, String + gift_price, BaseObserver observer) { sApiServer.setRoomApply(room_id, gift_id, gift_price).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1504,7 +2328,8 @@ public class RetrofitClient { }); } - public void giveGift(String user_id, String gid, String num, String to_uid, String gift_type, BaseObserver observer) { + public void giveGift(String user_id, String gid, String num, String to_uid, String + gift_type, BaseObserver observer) { sApiServer.giveGift(user_id, gid, num, to_uid, gift_type).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1518,8 +2343,9 @@ public class RetrofitClient { }); } - public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number,String heart_id, BaseObserver observer) { - sApiServer.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number,heart_id).enqueue(new Callback>() { + public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String + type, String pit_number, String heart_id, BaseObserver observer) { + sApiServer.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { onNextRetu(response, observer); @@ -1533,7 +2359,23 @@ public class RetrofitClient { } public void firstChargeGift(BaseObserver observer) { - sApiServer.firstChargeGift().compose(new DefaultTransformer<>()).subscribe(observer); +// sApiServer.firstChargeGift().compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.firstChargeGift().enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel data = response.body(); + if (data.getCode() == 1) { + observer.onNext(data.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); // .enqueue(new Callback() { // @Override // public void onResponse(Call call, Response response) { @@ -1623,7 +2465,8 @@ public class RetrofitClient { }); } - public void delay(String friend_id, String room_id, String delay_times, BaseObserver observer) { + public void delay(String friend_id, String room_id, String + delay_times, BaseObserver observer) { sApiServer.delay(friend_id, room_id, delay_times).enqueue(new Callback>() { @Override @@ -1643,7 +2486,8 @@ public class RetrofitClient { }); } - public void endFriend(String friend_id, String room_id, BaseObserver observer) { + public void endFriend(String friend_id, String + room_id, BaseObserver observer) { sApiServer.endFriend(friend_id, room_id).enqueue(new Callback>() { @Override @@ -1664,7 +2508,8 @@ public class RetrofitClient { }); } - public void createRelation(String room_id, String friend_id, String user1_id, String user2_id, String relation_id, BaseObserver observer) { + public void createRelation(String room_id, String friend_id, String user1_id, String + user2_id, String relation_id, BaseObserver observer) { sApiServer.createRelation(room_id, friend_id, user1_id, user2_id, relation_id).enqueue(new Callback>() { @Override @@ -1673,7 +2518,7 @@ public class RetrofitClient { BaseModel baseModel = response.body(); if (baseModel.getCode() != 1) { com.hjq.toast.ToastUtils.show(baseModel.getMsg()); - }else { + } else { observer.onNext(""); } } @@ -1686,7 +2531,8 @@ public class RetrofitClient { }); } - public void setMutePit(String roomId, String user_id, String isMute, BaseObserver observer) { + public void setMutePit(String roomId, String user_id, String + isMute, BaseObserver observer) { sApiServer.setMutePit(roomId, user_id, isMute).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1700,7 +2546,8 @@ public class RetrofitClient { }); } - public void setLockPit(String roomId, String pitNumber, String isLock, BaseObserver observer) { + public void setLockPit(String roomId, String pitNumber, String + isLock, BaseObserver observer) { sApiServer.setLockPit(roomId, pitNumber, isLock).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1788,11 +2635,11 @@ public class RetrofitClient { sApiServer.postRoomInfo(roomId).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - if (response.code() == 200){ + if (response.code() == 200) { BaseModel baseModel = response.body(); - if (baseModel.getCode() != 1){ + if (baseModel.getCode() != 1) { observer.onNext(null); - }else { + } else { observer.onNext(baseModel.getData()); } } @@ -1806,15 +2653,62 @@ public class RetrofitClient { } public void getCharmRank(String roomId, BaseObserver> observer) { - sApiServer.getCharmRank(roomId).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.getCharmRank(roomId).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } - public void roomRelationList(String type, BaseObserver> observer) { - sApiServer.roomRelationList(type).compose(new DefaultTransformer<>()).subscribe(observer); + public void roomRelationList(String + type, BaseObserver> observer) { + sApiServer.roomRelationList(type).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } - public void roomAuctionList(String auction_id, BaseObserver> observer) { - sApiServer.roomAuctionList(auction_id).compose(new DefaultTransformer<>()).subscribe(observer); + public void roomAuctionList(String + auction_id, BaseObserver> observer) { + sApiServer.roomAuctionList(auction_id).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + + } + }); } public void changeSong(String room_id, String now_did, BaseObserver observer) { @@ -1831,7 +2725,8 @@ public class RetrofitClient { }); } - public void hostUserPit(String room_id, String pit_number, String user_id, String type, BaseObserver observer) { + public void hostUserPit(String room_id, String pit_number, String user_id, String + type, BaseObserver observer) { sApiServer.hostUserPit(room_id, pit_number, user_id, type).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -1866,7 +2761,22 @@ public class RetrofitClient { } public void relationCard(String user_id, BaseObserver observer) { - sApiServer.relationCard(user_id).compose(new DefaultTransformer<>()).subscribe(observer); + sApiServer.relationCard(user_id).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200){ + BaseModel baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); } public void topRelationCard(String id, BaseObserver observer) { @@ -1912,7 +2822,8 @@ public class RetrofitClient { }); } - public void checkTxt(String room_name, String room_cover, String room_intro, BaseObserver observer) { + public void checkTxt(String room_name, String room_cover, String + room_intro, BaseObserver observer) { sApiServer.checkTxt(room_name, room_cover, room_intro).enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { @@ -1968,7 +2879,8 @@ public class RetrofitClient { }); } - public void publishZone(String images, String content, String topic_id, String room_id, String ip, BaseObserver observer) { + public void publishZone(String images, String content, String topic_id, String + room_id, String ip, BaseObserver observer) { sApiServer.publishZone(images, content, topic_id, room_id, ip).enqueue(new Callback>() { @Override @@ -2027,7 +2939,8 @@ public class RetrofitClient { }); } - public void commentZone(String id, String content, String pid, String reply_to, BaseObserver observer) { + public void commentZone(String id, String content, String pid, String + reply_to, BaseObserver observer) { sApiServer.commentZone(id, content, pid, reply_to).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2071,7 +2984,8 @@ public class RetrofitClient { }); } - public void getPostData(String new_password, String mobile, String code, String userId, BaseObserver observer) { + public void getPostData(String new_password, String mobile, String code, String + userId, BaseObserver observer) { sApiServer.getPostData(new_password, mobile, code, userId).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2094,7 +3008,8 @@ public class RetrofitClient { }); } - public void forgotPassword(String new_password, String mobile, String sms_code, BaseObserver observer) { + public void forgotPassword(String new_password, String mobile, String + sms_code, BaseObserver observer) { sApiServer.forgotPassword(new_password, mobile, sms_code).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2108,7 +3023,8 @@ public class RetrofitClient { }); } - public void createAlbum(String name, String pwd, String image, BaseObserver observer) { + public void createAlbum(String name, String pwd, String + image, BaseObserver observer) { sApiServer.createAlbum(name, pwd, image).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2122,7 +3038,8 @@ public class RetrofitClient { }); } - public void editAlbum(String album_id, String name, String pwd, String image, BaseObserver observer) { + public void editAlbum(String album_id, String name, String pwd, String + image, BaseObserver observer) { sApiServer.editAlbum(album_id, name, pwd, image).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2136,7 +3053,8 @@ public class RetrofitClient { }); } - public void editUserInfo(int type, String nickname, String birthday, String sex, String avatar, String images, String profile, String tag_id, BaseObserver observer) { + public void editUserInfo(int type, String nickname, String birthday, String sex, String + avatar, String images, String profile, String tag_id, BaseObserver observer) { if (type == 1) { sApiServer.editUserInfo(nickname, birthday, sex, avatar, images, profile, tag_id).enqueue(new Callback>() { @@ -2210,7 +3128,8 @@ public class RetrofitClient { }); } - public void userOnlineStatus(String user_id, String roomId, BaseObserver> observer) { + public void userOnlineStatus(String user_id, String + roomId, BaseObserver> observer) { sApiServer.userOnlineStatus(user_id, roomId).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { @@ -2259,7 +3178,8 @@ public class RetrofitClient { }); } - public void upAddAlbum(String album_id, String images, String content, BaseObserver observer) { + public void upAddAlbum(String album_id, String images, String + content, BaseObserver observer) { sApiServer.upAddAlbum(album_id, images, content).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2386,7 +3306,8 @@ public class RetrofitClient { }); } - public void onNextRetu(Response> response, BaseObserver observer) { + public void onNextRetu + (Response> response, BaseObserver observer) { if (response.code() == 200) { BaseModel string = response.body(); if (string != null) { @@ -2403,23 +3324,25 @@ public class RetrofitClient { throw new RuntimeException(e); } ToastUtils.showShort(string.getMsg()); - }else { + } else { ToastUtils.showShort(string.getMsg()); } } } } - ///获取活动礼物列表 - public void getBoxGiftList(String giftBagId, String roomId, BaseObserver observer){ + + /// 获取活动礼物列表 + public void getBoxGiftList(String giftBagId, String + roomId, BaseObserver observer) { sApiServer.getBoxGiftList(giftBagId, roomId).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { if (response.code() == 200) { BaseModel baseModel = response.body(); - if (baseModel.getCode()==1) { + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); - }else { + } else { observer.onNext(null); } } @@ -2431,8 +3354,9 @@ public class RetrofitClient { } }); } - ///巡乐会 - public void getBoxGiftListXLH( String roomId, BaseObserver observer){ + + /// 巡乐会 + public void getBoxGiftListXLH(String roomId, BaseObserver observer) { sApiServer.getBoxGiftListXLH(roomId).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2449,18 +3373,19 @@ public class RetrofitClient { }); } - ///巡乐会抽奖 - public void xlhChou(String roomId, String num,BaseObserver> observer){ - sApiServer.xlhChou(roomId,num).enqueue(new Callback>>() { + /// 巡乐会抽奖 + public void xlhChou(String roomId, String + num, BaseObserver> observer) { + sApiServer.xlhChou(roomId, num).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { if (response.code() == 200) { BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1) { + if (baseModel.getCode() == 1) { if (baseModel != null && baseModel.getData() != null) { observer.onNext(baseModel.getData()); } - }else { + } else { observer.onNext(null); ToastUtils.showShort(baseModel.getMsg()); } @@ -2476,16 +3401,17 @@ public class RetrofitClient { } - ///盲盒转盘抽奖 - public void drawGiftList(String giftBagId, String gift_user_ids, String roomId, String num,String heart_id,BaseObserver observer){ - sApiServer.drawGiftList(giftBagId, gift_user_ids, roomId, num,heart_id).enqueue(new Callback>() { + /// 盲盒转盘抽奖 + public void drawGiftList(String giftBagId, String gift_user_ids, String roomId, String + num, String heart_id, BaseObserver observer) { + sApiServer.drawGiftList(giftBagId, gift_user_ids, roomId, num, heart_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { if (response.code() == 200) { BaseModel baseModel = response.body(); - if (baseModel.getCode()==1) { + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); - }else { + } else { observer.onNext(null); ToastUtils.showShort(baseModel.getMsg()); } @@ -2499,13 +3425,14 @@ public class RetrofitClient { }); } - public void getMyRecord(String giftBagId,String page,String pageSize,BaseObserver> observer){ - sApiServer.getMyRecord(giftBagId,page,pageSize).enqueue(new Callback>>() { + public void getMyRecord(String giftBagId, String page, String + pageSize, BaseObserver> observer) { + sApiServer.getMyRecord(giftBagId, page, pageSize).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code()==200){ + if (response.code() == 200) { BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1){ + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); } } @@ -2518,13 +3445,14 @@ public class RetrofitClient { }); } - public void xlhAllRecord(String roomId,String page,String pageSize,BaseObserver> observer){ - sApiServer.xlhAllRecord(roomId,page,pageSize).enqueue(new Callback>>() { + public void xlhAllRecord(String roomId, String page, String + pageSize, BaseObserver> observer) { + sApiServer.xlhAllRecord(roomId, page, pageSize).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code()==200){ + if (response.code() == 200) { BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1){ + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); } } @@ -2537,13 +3465,14 @@ public class RetrofitClient { }); } - public void xlhMyRecord(String roomId,String page,String pageSize,BaseObserver> observer){ - sApiServer.xlhMyRecord(roomId,page,pageSize).enqueue(new Callback>>() { + public void xlhMyRecord(String roomId, String page, String + pageSize, BaseObserver> observer) { + sApiServer.xlhMyRecord(roomId, page, pageSize).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code()==200){ + if (response.code() == 200) { BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1){ + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); } } @@ -2556,13 +3485,14 @@ public class RetrofitClient { }); } - public void getAllRecord(String giftBagId,String page,String pageSize,BaseObserver> observer){ - sApiServer.getAllRecord(giftBagId,page,pageSize).enqueue(new Callback>>() { + public void getAllRecord(String giftBagId, String page, String + pageSize, BaseObserver> observer) { + sApiServer.getAllRecord(giftBagId, page, pageSize).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code()==200){ + if (response.code() == 200) { BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1){ + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); } } @@ -2575,7 +3505,7 @@ public class RetrofitClient { }); } - public void giftSend(String send_id,BaseObserver observer){ + public void giftSend(String send_id, BaseObserver observer) { sApiServer.giftSend(send_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2589,15 +3519,16 @@ public class RetrofitClient { }); } - public void roomUserCharmList(String room_id, String user_id, BaseObserver> observer){ - sApiServer.roomUserCharmList(room_id,user_id).enqueue(new Callback>>() { + public void roomUserCharmList(String room_id, String + user_id, BaseObserver> observer) { + sApiServer.roomUserCharmList(room_id, user_id).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code()==200){ + if (response.code() == 200) { BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1){ + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); - }else if (baseModel.getCode()==0){ + } else if (baseModel.getCode() == 0) { observer.onNext(null); } } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java index 81d9fde..eecb70e 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java @@ -2,6 +2,7 @@ package com.xscm.moduleutil.widget; import android.content.Context; import android.text.TextUtils; +import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; @@ -47,7 +48,22 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio private List giftArray = new ArrayList<>(); public ExecutorService queue = Executors.newSingleThreadExecutor(); private Context mContext; + private boolean isOnece; + // 添加带Context参数的构造函数 + // 添加带Context和AttributeSet参数的构造函数（解决XML inflate问题的关键） + public GiftAnimView(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + this.mContext = context; + init(); + } + + // 添加带Context、AttributeSet和 defStyleAttr 参数的构造函数（更完整的实现） + public GiftAnimView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + this.mContext = context; + init(); + } public void setQueue(ExecutorService queue) { this.queue = queue; } @@ -85,6 +101,9 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio post(() -> { if (playerMp4View!=null) { playerMp4View.setVisibility(View.GONE); + if (isOnece){ + return; + } // 通知播放完成 notifyPlaybackComplete(); loadStartSVGAPlayer(); @@ -187,6 +206,35 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio }); } + public void previewEffectWith(String playImage){ + this.isOnece=true; + if (playImage.endsWith("mp4")) { + downloadAndPlay(getContext(), playImage, new DownloadCallback() { + @Override + public void onSuccess(File file) { + post(() -> { + playerMp4View.setVisibility(View.VISIBLE); + svgaView.setVisibility(View.GONE); + playerMp4View.startPlay(file); + }); + } + + @Override + public void onFailure(Exception e) { + LogUtils.e("MP4下载或播放失败: " + e.getMessage()); + // 处理失败情况，继续播放下一个 + } + }); + } else if (playImage.endsWith("svga")) { +// File file = downloadAndPlay(getContext(), playImage); + post(() -> { + playerMp4View.setVisibility(View.GONE); + svgaView.setVisibility(View.VISIBLE); + svgaView.loadSVGAPlayerWith(playImage, false); + }); + } + } + public void openOrCloseEffectViewWith(boolean isShow) { this.isShow = isShow; removeSvgaQueueData(); @@ -420,6 +468,9 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio if (svgaView!=null) { svgaView.setVisibility(View.GONE); } + if (isOnece){ + return; + } // 通知播放完成 notifyPlaybackComplete(); loadStartSVGAPlayer(); diff --git a/moduleUtil/src/main/res/layout/dialog_room_auction_webview.xml b/moduleUtil/src/main/res/layout/dialog_room_auction_webview.xml new file mode 100644 index 0000000..1422b93 --- /dev/null +++ b/moduleUtil/src/main/res/layout/dialog_room_auction_webview.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java index a0d9bee..213bc9c 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java @@ -53,6 +53,7 @@ import com.xscm.moduleutil.bean.room.RoomBean; import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomPitBean; import com.xscm.moduleutil.dialog.ConfirmDialog; +import com.xscm.moduleutil.dialog.RoomAuctionWebViewDialog; import com.xscm.moduleutil.dialog.WebViewDialog; import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.ClickUtils; @@ -567,9 +568,18 @@ public class RoomAuctionFragment extends BaseMvpFragment { - dialog.dismiss(); - ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation(); -// startActivity(new Intent(SettingActivity.this, RealName1Activity.class)); + realNameDialog.setOnFirstChargeListener(new RealNameDialog.OnFirstChargeListener() { + @Override + public void onFirstChargeConfirmed(String giftBean, int type) { + realNameDialog.dismiss(); + ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation(); + } + + @Override + public void onFirstChargeCancelled() { + realNameDialog.dismiss(); + } }); +// realNameDialog.setOnDismissListener(dialog -> { +// dialog.dismiss(); +// ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation(); +// }); } } else if (view.getId() == R.id.ll_qhch) { new AlertDialog.Builder(this).setMessage("确认清理缓存？").setPositiveButton("确定", new DialogInterface.OnClickListener() { diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyAlbumFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyAlbumFragment.java index c9791ab..9870cd4 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyAlbumFragment.java +++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/MyAlbumFragment.java @@ -53,7 +53,7 @@ public class MyAlbumFragment extends BaseMvpFragment list = new ArrayList<>(); - if (userId.equals(SpUtil.getUserId()+"")){ + if (userId.equals(SpUtil.getUserId() + "")) { AlbumBean albumBean = new AlbumBean(); albumBean.setId("0"); list.add(albumBean); mAdapter.setNewData(list); } } + @SuppressLint({"MissingInflatedId", "LocalSuppress"}) private void showPasswordInputDialog(AlbumBean item) { // 创建弹出框视图 @@ -108,7 +108,7 @@ public class MyAlbumFragment extends BaseMvpFragment data) { - if (userId.equals(SpUtil.getUserId()+"")){ + if (data == null) { + data = new ArrayList<>(); + } + if (userId.equals(SpUtil.getUserId() + "")) { AlbumBean albumBean = new AlbumBean(); albumBean.setId("0"); - data.add(0,albumBean); + data.add(0, albumBean); } mAdapter.setNewData(data); } diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java index a4656b4..d638284 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java +++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java @@ -11,7 +11,7 @@ import java.util.List; public class ZhuangBanShangChengConactos { public interface View extends IView { - void getDecorateList(List zhuangBanShangChengBeans); + void getDecorateList(List zhuangBanShangChengBeans,int tabIndex); void setUserDecorate(); @@ -19,7 +19,7 @@ public class ZhuangBanShangChengConactos { } public interface ICreatedRoomPre extends IPresenter { - void getDecorateList(String type); + void getDecorateList(String type,int tabIndex); void setUserDecorate(String udid); diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java index c280bc7..dda7f7d 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java +++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java @@ -1,9 +1,11 @@ package com.example.modulevocal.fragment.zhuangb; +import static android.view.View.GONE; import static com.xscm.moduleutil.utils.ImageLoader.loadImage; import android.os.Bundle; import android.view.View; +import android.view.ViewGroup; import android.widget.Toast; import androidx.recyclerview.widget.GridLayoutManager; @@ -21,7 +23,9 @@ import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.widget.AvatarFrameView; import com.tencent.qgame.animplayer.AnimView; +import com.xscm.moduleutil.widget.GiftAnimView; +import java.util.ArrayList; import java.util.List; public class ZhuangBanShangChengFragment extends BaseMvpFragment implements ZhuangBanShangChengConactos.View { @@ -33,8 +37,11 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment { List list = (List) adapter1.getData(); + // 清除之前的选择状态 + clearPreviousSelection(list); +// // 设置当前选择 +// ZhuangBanShangChengBean selectedBean = list.get(position); +// selectedBean.setIs_select(true); +// pSelect = position; +// did = selectedBean.getUdid(); +// +// // 更新UI显示 +// if (position == 0) { // "无"选项 +// mBinding.ll.setVisibility(View.GONE); +// clearDecorations(); +// } else { +// mBinding.ll.setVisibility(View.VISIBLE); +// +// if ("svga".equalsIgnoreCase(getFileExtension(selectedBean.getPlay_image()))) { +// imageBg.stopAll(); +// imageBg.setSource(selectedBean.getPlay_image(), 2); +// } else if ("mp4".equalsIgnoreCase(getFileExtension(selectedBean.getPlay_image()))) { +// imageBg.stopAll(); +// imageBg.setSource(selectedBean.getPlay_image(), 2); +// } +// } if (pSelect != -1 && pSelect != position) { list.get(pSelect).setIs_select(false); @@ -100,38 +158,60 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment list) { + if (pSelect != -1 && pSelect < list.size()) { + list.get(pSelect).setIs_select(false); + } + pSelect = -1; + } + + /** + * 清除装饰效果 + */ + private void clearDecorations() { + if (imageBg != null) { + imageBg.stopAll(); + } + if (item_animview != null) { + item_animview.stopPlay(); + } + } + private String getFileExtension(String url) { if (url == null || url.isEmpty()) return ""; int dotIndex = url.lastIndexOf("."); @@ -154,9 +257,9 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment { - if (did == null || did.isEmpty()){ - MvpPre.cancelUserDecorate(type+""); - }else { + if (did == null || did.isEmpty()) { + MvpPre.cancelUserDecorate(type + ""); + } else { MvpPre.setUserDecorate(did); } }); @@ -170,15 +273,20 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment zhuangBanShangChengBeans) { - if (adapter==null){ + public void getDecorateList(List zhuangBanShangChengBeans, int tabIndex) { + if (adapter == null) { adapter = new ZhuangBanShangChengAdapter(); } + if (zhuangBanShangChengBeans==null){ + zhuangBanShangChengBeans=new ArrayList<>(); + } ZhuangBanShangChengBean zhuangBanShangChengBean = new ZhuangBanShangChengBean(); zhuangBanShangChengBean.setTitle("无"); zhuangBanShangChengBean.setBase_image(""); - zhuangBanShangChengBeans.add(0,zhuangBanShangChengBean); + zhuangBanShangChengBeans.add(0, zhuangBanShangChengBean); adapter.setNewData(zhuangBanShangChengBeans); + + this.tabIndex = tabIndex; } @Override diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java index 150ca97..e950f2e 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java +++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java @@ -20,7 +20,7 @@ public class ZhuangBanShangChengPresenter extends BasePresenter>() { @Override public void onSubscribe(Disposable d) { @@ -32,7 +32,7 @@ public class ZhuangBanShangChengPresenter extends BasePresenter(mView); } - MvpRef.get().getDecorateList(zhuangBanShangChengBeans); + MvpRef.get().getDecorateList(zhuangBanShangChengBeans, tabIndex); } }); } diff --git a/modulevocal/src/main/res/layout/activity_created_room.xml b/modulevocal/src/main/res/layout/activity_created_room.xml index f71a9e9..3a85670 100644 --- a/modulevocal/src/main/res/layout/activity_created_room.xml +++ b/modulevocal/src/main/res/layout/activity_created_room.xml @@ -93,7 +93,7 @@ android:layout_weight="1" android:background="@drawable/bg_r100_hui" android:gravity="center|left" - android:hint="请输入昵称" + android:hint="请输入房间名称" android:maxLength="10" android:paddingStart="10dp" android:paddingEnd="@dimen/dp_10" diff --git a/modulevocal/src/main/res/layout/activity_personality.xml b/modulevocal/src/main/res/layout/activity_personality.xml index 49b49d2..de76037 100644 --- a/modulevocal/src/main/res/layout/activity_personality.xml +++ b/modulevocal/src/main/res/layout/activity_personality.xml @@ -9,6 +9,7 @@ @@ -85,7 +86,8 @@ + android:layout_height="match_parent" + android:visibility="gone"/> @@ -118,6 +120,11 @@ android:layout_marginTop="@dimen/dp_30" app:layout_constraintTop_toBottomOf="@+id/cl_2" /> + + +