Commit Graph

272 Commits

Author SHA1 Message Date
ningwenqiang
3ddcc944c0 Merge branch 'refs/heads/新潘多拉6.8.1' into 新潘多拉_6.8.2
# Conflicts:
#	main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
2024-10-22 13:33:15 +08:00
ningwenqiang
eee2648277 Ui调整 2024-10-18 15:41:03 +08:00
ningwenqiang
87e372e8f9 Merge remote-tracking branch 'origin/新潘多拉_6.8.2' into 新潘多拉_6.8.2 2024-10-16 15:09:01 +08:00
ningwenqiang
fb09b8ef35 替换了直播背景图 2024-10-16 15:08:47 +08:00
ningwenqiang
6b9d951c55 判断一下开关开启是显示 ON
开关关闭显示 OFF
2024-10-15 18:03:14 +08:00
ningwenqiang
f528353dd0 判断一下开关开启是显示 ON
开关关闭显示 OFF
2024-10-15 17:39:52 +08:00
ningwenqiang
2799991ef3 主播设置完心愿单直播间进行修改 2024-10-15 16:59:26 +08:00
ningwenqiang
8efa3b62e2 Pk图标设置
api/public/?service=Ranking.getAnchorRankData&app_from=PDL"
2024-10-15 15:20:21 +08:00
ningwenqiang
11ac669077 调整礼物栏高度,对文字进行部分对齐 2024-10-14 18:23:42 +08:00
ningwenqiang
e8c8456e14 合并支付User.getBaseInfos 新增返回pay_type //支付方式展示:1、三方支付,2:官方支付,3:无响应 且根据PDL修改不同界面 2024-10-14 14:07:03 +08:00
ningwenqiang
2ee9e9c726 1获取充值信息增加字段 传一个字段key1 值:6tnym1br6lhu7 2.取消防抖 2024-10-14 13:09:17 +08:00
ningwenqiang
9649a7eb01 Merge branch 'refs/heads/新潘多拉6.8.1' into 新潘多拉_6.8.2
# Conflicts:
#	common/src/main/java/com/yunbao/common/sud/decorator/SudFSMMGDecorator.java
2024-10-14 09:58:01 +08:00
ningwenqiang
7c8db902f3 SudFSMMGDecorator 和并PD的跳转修复 2024-10-14 09:55:56 +08:00
ningwenqiang
7937ef70bc 替换融云IMkey 值 2024-10-14 09:45:04 +08:00
ningwenqiang
1d45fa8d3d 开始游戏的问题同步, 调整快捷聊天的边距 2024-10-11 16:17:17 +08:00
ningwenqiang
6c92adc0a3 直播条目背景颜色调整 2024-10-11 14:22:43 +08:00
ningwenqiang
9ecfc46467 修改开始直播的返回翻译 2024-10-11 11:28:42 +08:00
Martin
cb2310914b 意见反馈,图片上传失败。原因:调错接口了;已修复 2024-10-10 10:52:27 +08:00
Martin
ce3dc1cd3d 修改完成新手任務的接口 2024-10-09 17:56:47 +08:00
Martin
5383e2a4ea 修复将PDLIVE替换成PandoraLive 2024-10-09 10:01:38 +08:00
Martin
548e373310 修复开通贵族全服通知不滚动问题 2024-10-09 09:59:54 +08:00
Martin
d544de6c1d 修复小米手机首页导航栏展示不全问题 2024-10-09 09:58:54 +08:00
ningwenqiang
76d24123a7 周星榜数量修改 2024-10-07 18:20:31 +08:00
ningwenqiang
cc48c7c2e8 chat_recyclerView 间距加在父类而不是子类 2024-10-07 16:42:24 +08:00
ningwenqiang
949ff20317 为选择礼物时候为灰色 2024-10-07 11:28:48 +08:00
ningwenqiang
2236a90b31 礼物包裹的逻辑进行修改 2024-10-06 17:20:50 +08:00
ningwenqiang
ed1bd72d0a 1.PK倒计时是, 神龙倒计时 改成只有分钟秒格式
2.送礼物自定义数量下移
2024-09-29 14:53:05 +08:00
ningwenqiang
c42b3db7d2 礼物条目的标题头 英文的改回原来的逻辑 2024-09-29 10:57:35 +08:00
ningwenqiang
615416444d 礼物的贵族实现替换 2024-09-28 14:34:06 +08:00
ningwenqiang
257b4c51aa Merge branch 'refs/heads/新潘多拉6.8.1' into 新潘多拉_6.8.2
# Conflicts:
#	app/tmp/full-r8-config.txt
#	config.gradle
#	lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java
2024-09-27 18:07:04 +08:00
ningwenqiang
195bc56152 UI做小的调整 2024-09-27 16:53:38 +08:00
ningwenqiang
9454b5407a 机器人语言设置完成 2024-09-27 16:49:08 +08:00
ningwenqiang
51caa11c07 机器人语言设置完成 2024-09-27 16:38:15 +08:00
ningwenqiang
380381c3fe 补充 2024-09-27 16:23:47 +08:00
ningwenqiang
ea391a648a 语言设置增加 2024-09-27 16:19:16 +08:00
ningwenqiang
de9901707c 礼物增加空的布局 2024-09-27 14:31:08 +08:00
ningwenqiang
ea558cb22f 功能基本调试完成 2024-09-27 14:22:54 +08:00
ningwenqiang
b6d715d81c 接入Popup2进行UI调整 2024-09-27 11:43:55 +08:00
ningwenqiang
729db13ffd 保存一波数据线 2024-09-26 18:32:01 +08:00
ningwenqiang
d7a5d224b2 礼物的弹窗UI进行修改 2024-09-26 15:18:39 +08:00
ningwenqiang
6ba18e8ba2 保存新的送礼的UI 2024-09-25 17:23:15 +08:00
ningwenqiang
4f81d720fd 普通用户的聊天栏更高一些 2024-09-24 15:51:56 +08:00
ningwenqiang
352a49c762 PDLive字符串修改成PandoraLive 2024-09-24 10:36:42 +08:00
ningwenqiang
7976d36701 准备新的礼物和机器人部分业务 2024-09-24 10:30:48 +08:00
ningwenqiang
fd8e805f78 pk 倒计时去掉小时 2024-09-23 14:51:58 +08:00
ningwenqiang
dffe681b95 贵族图标替换 同时增加新的参数 2024-09-23 14:23:27 +08:00
ningwenqiang
31c8365696 贵族图标替换 2024-09-23 13:33:53 +08:00
ningwenqiang
98fc9f61c3 直播的一些翻译问题修改 2024-09-21 17:38:34 +08:00
ningwenqiang
a44dfee38a 隐藏清晰度的选项 2024-09-21 16:37:25 +08:00
ningwenqiang
b3c962c03b 默认样式修改 2024-09-21 15:55:16 +08:00