Compare commits

...

283 Commits

Author SHA1 Message Date
Max
71dab1bb8f feat:隐藏首页榜单、房间榜单、双收益明细入口 2023-11-16 00:20:21 +08:00
Max
1fd9f386d8 feat:修改注销协议H5地址 2023-11-15 23:43:09 +08:00
Max
c334100bae feat:调整部分H5路径 2023-11-15 23:27:10 +08:00
Max
99844fc6eb feat:修改H5路径 2023-11-15 23:08:51 +08:00
Max
cedc402455 feat:修复错误改动 2023-11-15 22:03:21 +08:00
Max
1d4f1492f9 feat:换loading
feat:隐藏首页顶部入口
2023-11-15 21:50:59 +08:00
Max
5b76455f20 feat:所有PNG转换为WEBP 2023-11-15 19:32:40 +08:00
Max
b57eb8b9f4 feat:补充删除 2023-11-15 19:26:29 +08:00
Max
cb6ca8049f feat:补充删除部分代码 2023-11-15 19:24:56 +08:00
Max
8157edc05c feat:去掉facebook-SDK 2023-11-15 19:21:09 +08:00
Max
c474cd5824 feat:修改部分目录名 2023-11-15 18:51:22 +08:00
Max
7560110af2 feat:【Habu】隐藏分享、游戏房入口 2023-11-15 18:21:54 +08:00
Max
9d63a90942 feat:【Habu Live】替换logo、包名、第三方KEY 2023-11-15 18:14:27 +08:00
Max
bdcfb21e6e Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix 2023-11-01 18:34:23 +08:00
Max
5c7d2e9645 fix:调整幸运礼物动画播放条件(去掉价值520的条件,恢复luckyGiftSvgaUrl逻辑) 2023-11-01 18:34:15 +08:00
Max
d2f24c4457 Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix 2023-11-01 16:29:11 +08:00
Max
7ec11e0aba Merge branch 'v2.2.0/red_package' into v2.2.0/test 2023-11-01 16:28:58 +08:00
Max
f4a9690c1b fix:修复红包组件内的compositeDisposable导致再次激活无法执行任务 2023-11-01 16:20:43 +08:00
Max
0742894540 Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix 2023-11-01 14:59:16 +08:00
Max
d0fe8e892e Merge branch 'v2.2.0/red_package' into v2.2.0/test 2023-11-01 14:59:05 +08:00
Max
b9120dca54 feat:调整红包打开按钮动画时长
feat:调整红包入口图标
2023-11-01 14:58:47 +08:00
Max
8ebaddad07 Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix 2023-11-01 11:34:52 +08:00
Max
b63b4ba07a fix:修复幸运礼物重复动效(去掉本地自己播的一个svga) 2023-11-01 11:34:43 +08:00
Max
a211267517 fix:修复麦位魅力值展示问题(主麦) 2023-11-01 11:22:04 +08:00
Max
d0e88440e3 Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix 2023-10-31 19:19:32 +08:00
Max
260ed56c99 Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix 2023-10-31 19:19:22 +08:00
Max
505917b70f Merge branch 'v2.2.0/float_gift' into v2.2.0/test 2023-10-31 19:19:05 +08:00
Max
03d013fcba fix:修复合并导致的礼物飘窗未展示房间名称问题 2023-10-31 19:18:57 +08:00
Max
19301bbd84 fix:修复公屏相册条目的等级icon加载模糊问题 2023-10-31 19:07:08 +08:00
Max
694a73931b Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix 2023-10-31 18:06:49 +08:00
Max
d34929d7c7 fix:修复礼物信令解析时未判空导致的解析中断 2023-10-31 18:06:40 +08:00
Max
73eccecfc9 Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix 2023-10-31 17:26:18 +08:00
Max
eb1546570a Merge branch 'v2.2.0/float_gift' into v2.2.0/test
# Conflicts:
#	app/src/main/res/layout/dialog_gift_all_service_level2.xml
2023-10-31 17:26:06 +08:00
Max
7ba43a51d4 fix:调整礼物飘窗弹窗-去围观位置 2023-10-31 17:25:22 +08:00
Max
bae4660840 Merge branch 'v2.2.0/red_package' into v2.2.0/test 2023-10-31 17:19:15 +08:00
Max
b9fd24e0ff fix:红包过期时间动态展示(发布、小秘书)
fix:调整全服红包文案字数限制
2023-10-31 17:19:06 +08:00
Max
4bef25e1e3 Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix 2023-10-31 15:54:47 +08:00
Max
72480daa98 Merge branch 'v2.2.0/float_gift' into v2.2.0/test 2023-10-31 15:54:35 +08:00
Max
1defcb0d28 fix:修复礼物飘窗与其他特效飘窗重叠问题(加顶部间距:之前版本是这么解决的,应该是之前版本没做完善这块需求) 2023-10-31 15:54:26 +08:00
Max
4885a0bdbd Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix 2023-10-31 15:14:14 +08:00
Max
5900702ca6 fix:修复公屏历史消息未查询相册类型消息问题 2023-10-31 15:14:04 +08:00
Max
9e6928580f Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix 2023-10-31 11:25:46 +08:00
Max
e644ced1ed fix:去除聊天页-语音&图片时的WRITE_EXTERNAL_STORAGE权限 2023-10-31 11:25:16 +08:00
Max
1667dd3863 Merge branch 'v2.2.0/red_package' into v2.2.0/test 2023-10-31 11:11:59 +08:00
Max
c04d3e283b fix:点击红包图标 已领取且领取完时 增加提示并更新入口 2023-10-31 11:10:51 +08:00
Max
2b6d66c31e Merge branch 'v2.2.0/float_gift' into v2.2.0/test 2023-10-31 10:19:48 +08:00
Max
e56bbb5f8f fix:修复非房间礼物 飘窗弹窗 点击跳转未屏蔽问题 2023-10-31 10:17:09 +08:00
Max
7bf7e232d0 Merge branch 'v2.2.0/red_package' into v2.2.0/test 2023-10-30 20:11:15 +08:00
Max
d63a441296 feat:去掉房间设置中的-全服红包开关(暂时操作隐藏入口) 2023-10-30 20:08:08 +08:00
Max
e81ec19168 Merge branch 'v2.2.0/float_gift' into v2.2.0/test
# Conflicts:
#	gradle.properties
2023-10-30 20:02:52 +08:00
Max
588b96ec7b fix:跳转提示去房间的忽略提示规则 2023-10-30 20:02:04 +08:00
Max
514abbc314 Merge branch 'v2.2.0/red_package' into v2.2.0/test 2023-10-30 19:49:16 +08:00
Max
94d9183952 fix:修复全服红包未展示自定义文案问题 2023-10-30 19:49:09 +08:00
Max
6eedd5cc46 fix:修复切换同类型房间导致的Widget未更新Context问题 2023-10-30 19:30:26 +08:00
Max
087091275f fix:增加领取成功后主动刷新入口图标数据 2023-10-30 17:10:20 +08:00
Max
f54a8ec175 feat:完善发送红包的权限细分
feat:删除红包无用旧代码
2023-10-30 16:49:00 +08:00
Max
fee8f2ceb9 Merge branch 'v2.2.0/red_package' into v2.2.0/test
# Conflicts:
#	app/src/main/res/values/strings.xml
2023-10-30 15:37:59 +08:00
Max
a18a66b496 fix;修复红包失效时的入口更新问题 2023-10-30 15:36:00 +08:00
Max
80e21bee74 fix:修复房间内点击红包跳转到其他房间后没弹出红包问题 2023-10-30 15:16:06 +08:00
Max
e031dd9d02 fix:修复红包内若干bug 2023-10-30 14:45:19 +08:00
Max
19a3b64a32 Merge branch 'v2.2.0/float_gift' into v2.2.0/test
# Conflicts:
#	app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
#	app/src/main/res/values/strings.xml
2023-10-30 12:45:11 +08:00
Max
34a5571338 feat:完成礼物飘窗跳转提示 2023-10-30 12:35:56 +08:00
Max
5b4eeb80e8 Merge branch 'v2.2.0/red_package' into v2.2.0/test 2023-10-29 23:14:28 +08:00
Max
f7889ace18 feat:完善游戏房、个播房红包展示
feat:完善红包冲突场景
2023-10-29 23:14:20 +08:00
Max
cfc909df42 Merge branch 'v2.2.0/float_gift' into v2.2.0/test
# Conflicts:
#	app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
#	app/src/main/res/layout/dialog_gift_all_service_level.xml
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/strings.xml
2023-10-28 12:56:42 +08:00
Max
ebc989cccf feat:使用动态比例实现飘窗礼物布局(待验证) 2023-10-28 12:25:24 +08:00
Max
5ad1c017c3 feat:完善礼物飘窗文本样式 2023-10-28 11:43:19 +08:00
Max
15a80f5537 feat:初步完成全服飘窗礼物UI优化 2023-10-27 20:06:11 +08:00
Max
38fde6109b Merge branch 'v2.2.0/red_package' into v2.2.0/dev
# Conflicts:
#	gradle.properties
2023-10-27 17:09:46 +08:00
Max
3199114ff6 fix:修复开红包结果页的view隐藏展示问题
fix:修复发红包背景展示问题
2023-10-27 17:06:40 +08:00
Max
57139f1f97 feat:完善全服红包跳转逻辑 2023-10-27 16:32:54 +08:00
Max
c7d7d98873 feat:完善抢红包条件的完成路径跳转
feat:完善抢红包细节
2023-10-27 13:01:05 +08:00
Max
d7da6d4be4 feat:完善抢红包文案和交互 2023-10-27 11:21:13 +08:00
Max
b9a2f03184 feat:完善红包入口逻辑
feat:初步可以领取红包
2023-10-27 02:10:55 +08:00
Max
5ef9be75d2 feat:初步搭建新房间框架
feat:初步搭建红包处理器与组件等(未完成)
2023-10-26 20:17:11 +08:00
Max
cf3ab9ce84 feat:调整发红包部分字段 2023-10-25 18:25:31 +08:00
Max
3ba31c46d8 feat:补充支付订单为空的判断 2023-10-25 17:14:31 +08:00
Max
e8f7eca1af fix:修复google支付回调时导致的空指针异常
fix:完善房间上麦时权限申请的前置状态判断
2023-10-25 16:56:05 +08:00
Max
d93b6fbf60 feat:新增core模块(核心组件模块,慢慢整理重构) 2023-10-25 16:48:32 +08:00
Max
6ec57834fd feat:初步完成发红包接口对接
feat:增加服务器时间字段
2023-10-25 15:17:08 +08:00
Max
c3dab80e71 feat:初步完成房间红包入口组件UI
feat:完善网络调试工具Stetho的配置
2023-10-24 19:06:04 +08:00
Max
60e56beb43 feat:完成打开红包弹窗UI 2023-10-24 15:40:07 +08:00
Max
a0667bdd8d feat:初步完成领红包弹窗UI框架 2023-10-24 14:12:42 +08:00
Max
ba65ad680f feat:完成发红包UI国际化 2023-10-24 10:29:47 +08:00
Max
5163c2dc9d feat:初步完成发红包弹窗UI 2023-10-23 20:15:02 +08:00
wzq
ad5a769f25 清除 Google 内购代码 2023-10-19 18:02:03 +08:00
wzq
be291fa7e1 升级 Google 内购库 2023-10-19 17:22:58 +08:00
wzq
27713e5300 混淆 bean 2023-10-19 15:00:22 +08:00
wzq
80e180f2b8 debug 混淆配置; 升级eventbus 2023-10-19 14:46:11 +08:00
wzq
ba93c9c0fe eventbus 混淆规则更新 2023-10-19 14:26:44 +08:00
wzq
6f9d1d81ad 房间相册 UI问题 2023-10-19 12:02:18 +08:00
wzq
81d0cd819d 房间相册-公屏 修复崩溃及图片不显示 2023-10-19 10:19:51 +08:00
wzq
36897df28b 房间相册-上传 多张图片上传时去除参数中的空格 2023-10-19 10:05:02 +08:00
wzq
6bdfe0426e 房间相册-上传 删除已选照片后, 重新显示 添加按钮 2023-10-18 18:58:21 +08:00
wzq
997b7ee9a3 [Build] debug 打包配置混淆 打印信息 2023-10-18 18:08:37 +08:00
wzq
b885a24b8e [Build] debug 打包配置混淆 2023-10-18 17:40:25 +08:00
wzq
5d2551e04f 房间相册 修复 神奇的手机无法点击图标关闭解锁弹窗 2023-10-18 17:19:11 +08:00
wzq
309e696a07 房间相册 上传图片前 压缩图片 2023-10-18 16:43:56 +08:00
wzq
68c9c6a8cb 房间相册 照片列表分页问题 2023-10-18 16:30:01 +08:00
wzq
448e6800ab 房间相册 公屏消息 UI显示问题 2023-10-18 15:36:49 +08:00
wzq
068ffcbed4 房间相册 公屏消息 解锁区域放大至整个消息区域 2023-10-18 15:08:03 +08:00
wzq
cf7b49b69d 房间相册 UI问题 2023-10-18 14:37:14 +08:00
wzq
09fd7c586a 房间相册 数据展示及交互 2023-10-18 14:35:53 +08:00
wzq
03b77fae08 房间相册 查看大图 2023-10-18 14:23:06 +08:00
wzq
b75ba89d75 房间相册 公屏消息 解锁 2023-10-18 13:14:49 +08:00
wzq
2074039de2 房间相册 解锁 2023-10-17 20:57:02 +08:00
wzq
6b580ad2a6 房间相册 删除图片 2023-10-17 20:05:47 +08:00
wzq
6134962297 房间相册 发送图片至公屏 2023-10-17 19:12:42 +08:00
wzq
ce5cc20ac4 房间相册 列表,上传 数据对接 2023-10-17 18:16:41 +08:00
wzq
bc718f26c6 房间相册 入口 2023-10-17 16:32:42 +08:00
wzq
8f9a5bd565 房间相册 公屏消息UI 2023-10-17 14:08:23 +08:00
wzq
623a721e58 房间相册 选择解锁礼物UI 交互 2023-10-17 10:10:42 +08:00
wzq
a9be418fc3 房间相册 选择解锁礼物UI 2023-10-16 22:39:13 +08:00
wzq
5b781b890c 房间相册 上传照片UI 2023-10-16 20:04:09 +08:00
wzq
4a6892d0c6 房间相册UI 2023-10-13 19:37:38 +08:00
wzq
a6e6992b1a 修复 首页房间item 周榜框 显示重叠 2023-10-13 11:36:38 +08:00
wzq
248e306e85 修复 房间 "精灵夺宝" 抽奖 一直转圈的问题 2023-10-12 19:10:15 +08:00
wzq
bce08e82ca 引入 okdownload 下载库 下载表情. 避免网络请求卡死 2023-10-12 18:39:30 +08:00
wzq
32814780c2 房间 "夺宝精灵" 购买碎片 成功弹窗显示问题 2023-10-12 18:30:04 +08:00
wzq
d0dc4cab49 房间 "夺宝精灵" 精灵兑换 底部显示我拥有的精灵 2023-10-12 17:25:49 +08:00
wzq
80d571d1d1 房间 "夺宝精灵" 精灵分解. 根据不同等级的精灵, 显示不同的提示文案 2023-10-12 16:36:36 +08:00
wzq
b92c97dfb9 房间 "夺宝精灵" 自定义购买弹窗 支持输入数量 2023-10-12 16:01:23 +08:00
wzq
e585899c44 房间 "夺宝精灵" 兑换商店-碎片兑换 图标不正确 2023-10-12 15:15:56 +08:00
wzq
03f28b7be0 房间 "夺宝精灵" 兑换商店-精灵兑换 UI适配 2023-10-12 15:04:07 +08:00
wzq
c7225892f0 房间 公屏输入框 回车键 发送信息 2023-10-12 12:00:55 +08:00
wzq
f8d4601c38 适配 声网 音量回调 2023-10-12 11:51:49 +08:00
wzq
ce4fce319e 房间 "夺宝精灵" 精灵试炼 动画文件更换 2023-10-11 18:34:35 +08:00
wzq
ce4293ec35 房间 "夺宝精灵" 精灵分解 更新碎片 2023-10-11 17:59:09 +08:00
wzq
1c9de5f03a 房间 "夺宝精灵" 兑换记录 移除类型显示 2023-10-11 17:57:48 +08:00
wzq
2734ff1ff2 房间 "夺宝精灵" 精灵试炼记录 区分类型 2023-10-11 17:49:48 +08:00
wzq
c7a28c5ac9 房间 "夺宝精灵" 精灵分解 提示文案 2023-10-11 16:30:06 +08:00
wzq
ae4d327baf 房间 "夺宝精灵" 精灵试炼 传说试炼 底部精灵展示为普通精灵 2023-10-11 16:02:49 +08:00
wzq
9e9eb5d5b7 修复 房间 "夺宝精灵" 召唤精灵 价格不显示 2023-10-11 15:20:10 +08:00
wzq
96b1ad9e4c 修复 房间 "夺宝精灵" 幸运值进度条不正确 2023-10-11 11:56:46 +08:00
wzq
48c527e789 修复 房间 "夺宝精灵" 幸运值无法刷新 2023-10-11 11:38:58 +08:00
wzq
4e0a55ae46 修复 房间 "夺宝精灵" 购买弹窗bug 2023-10-11 10:53:58 +08:00
wzq
c85065d86c 房间 "夺宝精灵" 新增 自定义购买数量碎片弹窗 2023-10-10 17:54:47 +08:00
wzq
c1371fab10 房间寻爱活动 购买限制数量200调整至99999 2023-10-10 17:03:11 +08:00
wzq
6717f9aa69 房间 送礼接口 失败后 显示toast 2023-10-09 16:09:16 +08:00
wzq
61cafd8c8c okhttp 网络配置 2023-10-09 14:21:36 +08:00
wzq
e4f0853d3e 升级 Facebook SDK 2023-10-09 11:48:53 +08:00
wzq
46a2985a49 首页 滑动折叠效果 2023-10-08 18:15:17 +08:00
wzq
b2f9f07ded 首页 UI问题 2023-10-08 17:41:27 +08:00
wzq
5023d9a250 测试包 关于页面 点击logo 可切换 正式/测试环境 2023-10-08 17:40:55 +08:00
wzq
29957775e0 Fixed NPE. 2023-10-07 16:36:52 +08:00
wzq
5f73c46868 升级 realm 数据库 2023-10-07 16:09:55 +08:00
wzq
656eea5ebc fixed NPE. 2023-10-07 15:36:05 +08:00
wzq
f9b8c20d85 优化打包, 使用 splits abi 对每种CPU架构打独立的apk; 腾讯TRTC SDK优化集成方式, 并优化参数 2023-10-07 15:01:09 +08:00
wzq
2d7b55ad0d 修复 星座 计算不正确 2023-10-07 15:00:30 +08:00
wzq
91350218d6 首页UI 适配 2023-10-07 15:00:30 +08:00
wzq
ca56ee0877 修复 寻爱 票据数量问题 2023-09-27 23:32:16 +08:00
wzq
23214de384 修复 寻爱 票据数量问题 2023-09-27 22:46:57 +08:00
wzq
da45a64af9 fixed "default constructor not found." 2023-09-27 22:14:43 +08:00
wzq
e236ef2aff fixed "default constructor not found." 2023-09-27 22:08:41 +08:00
wzq
7de533bf3f 混淆问题 2023-09-27 21:33:21 +08:00
wzq
e23363c736 混淆问题 2023-09-27 21:30:55 +08:00
wzq
4395951973 首页 跟随进房; UI问题 2023-09-27 20:52:51 +08:00
wzq
e02020577d 首页 ViewPager2 滑动冲突 2023-09-27 20:31:55 +08:00
wzq
61306e833a 充值页 UI适配 2023-09-27 20:04:31 +08:00
wzq
49ba0a2701 房间 关闭PK模式 不主动关麦 2023-09-27 19:55:26 +08:00
wzq
2e32184248 房间 寻爱 动态飘屏 进退场动画 2023-09-27 18:57:16 +08:00
wzq
bab64db25c 房间 合并 寻爱 动态/静态 飘屏 队列 2023-09-27 18:43:28 +08:00
wzq
612502153c 房间 PK模式 默认不闭麦 2023-09-27 18:01:00 +08:00
wzq
9cdb0eef53 性别图标 更换成 性别+年龄 2023-09-27 16:00:32 +08:00
wzq
6528ac407a 个人资料页 UI调整 2023-09-27 14:17:58 +08:00
wzq
94d18e6035 礼物面板 item 礼物标签 右对齐 2023-09-27 12:07:27 +08:00
wzq
08abf47890 调整 房间小游戏安全区域 2023-09-27 12:02:24 +08:00
wzq
cb89eccf23 显示 消息页 "发现萌新" 入口, 房间PK入口 2023-09-27 11:26:08 +08:00
wzq
b57622ad42 显示 消息页 "发现萌新" 入口, 房间PK入口 2023-09-27 10:35:41 +08:00
wzq
fd71af897f 修复 塔罗高级 未添加公屏通知 2023-09-26 19:34:40 +08:00
wzq
1998258bda 塔罗活动静态飘屏 只在本房间触发 2023-09-26 19:03:07 +08:00
wzq
5cce2cb68c 首页tab item 新增声音卡 2023-09-26 18:20:00 +08:00
wzq
08230c55a3 首页 UI字体调节 2023-09-26 14:38:07 +08:00
wzq
f51dec1101 Merge branch '1.10.6' into develop
# Conflicts:
#	core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
#	gradle.properties
2023-09-26 14:27:54 +08:00
wzq
1dd5d64a09 修复 寻爱bug 2023-09-26 11:34:05 +08:00
wzq
30d793d794 寻爱飘屏 UI优化 2023-09-25 19:54:42 +08:00
wzq
d2fb38f094 更换声网key 2023-09-25 19:38:09 +08:00
wzq
01958edd06 修复 "寻爱"活动 自定义购买爱心数量 未更新金额 2023-09-25 17:20:27 +08:00
wzq
5a2903d14d 礼物弹窗 标签优化 2023-09-25 17:12:45 +08:00
wzq
1bade9dd00 小时榜飘屏 更换背景图 2023-09-25 16:59:29 +08:00
wzq
8d7ab335e2 新增 H5 跳转 话题页 2023-09-25 16:37:48 +08:00
wzq
8bf25ad378 根据接口返回选择 跳转 原生/H5 充值页 2023-09-25 16:23:01 +08:00
wzq
6e11cfb30d 新增 充值页跳转私聊客服充值 2023-09-25 16:00:50 +08:00
wzq
0c2fd28f15 移除 网络代理 2023-09-22 19:07:04 +08:00
wzq
a2e0e9df53 升级 声网SDK 4.2.2 2023-09-22 18:03:05 +08:00
wzq
9e3ebfa541 升级 声网SDK 4.2.2 2023-09-22 17:27:04 +08:00
wzq
94a0575909 修复 "寻爱之旅"活动页面 UI 以及 余额不足未弹出充值弹窗 2023-09-22 10:20:35 +08:00
wzq
3d161b94e4 修复 "寻爱之旅"活动页面 购买数量问题 2023-09-21 17:50:21 +08:00
wzq
08d9534095 新增 首页房间item PK动画 2023-09-21 16:20:59 +08:00
wzq
ff1cd57d98 修复 首页"优质陪伴"tab UI 问题 2023-09-21 16:02:08 +08:00
wzq
2a57ad3145 增加首页顶部与状态栏之间的间距 2023-09-21 14:17:55 +08:00
wzq
92f2db36ae 修改 首页tab indicator 样式 2023-09-21 12:53:53 +08:00
wushaocheng
362c75f93c [Modify]小时榜和周榜逻辑修改 2023-09-20 18:34:30 +08:00
wzq
b9c3bbdbec 修复 首页tab切换导致SVGA停止播放 2023-09-20 17:56:55 +08:00
wushaocheng
0a24dc66e6 [Modify]更新版本号和寻爱逻辑修改 2023-09-20 17:17:50 +08:00
wushaocheng
ca62822bfb [Modify]首页和夺宝修改 2023-09-20 16:07:17 +08:00
wzq
5db5afa5ed 房间麦位魅力值UI适配 2023-09-20 16:03:45 +08:00
wzq
edad692309 修复 全服飘窗 2023-09-20 14:55:52 +08:00
wzq
23a34434a0 Merge remote-tracking branch 'origin/develop' into develop 2023-09-19 17:20:56 +08:00
wzq
8ad38583ff 新增 充值页 Banner, 个人信息页 "官方代充" 标识 2023-09-19 17:20:08 +08:00
wushaocheng
391fae9006 [Modify]安卓用户头像遮罩去掉 2023-09-19 16:02:23 +08:00
wzq
9854e91fe8 礼物弹窗 礼物标签图片 替换 2023-09-19 15:19:03 +08:00
wzq
d587f1b43d 寻爱飘屏 SVGA 文件替换 2023-09-19 15:01:18 +08:00
wzq
595d3a767a 登录页 默认勾选协议 2023-09-19 14:14:43 +08:00
wzq
4d13cf5e9c 星座 优化 2023-09-19 11:59:01 +08:00
wzq
62ce160dfa 性别图标 替换成 性别+年龄 2023-09-19 11:17:26 +08:00
wzq
c631c1d3a8 新增 H5活动通用飘屏 2023-09-18 15:32:59 +08:00
wushaocheng
27420aa51a [Modify]修改房间背景 2023-09-18 14:12:45 +08:00
wushaocheng
12c5344d72 [Modify]安卓用户头像遮罩去掉 2023-09-18 11:57:33 +08:00
wushaocheng
a716136090 [Modify]安卓13适配和谷歌充值页面加loading 2023-09-18 11:49:27 +08:00
wushaocheng
f860c96887 [Modify]安卓13适配和谷歌充值页面加loading 2023-09-18 11:49:23 +08:00
wushaocheng
873ecf1d2b [Modify]安卓13适配和谷歌充值页面加loading 2023-09-18 11:45:51 +08:00
wushaocheng
957b64476f [Modify]安卓13适配和谷歌充值页面加loading 2023-09-18 11:43:25 +08:00
wzq
306e0a99a0 [Modify]幸运塔罗新增公屏通知, 飘屏 2023-09-15 18:31:57 +08:00
wushaocheng
bfd619e8b5 [Modify]寻爱之旅完善 2023-09-15 17:44:07 +08:00
wushaocheng
4c0184c80b [Modify]寻爱之旅完善 2023-09-15 17:14:02 +08:00
wushaocheng
aeb47da0ee [Modify]首页逻辑调整 2023-09-14 15:56:38 +08:00
wushaocheng
d99ef80d2e [Modify]夺宝精灵和尋愛邏輯修改 2023-09-13 20:46:29 +08:00
wushaocheng
77dcc9d117 [Modify]夺宝精灵逻辑修改 2023-09-13 15:22:10 +08:00
wushaocheng
a7f17276c5 [Modify]夺宝精灵的精灵分解和精灵试炼功能完善 2023-09-12 18:59:35 +08:00
wushaocheng
63f1e02c6f [Modify]夺宝精灵修改 2023-09-12 10:03:24 +08:00
wushaocheng
5c6657c538 [Modify]增加fir渠道 2023-09-08 16:30:12 +08:00
wushaocheng
7548b4174a [Modify]夺宝精灵功能修改 2023-09-08 11:55:52 +08:00
wushaocheng
068172bbd2 [Modify]首页ui和接口修改 2023-09-07 11:40:19 +08:00
wushaocheng
0dda893e1f [Modify]声网sdk修改成新的集成方式,避免模拟器的崩溃 2023-09-07 10:40:37 +08:00
wushaocheng
928857f97d [Modify]优质陪伴页面修改 2023-09-06 15:10:15 +08:00
wushaocheng
46a2dab191 [Modify]优质陪伴页面修改 2023-09-05 18:43:27 +08:00
wushaocheng
877c3d9361 [Modify]游戏房接入 2023-09-05 14:29:57 +08:00
wushaocheng
ef8ca0b939 [Modify]首页修改 2023-09-05 11:31:04 +08:00
wushaocheng
50a20f7822 [Modify]热门推荐修改 2023-09-04 15:23:34 +08:00
wushaocheng
9cc59dd275 [Modify]首页修改 2023-09-04 10:37:38 +08:00
wushaocheng
1ac47c055d [Modify]腾讯trtc修改 2023-09-02 15:39:31 +08:00
wushaocheng
24f1437418 [Modify]facebook参数修改 2023-09-01 16:11:49 +08:00
wushaocheng
f794fe960f [Modify]facebook登录修改 2023-08-29 18:19:10 +08:00
wushaocheng
282036bb20 [Modify]修复线上bug 2023-08-25 20:41:03 +08:00
wushaocheng
ffab260d6a [Modify]修复线上bug 2023-08-18 15:42:09 +08:00
wushaocheng
8c47c3e717 [Modify]修復測試提的bug 2023-08-16 23:57:28 +08:00
wushaocheng
c36f127bce [Modify]登錄功能修改和房間内送禮飄屏隱藏 2023-08-16 18:27:33 +08:00
wushaocheng
d46ec289ea [Modify]隐私政策弹窗移除 2023-08-16 17:19:15 +08:00
wushaocheng
a9405eb8f8 [BugFix]登录功能bug修复 2023-08-16 16:57:57 +08:00
wushaocheng
f5d3f45001 [Modify]登录页面功能修改 2023-08-15 20:29:35 +08:00
wushaocheng
49f2764344 [BugFix]修复生日小于1902的崩溃 2023-08-15 14:30:18 +08:00
wushaocheng
e2a477bd0d [BugFix]修复生日小于1902的崩溃 2023-08-15 14:26:25 +08:00
wushaocheng
0cc24f4adf [BugFix]修复firebase上1.9.6的崩溃 2023-08-15 11:55:53 +08:00
wushaocheng
44e918bd68 [Modify]facebook接入 2023-08-14 12:27:53 +08:00
wushaocheng
cc21e2969a [Modify]登录功能修改 2023-08-14 12:24:32 +08:00
wushaocheng
cbe2234c83 [Modify]公会页面图标修改 2023-08-10 19:00:52 +08:00
wushaocheng
68e091131d [Modify]公会图片高斯模糊 2023-08-10 18:28:16 +08:00
wushaocheng
346b535757 [Modify]修復公會數據和trtc的bug 2023-08-10 17:32:10 +08:00
wushaocheng
a16a918d06 [Modify]去掉房间id 2023-08-09 16:16:48 +08:00
wushaocheng
d3b6a16db9 [Modify]修改礼物弹窗逻辑 2023-08-09 15:22:29 +08:00
wushaocheng
c34e8b034d [Modify]修改公会数据页面 2023-08-09 11:42:35 +08:00
wushaocheng
d2b0e904c8 [Modify]1.9.5修改peko为piko 2023-08-09 10:20:00 +08:00
wushaocheng
b57e7afb6d [Modify]修复firebase上面的崩溃 2023-08-08 18:59:58 +08:00
wushaocheng
edcabd157d [Modify]去掉房间内的送礼飘屏 2023-08-08 15:25:39 +08:00
wushaocheng
384831effa [Modify]腾讯trtc预埋 2023-08-08 14:43:03 +08:00
wushaocheng
f8f0c2c59b [Modify]公会数据逻辑补全 2023-08-08 14:14:20 +08:00
wushaocheng
96e3c65f2f [Modify]公会数据页面修改 2023-08-07 10:52:12 +08:00
wushaocheng
d8c1a89005 [Modify]修改版本号为1.9.4 2023-07-24 17:49:24 +08:00
wushaocheng
e014e6a6b2 [BugFix]优化BaseDialog判空,周星榜ui调整,夺宝精灵闪退修复 2023-07-24 16:36:56 +08:00
wushaocheng
144fa832f1 [BugFix]优化房间外飘屏高度 2023-07-21 01:08:59 +08:00
wushaocheng
9b7c0cae6b [BugFix]优化飘屏展示逻辑 2023-07-21 00:34:02 +08:00
wushaocheng
f6f79f83dc [BugFix]修复谷歌充值显示问题 2023-07-20 22:42:26 +08:00
wushaocheng
09f0eac2b3 [BugFix]修復飄屏展示邏輯 2023-07-20 21:38:50 +08:00
wushaocheng
951c42592e [BugFix]福袋特效优化 2023-07-20 16:12:37 +08:00
wushaocheng
fdfec8610d [BugFix]修改测试提的bug 2023-07-19 22:03:01 +08:00
wushaocheng
fcf9f65984 [BugFix]修改测试提的bug 2023-07-19 20:16:50 +08:00
wushaocheng
2ef89535d5 [Modify]修改福袋礼物面板问题 2023-07-18 20:57:13 +08:00
wushaocheng
f742102a60 [Modify]全服玩法飘屏逻辑 2023-07-18 19:13:28 +08:00
wushaocheng
eb73898872 [BugFix]80级进场飘屏样式调整 2023-07-18 11:07:30 +08:00
wushaocheng
122f2d374f [Modify]兑换钻石放开 2023-07-17 19:06:35 +08:00
wushaocheng
7adefe8375 [Modify]礼物面板改造 2023-07-17 19:00:54 +08:00
wushaocheng
34b9233825 [Modify]贵族优化 2023-07-14 19:29:50 +08:00
wushaocheng
cd5b1728f8 [Modify]飘屏逻辑优化 2023-07-13 21:13:32 +08:00
wushaocheng
ac53bbd484 [Modify]奪寶精靈優化 2023-07-13 14:16:35 +08:00
wushaocheng
48a096a64a [Modify]礼物面板修改 2023-07-12 19:07:27 +08:00
wushaocheng
0dd0e131f2 [Modify]贵族调起支付增加弹窗 2023-07-12 19:01:11 +08:00
wushaocheng
4999c6e955 [Modify]谷歌充值修改 2023-07-12 16:00:52 +08:00
wushaocheng
259c3e408a [Modify]谷歌充值增加提醒 2023-07-12 15:10:22 +08:00
wushaocheng
58b66848d9 [Modify]版本号改为1.9.0 2023-07-11 16:55:59 +08:00
wushaocheng
bf805afdb5 [Modify]房间公屏优化 2023-07-11 16:51:38 +08:00
wushaocheng
a1221fa5a5 [Modify]修改为1.8.5 2023-06-07 19:55:57 +08:00
wushaocheng
7515f50095 [Modify]寻爱之旅消耗钻石改为可配置 2023-06-07 15:21:31 +08:00
4719 changed files with 56492 additions and 26498 deletions

