From 2e1eb3c7b4180f2e7fa046c217da695de0ed9277 Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Tue, 10 Sep 2024 09:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=85=8D=E7=BD=AE=E8=A7=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yunbao/common/http/API.java | 2 +- .../com/yunbao/common/http/HttpClient.java | 2 +- .../common/http/JavaConverterFactory.java | 97 +++++ .../java/com/yunbao/common/http/JsonBean.java | 52 ++- .../com/yunbao/common/http/PDLiveApi.java | 346 +++++++++--------- .../com/yunbao/common/utils/AesUtils.java | 29 +- config.gradle | 2 +- .../main/activity/RegisterActivity.java | 4 +- .../com/yunbao/main/http/MainHttpUtil.java | 2 +- .../yunbao/main/views/MainHomeViewHolder.java | 2 +- .../video/upload/VideoUploadFtpImpl.java | 2 +- 11 files changed, 352 insertions(+), 188 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java diff --git a/common/src/main/java/com/yunbao/common/http/API.java b/common/src/main/java/com/yunbao/common/http/API.java index 89c03afcb..48b662f75 100644 --- a/common/src/main/java/com/yunbao/common/http/API.java +++ b/common/src/main/java/com/yunbao/common/http/API.java @@ -80,7 +80,7 @@ public class API extends BaseApi { .addInterceptor(initQuery(isNeedUid, isNeedToken, CommonAppContext.sInstance.getApplicationContext())) .addInterceptor(loggingInterceptor); return create(builder.build(), - GsonConverterFactory.create(gson), RxJava2CallAdapterFactory.create(), CommonAppConfig.HOST, PDLiveApi.class); + JavaConverterFactory.create(gson), RxJava2CallAdapterFactory.create(), CommonAppConfig.HOST, PDLiveApi.class); } //公共参数 diff --git a/common/src/main/java/com/yunbao/common/http/HttpClient.java b/common/src/main/java/com/yunbao/common/http/HttpClient.java index 0378dc175..853ee5ac8 100644 --- a/common/src/main/java/com/yunbao/common/http/HttpClient.java +++ b/common/src/main/java/com/yunbao/common/http/HttpClient.java @@ -34,7 +34,7 @@ public class HttpClient { private String mUrl; private HttpClient() { - mUrl = CommonAppConfig.HOST + "/api/public/?service="; + mUrl = CommonAppConfig.HOST + "/"; } public static HttpClient getInstance() { diff --git a/common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java b/common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java new file mode 100644 index 000000000..070c97d24 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/http/JavaConverterFactory.java @@ -0,0 +1,97 @@ +package com.yunbao.common.http; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; +import com.google.gson.TypeAdapter; +import com.google.gson.reflect.TypeToken; +import com.yunbao.common.utils.AesUtils; +import com.yunbao.common.utils.L; + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Base64; + +import okhttp3.RequestBody; +import okhttp3.ResponseBody; +import retrofit2.Converter; +import retrofit2.Retrofit; + +public final class JavaConverterFactory extends Converter.Factory { + /** + * Create an instance using a default {@link Gson} instance for conversion. Encoding to JSON and + * decoding from JSON (when no charset is specified by a header) will use UTF-8. + */ + public static JavaConverterFactory create() { + return create(new Gson()); + } + + /** + * Create an instance using {@code gson} for conversion. Encoding to JSON and + * decoding from JSON (when no charset is specified by a header) will use UTF-8. + */ + public static JavaConverterFactory create(Gson gson) { + return new JavaConverterFactory(gson); + } + + private final Gson gson; + + private JavaConverterFactory(Gson gson) { + if (gson == null) throw new NullPointerException("gson == null"); + this.gson = gson; + } + + @Override + public Converter responseBodyConverter(Type type, Annotation[] annotations, + Retrofit retrofit) { + TypeAdapter adapter = gson.getAdapter(TypeToken.get(type)); + return new JsonResponseBodyConverter<>(gson, adapter); + } + + + @Override + public Converter requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) { + return super.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit); + } + + final class JsonResponseBodyConverter implements Converter { + private final Gson gson; + private final TypeAdapter adapter; + JsonResponseBodyConverter(Gson gson, TypeAdapter adapter) { + this.gson = gson; + this.adapter = adapter; + } + + @Override + public T convert(ResponseBody value) throws IOException { + String response = value.string(); + String allResponseData; + L.e("解密前：:"+response); + JSONObject jsonObject = JSONObject.parseObject(response); + if(jsonObject!=null){ + allResponseData = jsonObject.getString("data"); + if(allResponseData!=null){ + byte[] decodedData = null; + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { + decodedData = Base64.getDecoder().decode(allResponseData); + } + response = AesUtils.decryptToString(decodedData); + } + } + jsonObject.put("data",JSONObject.parseObject(response)); + + response = JSON.toJSONString(jsonObject); + L.e("解密后：:"+ response); + //获取加密数据，解密，之后再让adapter去处理json串，解析具体的数据就可以了 + try{ + return adapter.fromJson(response); + } catch (Exception e) { + e.printStackTrace(); + } finally { + value.close(); + } + return null; + } + } +} \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/http/JsonBean.java b/common/src/main/java/com/yunbao/common/http/JsonBean.java index 392fe4e60..f84357593 100644 --- a/common/src/main/java/com/yunbao/common/http/JsonBean.java +++ b/common/src/main/java/com/yunbao/common/http/JsonBean.java @@ -1,5 +1,18 @@ package com.yunbao.common.http; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONException; +import com.alibaba.fastjson.JSONObject; +import com.blankj.utilcode.util.GsonUtils; +import com.google.gson.Gson; +import com.yunbao.common.bean.AdBean; +import com.yunbao.common.utils.AesUtils; +import com.yunbao.common.utils.L; + +import java.util.Base64; +import java.util.List; + /** * Created by cxf on 2017/8/5. */ @@ -7,7 +20,7 @@ package com.yunbao.common.http; public class JsonBean { private int ret; private String msg; - private Data data; + private String data; public int getRet() { return ret; @@ -26,10 +39,43 @@ public class JsonBean { } public Data getData() { - return data; + if(data.indexOf(":")>0){ + return GsonUtils.fromJson(data,Data.class); + }else{ + Data resultData = new Data(); + byte[] decodedData = null; + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { + decodedData = Base64.getDecoder().decode(data); + } + String decryptedText = AesUtils.decryptToString(decodedData); + JSONObject object = JSON.parseObject(decryptedText); + try { + JSONArray jsonArray = object.getJSONArray("info"); + String [] array = new String[jsonArray.size()]; + for (int i = 0; i > loginByManager( @Field("user_login") String userName, @Field("user_pass") String passWord, @@ -137,7 +137,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=huoquguizulabashuliang") + @GET("/huoquguizulabashuliang") Observable> getNobleTrumpetNum(); /** @@ -147,7 +147,7 @@ public interface PDLiveApi { * @param anchorid 主播id * @return */ - @GET("/api/public/?service=guizushiyonglaba") + @GET("/guizushiyonglaba") Observable>> nobleUseTrumpet( @Query("trumpet_msg") String trumpetMsg, @Query("anchor_id") String anchorid); @@ -155,7 +155,7 @@ public interface PDLiveApi { /** * FB是否替换新key */ - @GET("/api/public/?service=huoqufacebooksdkzhuangtai") + @GET("/huoqufacebooksdkzhuangtai") Observable> faceBookUp(); /** @@ -167,7 +167,7 @@ public interface PDLiveApi { * @param p 頁碼 * @return */ - @GET("/api/public/?service=shouyesousuohuiyuanv2") + @GET("/shouyesousuohuiyuanv2") Observable>>> search( @Query("jian_key") String jianKey, @Query("fan_key") String fanKey, @@ -183,7 +183,7 @@ public interface PDLiveApi { * @param p 頁碼 * @return */ - @GET("/api/public/?service=shouyesousuohuiyuanv2") + @GET("/shouyesousuohuiyuanv2") Observable>> searchNew( @Query("jian_key") String jianKey, @Query("fan_key") String fanKey, @@ -196,12 +196,12 @@ public interface PDLiveApi { * @param num 请求数量 * @return */ - @GET("/api/public/?service=zhubotuijian") + @GET("/zhubotuijian") Observable> anchorRecommend( @Query("num") String num ); - @GET("/api/public/?service=zhubotuijian") + @GET("/zhubotuijian") Observable> anchorRecommend( @QueryMap Map map ); @@ -212,7 +212,7 @@ public interface PDLiveApi { * @param num 请求数量 * @return */ - @GET("/api/public/?service=zhubotuijian") + @GET("/zhubotuijian") Observable> anchorRecommend( @Query("num") String num, @Query("type") String type ); @@ -222,7 +222,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=huoquzhiboxinxi") + @GET("/huoquzhiboxinxi") Observable>> getLiveInfo( @Query("liveuid") String liveui ); @@ -233,7 +233,7 @@ public interface PDLiveApi { * @param liveuid * @return */ - @GET("/api/public/?service=shezhiguanzhu") + @GET("/shezhiguanzhu") Observable>> setAttents( @Query("touid") String liveuid ); @@ -241,7 +241,7 @@ public interface PDLiveApi { /** * 获取首页位 */ - @GET("/api/public/?service=huoquremenzhubo") + @GET("/huoquremenzhubo") Observable>> getHot( @Query("p") int page ); @@ -249,13 +249,13 @@ public interface PDLiveApi { /** * 获取活动 */ - @GET("/api/public/?service=huoquhuodongliebiao") + @GET("/huoquhuodongliebiao") Observable>> getActiveList(); /** * 获取多人连麦列表 */ - @GET("/api/public/?service=huoqulianmaizhuangtai") + @GET("/huoqulianmaizhuangtai") Observable>> getDrLm(@Query("uid") String uid); /** @@ -264,7 +264,7 @@ public interface PDLiveApi { * @param uid 直播间id，并非用户uid * @return 榜单结构 */ - @GET("/api/public/?service=xiaofeitongji") + @GET("/xiaofeitongji") Observable> getRanksList(@Query("uid") String uid); /** @@ -272,25 +272,25 @@ public interface PDLiveApi { * * @return 新人特惠数据 */ - @GET("/api/public/?service=zhiboxinrentehuiv2") + @GET("/zhiboxinrentehuiv2") Observable> getNewPeopleInfo(); /** * 获取推送关注的开关和关注列表 */ - @GET("/api/public/?service=lixianxiaoxixiangqing") + @GET("/lixianxiaoxixiangqing") Observable> getMsgSwitchDetail(); /** * 推送关注的开关设置 */ - @GET("/api/public/?service=shezhilixianxiaoxizhuangtai") + @GET("/shezhilixianxiaoxizhuangtai") Observable> setMsgMasterSwitch(@Query("status") String status, @Query("type") String type); /** * 开播推送设置开关 */ - @GET("/api/public/?service=shezhikaiboxiaoxizhuangtai") + @GET("/shezhikaiboxiaoxizhuangtai") Observable>> setBeginShowMsgSwitch(@Query("status") String status, @Query("isAll") String isAll, @Query("liveuid") String liveuid); /** @@ -298,25 +298,25 @@ public interface PDLiveApi { * * @param liveuid 直播间id */ - @GET("/api/public/?service=xiaoshibangpaiming") + @GET("/xiaoshibangpaiming") Observable>> getHourChartRank(@Query("liveuid") String liveuid); /** * 清除系统消息的未读数 */ - @GET("/api/public/?service=shezhixiaoxiyiduzhuangtai") + @GET("/shezhixiaoxiyiduzhuangtai") Observable>> setMessageReadAll(); /** * 获取当前用户指导员ID */ - @GET("/api/public/?service=huoquyonghuzhidaoyuan") + @GET("/huoquyonghuzhidaoyuan") Observable>> getUserInstructor(); /** * 获取隐藏榜单的用户id */ - @GET("/api/public/?service=huoquguizubangdanyinshenliebiao") + @GET("/huoquguizubangdanyinshenliebiao") Observable> getNobleRankHideUserList(); /** @@ -325,43 +325,43 @@ public interface PDLiveApi { * @param liveUid * @return */ - @GET("/api/public/?service=huoquxingjitiaozhanzhuangtai") + @GET("/huoquxingjitiaozhanzhuangtai") Observable> getStarChallengeStatus(@Query("liveUid") String liveUid); /** * 【新人特惠】【趣味游戏】【幸运天使】 */ - @GET("/api/public/?service=huoquhuodongxunfutupian") + @GET("/huoquhuodongxunfutupian") Observable>> getLiveRoomActivityBanner(); /** * 新侧边栏请求 */ - @GET("/api/public/?service=huoqucebianlanxinxi") + @GET("/huoqucebianlanxinxi") Observable>> getCustomSidebarInfo(@Query("type") String type); /** * 任务领取接口 */ - @GET("/api/public/?service=wanchengrenwulingqujiangli") + @GET("/wanchengrenwulingqujiangli") Observable>> sendTaskGift(@Query("flag") String flag, @Query("type") String type); /** * PK排位赛接口 */ - @GET("/api/public/?service=huoquzhuboduanweixinxi") + @GET("/huoquzhuboduanweixinxi") Observable> getPkRanksList(@Query("anchor_id") String anchorId, @Query("anchor_id2") String pkUid); /** * 多人连麦-创建房间 */ - @GET("/api/public/?service=kaiqiduorenlianmai") + @GET("/kaiqiduorenlianmai") Observable> createDrLm(); /** * 多人连麦-关闭房间 */ - @GET("/api/public/?service=jieshuduorenlianmai") + @GET("/jieshuduorenlianmai") Observable> delDrLm(); /** @@ -370,7 +370,7 @@ public interface PDLiveApi { * @param uid 对方uid * @param roomId 当前房间号 */ - @GET("/api/public/?service=shanchuduorenlianmai") + @GET("/shanchuduorenlianmai") Observable> killDrLm(@Query("uid") String uid, @Query("roomid") String roomId); /** @@ -382,7 +382,7 @@ public interface PDLiveApi { * @param city * @return */ - @GET("/api/public/?service=jinruzhibojianv2") + @GET("/jinruzhibojianv2") Observable> enterRoomNew( @Query("GroupId") String groupId, @Query("stream") String stream, @@ -395,7 +395,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=jianchazhibo") + @GET("/jianchazhibo") Observable>> checkLive( @Query("liveuid") String liveUid, @Query("stream") String stream @@ -404,7 +404,7 @@ public interface PDLiveApi { /** * 加入房间推送Im欢迎语 */ - @GET("/api/public/?service=xinbanyonghujiarufangjian") + @GET("/xinbanyonghujiarufangjian") Observable> userJoinRoomNew( @Query("GroupId") String GroupId, @Query("stream") String stream @@ -413,7 +413,7 @@ public interface PDLiveApi { /** * 加入房间推送Im欢迎语 */ - @GET("/api/public/?service=xinbanlikaizhibojian") + @GET("/xinbanlikaizhibojian") Observable>> leaveRoomNew( @Query("GroupId") String GroupId, @Query("stream") String stream @@ -424,7 +424,7 @@ public interface PDLiveApi { * * @return 1=开，0=关 */ - @GET("/api/public/?service=huoqusuijipkzhuangtai") + @GET("/huoqusuijipkzhuangtai") Observable>> getRandomPkSwitch(); /** @@ -432,31 +432,31 @@ public interface PDLiveApi { * * @param pk 1=开，0=关 */ - @GET("/api/public/?service=shezhisuijipkzhuangtai") + @GET("/shezhisuijipkzhuangtai") Observable>> changeRandomPkSwitch(@Query("random_pk") int pk); /** * 获取自由PK次数 */ - @GET("/api/public/?service=chaxunshoudongpkcishu") + @GET("/chaxunshoudongpkcishu") Observable> getFreePkNumber(); /** * 发起随机PK */ - @GET("/api/public/?service=faqisuijipk") + @GET("/faqisuijipk") Observable> randomPK(); /** * 随机PK后调用接口给后台记录 */ - @GET("/api/public/?service=kaishisuijipk") + @GET("/kaishisuijipk") Observable> startRandomPK(@Query("pkuid") String pkuid); /** * 自由PK开始后调用接口扣掉次数 */ - @GET("/api/public/?service=shezhishoudongpkcishu") + @GET("/shezhishoudongpkcishu") Observable>> setFreePkNum(); /** @@ -465,25 +465,25 @@ public interface PDLiveApi { * @param cs 简体关键字/uid * @param ct 繁体关键字/uid */ - @GET("/api/public/?service=zhushousousuo") + @GET("/zhushousousuo") Observable>> randomPkSearchUser(@Query("jian_key") String cs, @Query("fan_key") String ct); /** * 拒绝随机PK */ - @GET("/api/public/?service=shejujuepkzhuangtai") + @GET("/shejujuepkzhuangtai") Observable> setBanRandomPK(); /** * 拒绝随机PK */ - @GET("/api/public/?service=huoqupaiweisaipeizhixinxi") + @GET("/huoqupaiweisaipeizhixinxi") Observable> getRankingInfo(); /** * 获取转盘整蛊列表 */ - @GET("/api/public/?service=huoquzhubozhenggudan") + @GET("/huoquzhubozhenggudan") Observable> getAnchorPrankTurntable( @Query("anchor_id") String anchor_id ); @@ -491,7 +491,7 @@ public interface PDLiveApi { /** * 提交整蛊 */ - @GET("/api/public/?service=shezhizhubozhenggudan") + @GET("/shezhizhubozhenggudan") Observable>> setAnchorPrankTurntable( @Query("anchor_id") String anchor_id, @Query("coin") String coin, @@ -507,7 +507,7 @@ public interface PDLiveApi { /** * 转盘整蛊结束后调用的接口 */ - @GET("/api/public/?service=zhenggudaojishijieshu") + @GET("/zhenggudaojishijieshu") Observable>> endPrankTurntable( @Query("anchor_id") String anchor_id ); @@ -516,7 +516,7 @@ public interface PDLiveApi { /** * 获取整蛊列表 */ - @GET("/api/public/?service=zhenggudanliebiao") + @GET("/zhenggudanliebiao") Observable>prankList( @Query("anchor_id") String anchor_id, @Query("prank_type") String prank_type @@ -525,13 +525,13 @@ public interface PDLiveApi { /** * 获取整蛊进度列表 */ - @GET("/api/public/?service=zhenggulibiao") + @GET("/zhenggulibiao") Observable> getPrankProgressList(@Query("anchor_id") String anchor_id); /** * 设置礼物整蛊 */ - @GET("/api/public/?service=shezhizhengguliwu") + @GET("/shezhizhengguliwu") Observable>> setPrank( @Query("anchor_id") String anchor_id, @Query("status") String status, @@ -544,7 +544,7 @@ public interface PDLiveApi { /** * 删除礼物整蛊 */ - @GET("/api/public/?service=shanchuzhenggudanv2") + @GET("/shanchuzhenggudanv2") Observable>> deletePrank( @Query("anchor_id") String anchor_id, @Query("prank_index") String prank_index @@ -553,7 +553,7 @@ public interface PDLiveApi { /** * 设置机器人开关 */ - @GET("/api/public/?service=xiugaizhushoujiqirenxinxi") + @GET("/xiugaizhushoujiqirenxinxi") Observable> setAnchorAiState( @Query("ai_state") String ai_state ); @@ -561,14 +561,14 @@ public interface PDLiveApi { /** * 获取机器人信息 */ - @GET("/api/public/?service=huoquzhushoujiqirenxinxi") + @GET("/huoquzhushoujiqirenxinxi") Observable> getAnchorAiState( ); /** * 修改机器人信息 */ - @GET("/api/public/?service=xiugaizhushoujiqirenxinxi") + @GET("/xiugaizhushoujiqirenxinxi") Observable> setAnchorAiState( @QueryMap Map map ); @@ -578,7 +578,7 @@ public interface PDLiveApi { * * @param type 1(自定义打招呼) 3(自定义求关注) */ - @GET("/api/public/?service=huoqujiqirenhuashu") + @GET("/huoqujiqirenhuashu") Observable>> getAiAutomaticSpeech( @Query("type") String type ); @@ -586,7 +586,7 @@ public interface PDLiveApi { /** * 机器人添加话术 */ - @GET("/api/public/?service=tianjiajiqirenhuashu") + @GET("/tianjiajiqirenhuashu") Observable>> addAiAutomaticSpeech( @Query("type") String type, @Query("content") String content @@ -595,7 +595,7 @@ public interface PDLiveApi { /** * 机器人删除话术 */ - @GET("/api/public/?service=shanchujiqirenhuashu") + @GET("/shanchujiqirenhuashu") Observable>> delAiAutomaticSpeech( @Query("type") String type, @Query("id") String id @@ -604,7 +604,7 @@ public interface PDLiveApi { /** * 机器人修改话术 */ - @GET("/api/public/?service=xiugaijiqirenhuashu") + @GET("/xiugaijiqirenhuashu") Observable>> updateAiAutomaticSpeech( @Query("type") String type, @Query("id") String id, @@ -614,17 +614,17 @@ public interface PDLiveApi { /** * 开播获取机器人状态和心愿单状态 */ - @GET("/api/public/?service=huoquzhibojiqirenzhuangtai") + @GET("/huoquzhibojiqirenzhuangtai") Observable> getLiveStetUpStatus( @Query("liveuid") String liveUid ); - @GET("/api/public/?service=jieshuduorenpk") + @GET("/jieshuduorenpk") Observable> jieshuDRPK( @Query("roomid") String roomId, @Query("uid") String uid); - @GET("/api/public/?service=huoquxitongxiaoxixiangqing") + @GET("/huoquxitongxiaoxixiangqing") Observable>> getListInfo( @Query("type") String type, @Query("p") int p); @@ -632,7 +632,7 @@ public interface PDLiveApi { /** * 获取主播任务列表 */ - @GET("/api/public/?service=huoquzhiborenwuzhuangtai") + @GET("/huoquzhiborenwuzhuangtai") Observable> getLiveTaskList( @Query("type") int type, @Query("liveuid") String liveUid @@ -641,7 +641,7 @@ public interface PDLiveApi { /** * 获取直播数据 */ - @GET("/api/public/?service=huoquzhibotongjishuj") + @GET("/huoquzhibotongjishuj") Observable> getLiveDataInfo( @Query("liveuid") String liveUid ); @@ -649,7 +649,7 @@ public interface PDLiveApi { /** * 获取直播数据 */ - @GET("/api/public/?service=huoquzhubaoxiaoxi") + @GET("/huoquzhubaoxiaoxi") Observable>> getAnchorMsg( @Query("liveuid") String liveUid, @Query("page") int page, @Query("limit") int limit ); @@ -657,7 +657,7 @@ public interface PDLiveApi { /** * 获取女神说数据 */ - @GET("/api/public/?service=huoquzhiboyugaoxinxi") + @GET("/huoquzhiboyugaoxinxi") Observable> getLivePreviewInfo( @Query("liveuid") String liveUid ); @@ -669,7 +669,7 @@ public interface PDLiveApi { * @param content 内容 * @param styleImage 女神说底图地址 */ - @GET("/api/public/?service=shezhizhiboyugao") + @GET("/shezhizhiboyugao") Observable> setLivePreviewInfo( @Query("liveuid") String liveUid, @Query("isShow") int isShow, @@ -680,7 +680,7 @@ public interface PDLiveApi { /** * 设置主播联系方式 */ - @GET("/api/public/?service=shezhizhubolianxifangshi") + @GET("/shezhizhubolianxifangshi") Observable> setAnchorContact( @Query("liveuid") String liveUid, @Query("isShow") int show, @@ -694,7 +694,7 @@ public interface PDLiveApi { /** * 获取主播联系方式 */ - @GET("/api/public/?service=huoqulianxifangshi") + @GET("/huoqulianxifangshi") Observable> getContactInfo( @Query("liveuid") String liveUid ); @@ -702,7 +702,7 @@ public interface PDLiveApi { /** * 获取收件箱信息 */ - @GET("/api/public/?service=huoqulianxifangshixiaoxi") + @GET("/huoqulianxifangshixiaoxi") Observable>> getContactMsg( @Query("p") int page ); @@ -710,7 +710,7 @@ public interface PDLiveApi { /** * 删除联系方式信件 */ - @GET("/api/public/?service=shanchulianxifangshixiaoxi") + @GET("/shanchulianxifangshixiaoxi") Observable> delContactMsg( @Query("msgId") int msgId ); @@ -720,7 +720,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=huoquxinyuandanv2") + @GET("/huoquxinyuandanv2") Observable>> getWishlistV2(@Query("type") int type); /** @@ -729,7 +729,7 @@ public interface PDLiveApi { * @param type 1日心愿单，2周，3月，4季度 * @return */ - @GET("/api/public/?service=huoquxinyuandanpeizhi") + @GET("/huoquxinyuandanpeizhi") Observable> getWishListGiftConf( @Query("type") int type ); @@ -741,7 +741,7 @@ public interface PDLiveApi { * @param list 列表json数据 * @return */ - @GET("/api/public/?service=shezhixinyuandanv2") + @GET("/shezhixinyuandanv2") Observable>> setWishlistV2( @Query("type") int type, @Query("list") String list @@ -750,7 +750,7 @@ public interface PDLiveApi { /** * 获取折扣卷信息 */ - @GET("/api/public/?service=huoquyonghuyouhuijuan") + @GET("/huoquyonghuyouhuijuan") Observable>> getDiscountInfo( @Query("type") int type ); @@ -758,25 +758,25 @@ public interface PDLiveApi { /** * 获取地区 */ - @GET("/api/public/?service=huoquyonghudiqu") + @GET("/huoquyonghudiqu") Observable> getUserArea(); /** * 注销账号 */ - @GET("/api/public/?service=yonghuzhuxiaozhanghao") + @GET("/yonghuzhuxiaozhanghao") Observable>> setLogOff(); /** * 领取完善资料奖励 */ - @GET("/api/public/?service=yonghulingqujiangli") + @GET("/yonghulingqujiangli") Observable>> userInfoTask(); /** * 创建投票 */ - @GET("/api/public/?service=chuangjianzhubotoupiao") + @GET("/chuangjianzhubotoupiao") Observable> createLiveVote(@Query("liveuid") String liveUid, @Query("question_content") String content, @Query("option_content_first") String first, @@ -785,45 +785,45 @@ public interface PDLiveApi { /** * 更新投票 */ - @GET("/api/public/?service=shezhizhubotoupiao") + @GET("/shezhizhubotoupiao") Observable>> updateLiveVote(@Query("liveuid") String liveUid, @Query("option_content_key") String key); /** * 主动结束投票 */ - @GET("/api/public/?service=jieshuzhubotoupiao") + @GET("/jieshuzhubotoupiao") Observable>> endLiveVote(@Query("liveuid") String liveUid); /** * 获取盲盒礼物当前数据 */ - @GET("/api/public/?service=huoqumanghexinxi") + @GET("/huoqumanghexinxi") Observable>> getBlindBoxInfo(); /** * 获取红包记录列表 */ - @GET("/api/public/?service=hongbaojilu") + @GET("/hongbaojilu") Observable>> getRedPacketList(); /** * 获取红包詳情 */ - @GET("/api/public/?service=hongbaolingquxiangqing") + @GET("/hongbaolingquxiangqing") Observable> getRedPacketDetails(@Query("red_packet_id") int id); /** * 获取直播间上下滑动红包集合 */ - @GET("/api/public/?service=huoquhongbaozhuanquliebiao") + @GET("/huoquhongbaozhuanquliebiao") Observable>> getRedPacket(); /** * 创建红包 */ - @GET("/api/public/?service=chuangjianrenqihongbao") + @GET("/chuangjianrenqihongbao") Observable> createRedPacket( @Query("liveuid") String liveUid, @Query("is_fans") int needFansGroup, @@ -835,7 +835,7 @@ public interface PDLiveApi { /** * 获取红包数据 */ - @GET("/api/public/?service=hongbaoxiangqing") + @GET("/hongbaoxiangqing") Observable> redPacketInfo( @Query("liveuid") String liveUid, @Query("red_packet_id") String redPacketId @@ -845,7 +845,7 @@ public interface PDLiveApi { /** * 获取盲盒礼物当前数据 */ - @GET("/api/public/?service=lingquhongbao") + @GET("/lingquhongbao") Observable> getRedPacket( @Query("liveuid") String liveUid, @Query("stream") String stream, @@ -855,7 +855,7 @@ public interface PDLiveApi { /** * 超级红包打开接口 */ - @GET("/api/public/?service=lingquchaojihongbao") + @GET("/lingquchaojihongbao") Observable> getRedPacketSuperPrize( @Query("liveuid") String liveUid, @Query("super_jackpot_id") String superJackpotId @@ -864,7 +864,7 @@ public interface PDLiveApi { /** * 获取普通红包的领取记录 */ - @GET("/api/public/?service=huoquhongbaolingquxiangqing") + @GET("/huoquhongbaolingquxiangqing") Observable>> getRedPacketReceive( @Query("red_packet_id") String redPacketId ); @@ -872,7 +872,7 @@ public interface PDLiveApi { /** * 获取普通红包的领取记录 */ - @GET("/api/public/?service=chaojihongbaolingquliebiao") + @GET("/chaojihongbaolingquliebiao") Observable>> getRedPacketSuperPrizeReceive( @Query("super_jackpot_id") String superJackpotId ); @@ -880,7 +880,7 @@ public interface PDLiveApi { /** * 获取普通红包的领取记录 */ - @GET("/api/public/?service=Live.endRedPacket") + @GET("/Live.endRedPacket") Observable> endRedPacket( @Query("liveuid") String liveUid, @Query("red_packet_id") String redPacketId @@ -889,7 +889,7 @@ public interface PDLiveApi { /** * 获取普通红包的领取记录 */ - @GET("/api/public/?service=hongbaojiqiren") + @GET("/hongbaojiqiren") Observable> startRedPacketRobot( @Query("liveuid") String liveUid, @Query("stream") String stream, @@ -899,7 +899,7 @@ public interface PDLiveApi { /** * 获取系统默认头像列表 */ - @GET("/api/public/?service=uhhuoquxitongmorentouxiang") + @GET("/uhhuoquxitongmorentouxiang") Observable>> getSystemUserAvatar(); /** @@ -907,7 +907,7 @@ public interface PDLiveApi { * * @param id 头像id */ - @GET("/api/public/?service=uhshezhixitongtouxiang") + @GET("/uhshezhixitongtouxiang") Observable> setSystemUserAvatar( @Query("avatar_id") int id ); @@ -915,7 +915,7 @@ public interface PDLiveApi { /** * 礼物墙已点亮 */ - @GET("/api/public/?service=huoqudianliangliwuqiang") + @GET("/huoqudianliangliwuqiang") Observable> giftAlreadyWall( @Query("liveuid") String liveUid, @Query("to_uid") String toUid @@ -924,7 +924,7 @@ public interface PDLiveApi { /** * 礼物墙已点亮 */ - @GET("/api/public/?service=huoquyonghuyisongchuliwuqiang") + @GET("/huoquyonghuyisongchuliwuqiang") Observable> giftUserSendWall( @Query("liveuid") String liveUid, @Query("to_uid") String toUid @@ -933,7 +933,7 @@ public interface PDLiveApi { /** * 礼物墙未点亮 */ - @GET("/api/public/?service=huoquweidianliangliwuqiang") + @GET("/huoquweidianliangliwuqiang") Observable> giftWithoutWall( @Query("liveuid") String liveUid, @Query("to_uid") String toUid @@ -942,7 +942,7 @@ public interface PDLiveApi { /** * 礼物墙选中礼物详情 */ - @GET("/api/public/?service=huoquliwuguanmingxiangqing") + @GET("/huoquliwuguanmingxiangqing") Observable> giftDetail( @Query("liveuid") String liveUid, @Query("gift_id") String giftId, @@ -954,7 +954,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=huoqudangyueliwuquanfuguanming") + @GET("/huoqudangyueliwuquanfuguanming") Observable>> currentMonthGiftNaming(); /** @@ -962,7 +962,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=huoqushangyueliwuquanfuguanming") + @GET("/huoqushangyueliwuquanfuguanming") Observable>> lastMonthGiftNaming(); /** @@ -970,22 +970,22 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=huoquliwutujian") + @GET("/huoquliwutujian") Observable>> getGiftGuide( @Query("liveuid") String liveUid, @Query("to_uid") String toUid ); - @GET("/api/public/?service=huoquzhouxingbanlishishuju") + @GET("/huoquzhouxingbanlishishuju") Observable>> getGiftGuideHistory( @Query("liveuid") String liveUid, @Query("to_uid") String toUid ); - @GET("/api/public/?service=huoquyonghuxunzhang") + @GET("/huoquyonghuxunzhang") Observable> getUserMedalList(@Query("to_uid") String toUid); - @GET("/api/public/?service=huoquzhuboxunzhang") + @GET("/huoquzhuboxunzhang") Observable> getLiveMedalList(@Query("liveuid") String liveUid); /** @@ -993,7 +993,7 @@ public interface PDLiveApi { * * @param packId 礼包id */ - @GET("/api/public/?service=huoqubaoguxiangqing") + @GET("/huoqubaoguxiangqing") Observable> getFansExclusivePack(@Query("liveuid") String liveUid, @Query("pack_id") String packId ); @@ -1003,7 +1003,7 @@ public interface PDLiveApi { * * @param packId 礼包id */ - @GET("/api/public/?service=goumailibao") + @GET("/goumailibao") Observable> buyFansExclusivePack(@Query("liveuid") String liveUid, @Query("pack_id") String packId, @Query("stream") String stream @@ -1012,16 +1012,16 @@ public interface PDLiveApi { /** * 获取粉丝团礼物包裹 */ - @GET("/api/public/?service=fensituanliwubaoguoliebiao") + @GET("/fensituanliwubaoguoliebiao") Observable>> userFansExclusivePackList(@Query("liveuid") String liveUid); /** * 获取粉丝团礼物包裹 */ - @GET("/api/public/?service=jianchayonghufensiliwuzhuangtai") + @GET("/jianchayonghufensiliwuzhuangtai") Observable> getCheckFansLevelUpgrade(@Query("liveuid") String liveUid); - @GET("/api/public/?service=huoquliwuxinxi") + @GET("/huoquliwuxinxi") Observable> getGiftNamingInfo(@Query("gift_id") String giftId); /** @@ -1029,13 +1029,13 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=sudhuoquyanzhengma") + @GET("/sudhuoquyanzhengma") Observable>> getCode(); /** * 获取房间金豆门槛和赢家获得的金豆 */ - @GET("/api/public/?service=jianchayonghuyue") + @GET("/jianchayonghuyue") Observable> getScore( @Query("room_id") String roomId ); @@ -1043,7 +1043,7 @@ public interface PDLiveApi { /** * 获取游戏中玩家的信息 */ - @GET("/api/public/?service=huoquduijuzhongyonghuxinxi") + @GET("/huoquduijuzhongyonghuxinxi") Observable>> getSudGameInfo( @Query("room_id") String roomId ); @@ -1053,7 +1053,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=chuangjiansudfangjian") + @GET("/chuangjiansudfangjian") Observable> createSudRoom( @Query("room_name") String roomName, @Query("golden_bean_number") String goldenBeanNumber, @@ -1066,7 +1066,7 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=huoquyouxiliebiao") + @GET("/huoquyouxiliebiao") Observable>> getRoomList( @Query("sud_game_id") String sudGameId, @Query("threshold") String threshold, @@ -1079,7 +1079,7 @@ public interface PDLiveApi { /** * 获取游戏房列表 - 搜索 */ - @GET("/api/public/?service=huoquyouxiliebiao") + @GET("/huoquyouxiliebiao") Observable>> searchRoomList( @Query("sud_game_id") String sudGameId, @Query("threshold") String threshold, @@ -1090,19 +1090,19 @@ public interface PDLiveApi { @Query("page") int page ); - @GET("/api/public/?service=jianchayonghuyue") + @GET("/jianchayonghuyue") Observable> checkRemainingBalance( @Query("room_id") String roomId ); - @GET("/api/public/?service=suijijinrufangjian") + @GET("/suijijinrufangjian") Observable> randomRoom( @Query("sud_game_id") String sudGameId, @Query("threshold") String threshold, @Query("room_holder_type") String roomHolderType ); - @GET("/api/public/?service=jianchafangjianzhuangtai") + @GET("/jianchafangjianzhuangtai") Observable> checkRoomStatus( @Query("room_id") String roomId ); @@ -1110,45 +1110,45 @@ public interface PDLiveApi { /** * 活动弹窗 */ - @GET("/api/public/?service=huoqutanchuangshuju") + @GET("/huoqutanchuangshuju") Observable>> activityPopup(); - @GET("/api/public/?service=youxikaishijianchayonghuyue") + @GET("/youxikaishijianchayonghuyue") Observable> gameStartCheckRemainingBalance( @Query("mg_id") String mgId, @Query("room_id") String roomId ); - @GET("/api/public/?service=jianchaxingbizhuangtai") + @GET("/jianchaxingbizhuangtai") Observable> checkCurrency( ); - @GET("/api/public/?service=zengsongxiaopdliwu") + @GET("/zengsongxiaopdliwu") Observable> quickGiftSendGift( @Query("quick_gift_number") String quickGiftNumber, @Query("liveuid") String liveUid, @Query("stream") String stream ); - @GET("/api/public/?service=guankanhuoquxiaopdliwu") + @GET("/guankanhuoquxiaopdliwu") Observable> viewingDurationGetGift( @Query("liveuid") String liveUid ); - @GET("/api/public/?service=yonghupeizhixinxi") + @GET("/yonghupeizhixinxi") Observable> getCoolConfig(); @FormUrlEncoded - @POST("/api/public/?service=guomaiguanyingquan") + @POST("/guomaiguanyingquan") Observable> buyTicket( @Field("quantity") String quantity ); - @GET("/api/public/?service=shenjizhanling") + @GET("/shenjizhanling") Observable> upgradesBattlePass(@Query("battle_pass_type_id") String battlePassTypeId); - @GET("/api/public/?service=goumaijingyanzhi") + @GET("/goumaijingyanzhi") Observable> buyingExperiencePoint(@Query("exp_count") String expCount); /** @@ -1157,93 +1157,93 @@ public interface PDLiveApi { * * @return */ - @GET("/api/public/?service=jifenduihuanwupin") + @GET("/jifenduihuanwupin") Observable> pointsExchange( @Query("battle_pass_points_id") String battlePassPointsId, @Query("count") String count ); - @GET("/api/public/?service=huoquzhanlingyonghudengji") + @GET("/huoquzhanlingyonghudengji") Observable> getBattlePassUserInfo(); - @GET("/api/public/?service=huoqujianglishuju") + @GET("/huoqujianglishuju") Observable> getLiveBattlePassRewards(); - @GET("/api/public/?service=zhibolingqudengjijiangli") + @GET("/zhibolingqudengjijiangli") Observable>> getRewards( @Query("live_battle_pass_level_id") String rewardLevelId, @Query("live_battle_pass_rewards_id") String rewardId ); - @GET("/api/public/?service=huoquzhandoutongguorenwu") + @GET("/huoquzhandoutongguorenwu") Observable> getBattlePassTask(); - @GET("/api/public/?service=zhibolingqurenwujiangli") + @GET("/zhibolingqurenwujiangli") Observable>> getTask(@Query("task_id") String taskId); - @GET("/api/public/?service=jifenduihuan") + @GET("/jifenduihuan") Observable>> getBattlePassPoints(); - @GET("/api/public/?service=zhibozhanlingguize") + @GET("/zhibozhanlingguize") Observable> battlePassRule(); - @GET("/api/public/?service=tianjialiaotianshu") + @GET("/tianjialiaotianshu") Observable>> addChatCount(@Query("stream") String stream); - @GET("/api/public/?service=youxizhongyonghushangmai") + @GET("/youxizhongyonghushangmai") Observable>> joinMic(@Query("room_id") String roomId); - @GET("/api/public/?service=youxizhongdakaimaikefeng") + @GET("/youxizhongdakaimaikefeng") Observable>> onMic(@Query("room_id") String roomId); - @GET("/api/public/?service=youxizhongguanbimaikefeng") + @GET("/youxizhongguanbimaikefeng") Observable>> offMic(@Query("room_id") String roomId); - @GET("/api/public/?service=youxizhongyonghuxiamai") + @GET("/youxizhongyonghuxiamai") Observable>> leaveMic(@Query("room_id") String roomId); - @GET("/api/public/?service=huoqufangjianshangmaishuju") + @GET("/huoqufangjianshangmaishuju") Observable>> getRoomMicData(@Query("room_id") String roomId); - @GET("/api/public/?service=huoquyuyinzhuangtai") + @GET("/huoquyuyinzhuangtai") Observable> getRoomMicStatus(); - @GET("/api/public/?service=huoqushouhukaitongxinxi") + @GET("/huoqushouhukaitongxinxi") Observable> getGuardUserInfo(@Query("liveuid") String liveUid); - @GET("/api/public/?service=huoqushouhukaitongyemian") + @GET("/huoqushouhukaitongyemian") Observable> getGuardOpenInfo(@Query("liveuid") String liveUid); - @GET("/api/public/?service=kaitongshouhu") + @GET("/kaitongshouhu") Observable> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey, @Query("stream") String stream,@Query("coupon_type") String coupon_type,@Query("coupon_id") String coupon_id); - @GET("/api/public/?service=kaitonglongshensongcai") + @GET("/kaitonglongshensongcai") Observable> sendMoneyLong(@Query("liveuid") String liveUid, @Query("gold_num") String goldNum); - @GET("/api/public/?service=shenlongsongcailiebiao") + @GET("/shenlongsongcailiebiao") Observable>> sendMoneyLongList(@Query("liveuid") String liveUid); - @GET("/api/public/?service=canyulongshensongcai") + @GET("/canyulongshensongcai") Observable> participateMoneyLong(@Query("liveuid") String liveUid, @Query("send_money_long_key") String sendMoneyLongKey); - @GET("/api/public/?service=shenlongsongcaijieshu") + @GET("/shenlongsongcaijieshu") Observable> endSendMoneyLong(@Query("liveuid") String liveUid, @Query("send_money_long_key") String sendMoneyLongKey); - @GET("/api/public/?service=jianchayonghushenjizhuangtai") + @GET("/jianchayonghushenjizhuangtai") Observable> checkUpgrades(@Query("liveuid") String liveUid); - @GET("/api/public/?service=lingqudengjijiangli") + @GET("/lingqudengjijiangli") Observable> guardGetRewards(@Query("guard_level") String guardLevel, @Query("liveuid") String liveUid); @Multipart - @POST("/api/public/?service=pdltouxiangshangchuan") + @POST("/pdltouxiangshangchuan") Observable> updateFile(@Part MultipartBody.Part file, @Query("uid") String uid, @Query("token") String token); - @GET("/api/public/?service=yonghufankui") + @GET("/yonghufankui") Observable>> feedback(@Query("problem_description") String content, @Query("problem_image") String images, @Query("contact_information") String ci); - @GET("/api/public/?service=jianchafankuitijiaocishu") + @GET("/jianchafankuitijiaocishu") Observable>> checkFeedback(); /** @@ -1257,7 +1257,7 @@ public interface PDLiveApi { * @param payload 附加值 * @return */ - @GET("/api/public/?service=youxizhongchuangjiandingdan") + @GET("/youxizhongchuangjiandingdan") Observable>> createGameOrder( @Query("room_id")String roomId, @Query("cmd")String cmd, @@ -1267,7 +1267,7 @@ public interface PDLiveApi { @Query("to_uid")String toUid, @Query("payload")String payload ); - @GET("/api/public/?service=houqushengwanglingpai") + @GET("/houqushengwanglingpai") Observable> getSwToken(); @@ -1277,26 +1277,26 @@ public interface PDLiveApi { * @param gift_id * @return */ - @GET("/api/public/?service=zhubowanchengzhenggu") + @GET("/zhubowanchengzhenggu") Observable>> anchorClickFinish( @Query("anchor_id")String anchor_id, @Query("gift_id")String gift_id ); - @GET("/api/public/?service=shezhiqiniurizhizhuangtai") + @GET("/shezhiqiniurizhizhuangtai") Observable> getPrankList( @Query("type")String type ); - @GET("/api/public/?service=huoqyliwuxunzhangliebiao") + @GET("/huoqyliwuxunzhangliebiao") Observable> getGiftHallMedalList(@Query("to_uid") String liveUid,@Query("type")String type); - @GET("/api/public/?service=yonghupeidaizhuangban") + @GET("/yonghupeidaizhuangban") Observable>> userUseDress(@Query("users_dress_id")String users_dress_id,@Query("dress_type")int dress_type); /** * 个人展馆 */ - @GET("/api/public/?service=yonghugerenzhanguan") + @GET("/yonghugerenzhanguan") Observable> singleUserGiftHall( @Query("user_id")String userId, @Query("screen")int screen @@ -1305,7 +1305,7 @@ public interface PDLiveApi { /** * 主播展馆 */ - @GET("/api/public/?service=zhubogerenzhanguan") + @GET("/zhubogerenzhanguan") Observable> liveGiftHall( @Query("live_id")String userId, @Query("screen")int screen @@ -1314,7 +1314,7 @@ public interface PDLiveApi { /** * 个人展馆详情 */ - @GET("/api/public/?service=gerenzhanguanxiangqing") + @GET("/gerenzhanguanxiangqing") Observable> singleUserGiftHallDetail( @Query("user_id")String userId, @Query("gift_id")String gift_id @@ -1323,7 +1323,7 @@ public interface PDLiveApi { /** * 主播展馆详情 */ - @GET("/api/public/?service=zhubozhanguanliwuxiangqing") + @GET("/zhubozhanguanliwuxiangqing") Observable> liveGiftHallDetail( @Query("live_id")String live_id, @Query("gift_id")String gift_id, @@ -1334,40 +1334,40 @@ public interface PDLiveApi { /** * 全站展馆 */ - @GET("/api/public/?service=quanzhanzhanguan") + @GET("/quanzhanzhanguan") Observable> allGiftHall( @Query("type")String type ); - @GET("/api/public/?service=shangqiguanmingzhouxingliwu") + @GET("/shangqiguanmingzhouxingliwu") Observable> lastAllGiftHallWeekStarDetail( @Query("gift_id")String giftId, @Query("live_uid")String liveUid ); //处罚通知红点 - @GET("/api/public/?service=jianchaweiduchufanxiaoxi") + @GET("/jianchaweiduchufanxiaoxi") Observable getPenalizeStatus(); - @GET("/api/public/?service=yiganqingtaigengxinhuancun") + @GET("/yiganqingtaigengxinhuancun") Observable> ballClearanceTableStatus( @Query("room_id")String roomId ); - @GET("/api/public/?service=huoquyouxijiesuanjifen") + @GET("/huoquyouxijiesuanjifen") Observable>> ballClearanceTableGetResultScore( @Query("room_id")String roomId ); - @GET("/api/public/?service=jiaruaiyonghu") + @GET("/jiaruaiyonghu") Observable> ballClearanceTableAiAdd( @Query("room_id")String roomId ); - @GET("/api/public/?service=huoqufangjianzuoweiliebiao") + @GET("/huoqufangjianzuoweiliebiao") Observable> ballClearanceTableGetRoomInfo( @Query("room_id")String roomId ); - @GET("/api/public/?service=yonghusuijipipeijinrufangjian") + @GET("/yonghusuijipipeijinrufangjian") Observable> ballClearanceTableJoinRoom ( ); - @GET("/api/public/?service=huoqufangjianxiangqing") + @GET("/huoqufangjianxiangqing") Observable> checkGameForActivity( @Query("room_id")String roomId ); diff --git a/common/src/main/java/com/yunbao/common/utils/AesUtils.java b/common/src/main/java/com/yunbao/common/utils/AesUtils.java index b74fadedf..eb57ebd2d 100644 --- a/common/src/main/java/com/yunbao/common/utils/AesUtils.java +++ b/common/src/main/java/com/yunbao/common/utils/AesUtils.java @@ -34,20 +34,39 @@ public class AesUtils { * 如果需要将解密后的字节数组转换为字符串（注意：这可能会导致数据丢失或乱码） * * @param encryptedData 加密后的字节数组（或Base64解码后的结果） - * @param keyBytes AES密钥 - * @param charset 用于将解密后的字节数组转换为字符串的字符集 * @return 解密后的字符串，如果解密失败则返回null */ - public static String decryptToString(byte[] encryptedData, byte[] keyBytes, String charset) { - byte[] decryptedBytes = decrypt(encryptedData, keyBytes); + public static String decryptToString(byte[] encryptedData) { + byte[] decryptedBytes = decrypt(encryptedData,"LhHBfcsN2VmBpHCn".getBytes()); if (decryptedBytes != null) { // 尝试将字节数组转换为字符串（使用指定的字符集） try { - return new String(decryptedBytes, charset); + return decodeUnicode(new String(decryptedBytes, "UTF-8")); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } } return null; } + + public static String decodeUnicode(String unicode) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < unicode.length();) { + if (unicode.charAt(i) == '\\') { + if (i + 5 < unicode.length()) { + String codePointStr = unicode.substring(i + 2, i + 6); + try { + int codePoint = Integer.parseInt(codePointStr, 16); + sb.append((char) codePoint); + i += 6; + continue; + } catch (NumberFormatException e) { + // Handle format error + } + } + } + sb.append(unicode.charAt(i++)); + } + return sb.toString(); + } } diff --git a/config.gradle b/config.gradle index d7abf9627..9425aa231 100644 --- a/config.gradle +++ b/config.gradle @@ -13,7 +13,7 @@ ext { serverHost : "https://napi.yaoulive.com", buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")), - testServerHost : "https://ceshi.yaoulive.com", + testServerHost : "https://api.poyoshow.com", //百度语音识别 diff --git a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java index 9d283e89e..fb1953975 100644 --- a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java @@ -46,6 +46,7 @@ import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.manager.NoviceInstructorManager; import com.yunbao.common.manager.imrongcloud.RongcloudIMManager; import com.yunbao.common.utils.DialogUitl; +import com.yunbao.common.utils.L; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.http.LiveHttpUtil; @@ -240,7 +241,8 @@ public class RegisterActivity extends AbsActivity { webSettings.setJavaScriptEnabled(true); webview.addJavascriptInterface(new JsBridge(), "jsBridge"); // 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html")) - webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0)); + webview.loadUrl(CommonAppConfig.HOST + "/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0)); + L.e(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0)); } diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java index 1c10f7a84..1fa9cda1d 100644 --- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java +++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java @@ -314,7 +314,7 @@ public class MainHttpUtil { * 获取用户钱 */ public static void getBalance(HttpCallback callback) { - HttpClient.getInstance().get("huoquyonghuyue", "huoquyonghuyue") + HttpClient.getInstance().get("chaxunyonghuyue", "chaxunyonghuyue") .execute(callback); } diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java index 00896c33a..dedd0ab9b 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java @@ -105,7 +105,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { decodedData = Base64.getDecoder().decode(aesStr); } - String decryptedText = AesUtils.decryptToString(decodedData, "LhHBfcsN2VmBpHCn".getBytes(), "UTF-8"); + String decryptedText = AesUtils.decryptToString(decodedData); L.e("decryptedText:"+decryptedText); } public void setCurPosition(int position) { diff --git a/video/src/main/java/com/yunbao/video/upload/VideoUploadFtpImpl.java b/video/src/main/java/com/yunbao/video/upload/VideoUploadFtpImpl.java index 107b9a46c..414dfe6f3 100644 --- a/video/src/main/java/com/yunbao/video/upload/VideoUploadFtpImpl.java +++ b/video/src/main/java/com/yunbao/video/upload/VideoUploadFtpImpl.java @@ -32,7 +32,7 @@ public class VideoUploadFtpImpl implements VideoUploadStrategy { if (videoUploadBean == null || callback == null) { return; } - PostRequest postRequest = OkGo.post("http://www.mytoday.net/api/public/?service=Video.uploadvideo") + PostRequest postRequest = OkGo.post("http://www.mytoday.net/Video.uploadvideo") .params("uid", "13640") .params("token", "0e6371c5a642e8b48748a4d994303473") .params("file", videoUploadBean.getVideoFile())