BIN
ananplay.jks Normal file

Binary file not shown.

View File

@@ -26,7 +26,7 @@ dependencies {
api 'androidx.annotation:annotation:1.4.0'
api 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "androidx.core:core-ktx:1.7.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
repositories {
mavenCentral()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 B

View File

@@ -1,8 +1,7 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
//apply plugin: 'com.google.gms.google-services'
//apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.tencent.vasdolly'
apply from: '../mob.gradle'
@@ -12,7 +11,7 @@ android {
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
defaultConfig {
applicationId "com.vele.pekolive"
applicationId "com.vele.habuplay"
minSdkVersion MIN_SDK_VERSION.toInteger()
targetSdkVersion TARGET_SDK_VERSION.toInteger()
versionCode Integer.valueOf(version_code)
@@ -21,18 +20,18 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk {
//设置支持的SO库架构
if (onlyArm64) {
abiFilters "arm64-v8a"
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
flavorDimensions 'default'
manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
// manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
}
splits {
abi {
enable true
reset()
include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
universalApk true
}
}
bundle {
@@ -48,20 +47,29 @@ android {
}
//在apk文件后边生成版本号信息
android.applicationVariants.all {
variant ->
variant.outputs.all {
def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
outputFileName = "peko_${buildType.name}_v${defaultConfig.versionName}-${date}.apk"
android.applicationVariants.configureEach { variant ->
variant.outputs.configureEach { output ->
def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
def outputFile = output.outputFile
if (outputFile == null || !outputFile.name.endsWith('.apk')) {
return
}
def abi = output.getFilter(com.android.build.OutputFile.ABI)
if (abi == null) {
abi = "universal"
}
outputFileName = "habu_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
}
}
lintOptions {
lint {
abortOnError false
disable 'MissingTranslation'
disable 'ExtraTranslation'
disable 'MissingTranslation', 'ExtraTranslation', 'ContentDescription', 'SmallSp'
}
dataBinding {
enabled = true
}
@@ -73,19 +81,19 @@ android {
signingConfigs {
v2 {
storeFile file('../pekolive.jks')
storePassword "peko2023"
keyAlias "pekolive"
keyPassword "peko2023"
storeFile file('../ananplay.jks')
storePassword "vele2021"
keyAlias "ananplay"
keyPassword "vele2021"
v2SigningEnabled true
v1SigningEnabled true
}
v1 {
storeFile file('../pekolive.jks')
storePassword "peko2023"
keyAlias "pekolive"
keyPassword "peko2023"
storeFile file('../ananplay.jks')
storePassword "vele2021"
keyAlias "ananplay"
keyPassword "vele2021"
v2SigningEnabled false
v1SigningEnabled true
}
@@ -139,19 +147,23 @@ android {
}
buildTypes {
def server_url_debug = '"http://beta.api.anan.chat/"'
def server_url_release = '"https://api.anan.chat/"'
debug {
ext.enableCrashlytics = false
ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
println("minifyEnabled = " + minify_enabled)
buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\""
// ext.enableCrashlytics = false
// ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
buildConfigField "String", "BASE_URL", server_url_debug
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
minifyEnabled false // 是否混淆
buildConfigField "String", "BASE_URL_RELEASE", server_url_release
minifyEnabled minify_enabled.toBoolean() // 是否混淆
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
crunchPngs false // 停用 PNG 压缩
signingConfig signingConfigs.v2
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
gradle.taskGraph.whenReady {
tasks.each { task ->
if (task.name.contains("Test") || task.name.contains("Lint")) {
@@ -164,12 +176,12 @@ android {
release {
ext.enableCrashlytics = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
ext.alwaysUpdateBuildId = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
firebaseCrashlytics {
//Firebase Crashlytics控制上传混淆文件开关
mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
}
// firebaseCrashlytics {
// //Firebase Crashlytics控制上传混淆文件开关
// mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
// }
buildConfigField "String", "BASE_URL", "\"https://api.pekolive.com/\""
buildConfigField "String", "BASE_URL", server_url_release
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
@@ -203,6 +215,9 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
@@ -270,15 +285,15 @@ dependencies {
implementation 'com.github.zhpanvip:BannerViewPager:3.5.6'
//fireBase
implementation platform('com.google.firebase:firebase-bom:31.1.1')
implementation 'com.google.firebase:firebase-crashlytics-ktx'
implementation 'com.google.firebase:firebase-analytics-ktx'
// implementation platform('com.google.firebase:firebase-bom:31.1.1')
// implementation 'com.google.firebase:firebase-crashlytics-ktx'
// implementation 'com.google.firebase:firebase-analytics-ktx'
//Adjust接入
implementation 'com.adjust.sdk:adjust-android:4.33.0'
implementation 'com.android.installreferrer:installreferrer:2.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.0'
// implementation 'com.android.installreferrer:installreferrer:2.2'
// Add the following if you are using the Adjust SDK inside web views on your app
implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
// implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
implementation 'com.github.yalantis:ucrop:2.2.7'
@@ -287,6 +302,7 @@ dependencies {
//wheelView
implementation 'com.contrarywind:wheelview:4.1.0'
implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
}
channel {
@@ -294,7 +310,7 @@ channel {
outputDir = new File(project.buildDir, "channelapk")
//多渠道包的命名规则,默认为:${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
def only64 = onlyArm64 ? "-only64" : ""
apkNameFormat = 'peko-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
apkNameFormat = 'habu-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
//快速模式生成渠道包时不进行校验速度可以提升10倍以上默认为false
fastMode = false
//buildTime的时间格式默认格式yyyyMMdd-HHmmss

View File

@@ -1,39 +0,0 @@
{
"project_info": {
"project_number": "656602722869",
"project_id": "pekolive-30f9e",
"storage_bucket": "pekolive-30f9e.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
"android_client_info": {
"package_name": "com.vele.pekolive"
}
},
"oauth_client": [
{
"client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}

Binary file not shown.

View File

@@ -99,35 +99,37 @@
-keep class android.support.v7.** { *;}
#----------------EventBus事件巴士-----------------
-keepclassmembers class ** {
-keepattributes *Annotation*
-keepclassmembers class * {
@org.greenrobot.eventbus.Subscribe <methods>;
}
-keep enum org.greenrobot.eventbus.ThreadMode { *; }
# Only required if you use AsyncExecutor
-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
<init>(Java.lang.Throwable);
# If using AsyncExecutord, keep required constructor of default event used.
# Adjust the class name if a custom failure event type is used.
-keepclassmembers class org.greenrobot.eventbus.util.ThrowableFailureEvent {
<init>(java.lang.Throwable);
}
# Accessed via reflection, avoid renaming or removal
-keep class org.greenrobot.eventbus.android.AndroidComponentsImpl
#-------------云信相关的混淆配置------------
-dontwarn com.netease.**
-keep class com.netease.** {*;}
# Presenter 相关
-keep class com.yizhuan.erban.base.** { *; }
-keep public class * extends com.yizhuan.erban.base.BaseMvpPresenter
-keep class com.yizhuan.habu.base.** { *; }
-keep public class * extends com.yizhuan.habu.base.BaseMvpPresenter
-keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
# 云信自定义 ViewHolder 配置
-dontwarn com.yizhuan.erban.ui.im.recent.holder.**
-keep class com.yizhuan.erban.ui.im.recent.holder.** {*;}
-keep class com.yizhuan.erban.ui.im.chat.** {*;}
-keep class com.yizhuan.erban.luckymoney.viewholder.** {*;}
-keep class com.yizhuan.erban.share.viewholder.** {*;}
-keep class com.yizhuan.erban.public_chat_hall.msg.viewholder.** {*;}
-keep class com.yizhuan.erban.module_hall.im.msgholder.** {*;}
-keep class com.yizhuan.tutu.mentoring_relationship.viewholder.** {*;}
-dontwarn com.yizhuan.habu.ui.im.recent.holder.**
-keep class com.yizhuan.habu.ui.im.recent.holder.** {*;}
-keep class com.yizhuan.habu.ui.im.chat.** {*;}
-keep class com.yizhuan.habu.luckymoney.viewholder.** {*;}
-keep class com.yizhuan.habu.share.viewholder.** {*;}
-keep class com.yizhuan.habu.public_chat_hall.msg.viewholder.** {*;}
-keep class com.yizhuan.habu.module_hall.im.msgholder.** {*;}
-keep class com.yizhuan.habu.mentoring_relationship.viewholder.** {*;}
-keep public class * extends com.netease.nim.uikit.common.ui.recyclerview.holder.RecyclerViewHolder {*;}
-keep public class * extends com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase {*;}
@@ -199,8 +201,8 @@
<init>(...);
}
-dontwarn com.yizhuan.erban.bindadapter.**
-keep class com.yizhuan.erban.bindadapter.** {*;}
-dontwarn com.yizhuan.habu.bindadapter.**
-keep class com.yizhuan.habu.bindadapter.** {*;}
# Ping++ 混淆过滤
-dontwarn com.pingplusplus.**
@@ -233,6 +235,8 @@
-keep class org.json.** {*;}
-dontwarn com.yizhuan.xchat_android_core.**
-keep class com.yizhuan.xchat_android_core.** {*;}
-keep class com.yizhuan.treasure_box.bean.** {*;}
-keep class com.yizhuan.habu.avroom.bean.** {*;}
#百度统计
@@ -306,8 +310,8 @@
-keep class com.autonavi.aps.amapapi.model.**{*;}
#暂时keep这个View排查华为oom问题
-keep class com.yizhuan.erban.avroom.widget.MicroView{*;}
-keep class com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView{*;}
-keep class com.yizhuan.habu.avroom.widget.MicroView{*;}
-keep class com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView{*;}
#linkedMe
-keep class com.microquation.linkedme.android.** { *; }
@@ -365,7 +369,7 @@
-dontwarn com.meizu.cloud.**
-keep class com.meizu.cloud.** {*;}
-keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;}
-keep class com.yizhuan.habu.ui.widget.AppBarLayoutBehavior {*;}
#ViewBinding使用的反射生成的对应Binding
-keepclassmembers class * implements androidx.viewbinding.ViewBinding {

View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban;
package com.yizhuan.habu;
import static org.junit.Assert.assertEquals;
@@ -22,7 +22,7 @@ public class ExampleInstrumentedTest {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("com.yizhuan.erban_android_client", appContext.getPackageName());
assertEquals("com.yizhuan.habu_android_client", appContext.getPackageName());
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 562 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 528 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 550 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 472 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 552 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 518 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 600 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 916 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 974 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 690 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 569 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 456 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 272 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 596 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1006 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 898 B

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.yizhuan.erban">
package="com.yizhuan.habu">
<uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
@@ -51,8 +51,15 @@
tools:node="remove" />
<uses-permission android:name="android.permission.FLASHLIGHT" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.BLUETOOTH" /> <!-- 如果需要实时音视频通话模块,下面的权限也是必须的。否则,可以不加 -->
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- SDK 权限申明, 第三方 APP 接入时,请将 com.netease.nim.demo 替换为自己的包名 -->
@@ -72,6 +79,9 @@
<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
<!-- AppsFlyer需要参考https://dev.appsflyer.com/hc/docs/install-android-sdk#setting-required-permissions -->
<uses-permission android:name="com.google.android.gms.permission.AD_ID" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<!-- 对于 Android 12.0 及以上设备,还需要添加如下权限: -->
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<application
android:name=".application.XChatApplication"
@@ -82,9 +92,11 @@
android:networkSecurityConfig="@xml/network_security_config"
android:resizeableActivity="true"
android:supportsRtl="true"
android:testOnly="false"
android:theme="@style/MyMaterialTheme"
tools:replace="android:name,android:allowBackup"
tools:targetApi="n">
<activity
android:name=".other.activity.SplashActivity"
android:exported="true"
@@ -101,23 +113,23 @@
则需要考虑发起的intent会出现相同应用图标的选择对话框的情况
参考集成文档:https://www.linkedme.cc/docs/page4.html#link1
-->
<intent-filter>
<!-- <intent-filter>-->
<!-- 此处scheme值需要替换为后台设置中的scheme值 -->
<action android:name="android.intent.action.VIEW" />
<!-- &lt;!&ndash; 此处scheme值需要替换为后台设置中的scheme值 &ndash;&gt;-->
<!-- <action android:name="android.intent.action.VIEW" />-->
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<!-- <category android:name="android.intent.category.DEFAULT" />-->
<!-- <category android:name="android.intent.category.BROWSABLE" />-->
<data
android:host="main"
android:scheme="pekoapp" />
</intent-filter>
<!-- <data-->
<!-- android:host="main"-->
<!-- android:scheme="pikoapp" />-->
<!-- </intent-filter>-->
</activity>
<meta-data
android:name="firebase_crashlytics_collection_enabled"
android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> <!-- 刘海屏适配 begin -->
<!-- <meta-data-->
<!-- android:name="firebase_crashlytics_collection_enabled"-->
<!-- android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
<!-- 小米 -->
<activity
android:name="com.soundcloud.android.crop.CropImageActivity"
@@ -150,7 +162,7 @@
如果 SDKOptions 中提供了,取 SDKOptions 中的值。
-->
<activity
android:name="com.vele.pekolive.lineapi.LineAuthenticationCallbackActivity"
android:name="com.vele.habuplay.lineapi.LineAuthenticationCallbackActivity"
android:exported="true"
android:launchMode="singleTask"
android:noHistory="true">
@@ -211,7 +223,7 @@
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="Peko"
android:label="Habu Live"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
@@ -244,12 +256,16 @@
android:label="@string/main_androidmanifest_09"
android:screenOrientation="portrait" />
<activity
android:name="com.yizhuan.tutu.music.activity.AddLocalMusicListActivity"
android:name=".module_hall.hall.activity.RoomIncomeActivity"
android:label="房间流水"
android:screenOrientation="portrait" />
<activity
android:name="com.yizhuan.habu.music.activity.AddLocalMusicListActivity"
android:label="@string/main_androidmanifest_010"
android:screenOrientation="portrait"
android:theme="@style/AVRoomTheme" />
<activity
android:name="com.yizhuan.tutu.music.activity.MusicListActivity"
android:name="com.yizhuan.habu.music.activity.MusicListActivity"
android:label="@string/main_androidmanifest_011"
android:launchMode="singleTop"
android:screenOrientation="portrait"
@@ -634,7 +650,7 @@
android:name=".module_hall.team.activity.HTeamMemberListActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity"
android:name="com.yizhuan.habu.mentoring_relationship.activity.MentoringRelationshipActivity"
android:label="@string/main_androidmanifest_030"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustResize" />
@@ -643,26 +659,26 @@
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
android:name="com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity"
android:theme="@style/room_message_activity" />
<activity
android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
android:name="com.yizhuan.habu.room_chat.activity.RoomMsgActivity"
android:theme="@style/room_message_activity" />
<activity
android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity"
android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieActivity"
android:theme="@style/room_message_activity" />
<activity
android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity"
android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieMessageActivity"
android:theme="@style/room_message_activity" />
<activity
android:name="com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity"
android:name="com.yizhuan.habu.room_chat.activity.RoomInviteFansActivity"
android:theme="@style/room_message_activity" />
<activity
android:name="com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity"
android:name="com.yizhuan.habu.room_chat.activity.NimTeamRoomMessageActivity"
android:screenOrientation="portrait"
android:theme="@style/room_message_activity" />
<activity
android:name="com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity"
android:name="com.yizhuan.habu.room_chat.activity.NimHallTeamRoomMessageActivity"
android:screenOrientation="portrait"
android:theme="@style/room_message_activity" />
<activity
@@ -747,7 +763,7 @@
android:name=".bank_card.activity.AddBankCardAgreementActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity"
android:name="com.yizhuan.habu.sadmin.RoomSAdminManagerActivity"
android:screenOrientation="portrait" />
<activity
android:name=".home.activity.CommunityNoticeAct"
@@ -969,15 +985,14 @@
android:screenOrientation="portrait" />
<activity
android:name=".treasurefairy.HomeFairyActivity"
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:theme="@style/dialog_web_view_activity" />
android:theme="@style/transparent_activity" />
<activity
android:name=".ui.webview.FairyDialogWebViewActivity"
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:theme="@style/dialog_web_view_activity" />
android:theme="@style/transparent_activity" />
<meta-data
android:name="notch.config"
@@ -1001,6 +1016,10 @@
android:name="flutterEmbedding"
android:value="2" />
<meta-data
android:name="Mob-Https"
android:value="yes" />
<provider
android:name="com.netease.nimlib.ipc.NIMContentProvider"
android:authorities="${applicationId}.ipc.provider"
@@ -1018,8 +1037,7 @@
android:name="com.netease.nimlib.service.NimReceiver"
android:exported="false"
android:process=":core"
tools:node="remove">
</receiver>
tools:node="remove"></receiver>
<receiver android:name="com.netease.nimlib.service.ResponseReceiver" />
<receiver
android:name=".reciever.IncomingCallReceiver"
@@ -1029,6 +1047,7 @@
</intent-filter>
</receiver>
<receiver android:name=".reciever.NotificationClickReceiver" />
<service
android:name="com.netease.nimlib.service.NimService"
android:process=":core" />
@@ -1043,6 +1062,9 @@
<service
android:name=".service.DaemonService"
android:enabled="true" />
<activity android:name=".avroom.room_album.RoomAlbumActivity" />
</application>
</manifest>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More