Commit Graph

4579 Commits

Author SHA1 Message Date
a2b86a9e21 Merge remote-tracking branch 'origin/dev' into dev 2020-08-25 17:47:29 +08:00
74882f56ee 完成帖子详情20200825测试的(2, 4~10) 2020-08-25 17:47:19 +08:00
1eb9ec1dd3 光环助手V4.2.0-论坛详情功能20200825测试 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/956 2020-08-25 17:44:49 +08:00
9e95c0cc7e Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev 2020-08-25 17:00:34 +08:00
877238d2d5 光环助手V4.2.0-引导设置“通知管理”(第3期)20200825测试2 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/947 2020-08-25 17:00:30 +08:00
lyr
9c6f69b16a 修改绑定手机无法完成问题 2020-08-25 16:53:14 +08:00
64af456182 补充网页JS调用方法 2020-08-25 16:48:32 +08:00
1a84477700 修改视频评论作者标记显示问题 2020-08-25 16:20:29 +08:00
a0b6285596 修改文章标签详情列表不显示 2020-08-25 15:15:29 +08:00
951c139062 修改我的论坛我的帖子列表不显示 2020-08-25 14:23:00 +08:00
99efcd6bbf 光环助手V4.2.0-论坛详情功能20200824测试 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/956 2020-08-25 11:53:24 +08:00
3482f58b1b Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/entity/ForumEntity.kt
#	app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
2020-08-25 10:07:45 +08:00
6b4f751a16 光环助手V4.2.0-论坛详情功能(1,7,10) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/956 2020-08-25 10:03:26 +08:00
3be1308230 Merge remote-tracking branch 'origin/dev' into dev 2020-08-24 18:27:53 +08:00
b7710cffa3 微调帖子详情样式 2020-08-24 18:27:44 +08:00
lyr
dc4fe89521 账户与安全页底部增加联系客服文案和相应跳转 2020-08-24 18:20:47 +08:00
c33eb6829a 完成游戏详情优化(7,8) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/975 2020-08-24 17:59:21 +08:00
e1793d57eb Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev 2020-08-24 17:28:30 +08:00
cc4c48f718 修改取消论坛后论坛首页数据刷新问题 2020-08-24 17:28:25 +08:00
aa20ed9744 完成自定义栏目的镜像优化 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/963 2020-08-24 16:44:48 +08:00
b6d8688a40 Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev 2020-08-24 16:32:58 +08:00
d1da2bb7fa 光环助手V4.2.0-问答首页优化20200824测试(2,5,6,7) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/955 2020-08-24 16:32:53 +08:00
lyr
7828bce732 新增上传抖音方式登录日志 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/951 2020-08-24 15:38:00 +08:00
026a8d7093 Merge branch 'feature-change-gdt-key' into 'dev'
更换广点通ID https://gitlab.ghzs.com/pm/yunying/-/issues/1249

See merge request halo/assistant-android!24
2020-08-24 14:15:57 +08:00
6a9a29c5ff 更换广点通ID https://gitlab.ghzs.com/pm/yunying/-/issues/1249 2020-08-24 14:14:33 +08:00
lyr
16b4b6cc81 修复专题排行榜滑动卡顿问题 2020-08-24 12:00:20 +08:00
863e570b61 Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev 2020-08-24 11:53:47 +08:00
c9e8408804 修改视频评论作者标记显示错误 2020-08-24 11:53:42 +08:00
31984f1737 基本完成论坛帖子详情功能 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/967 2020-08-24 11:31:53 +08:00
ad2a0debdd 论坛列表数据同步 2020-08-24 09:56:30 +08:00
4c45657092 Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev 2020-08-22 09:57:19 +08:00
5d7fc94d51 优化论坛首页 2020-08-22 09:57:14 +08:00
641b430fe5 优化帖子详情结构 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/967 2020-08-21 18:46:37 +08:00
lyr
e1bb02f4e0 绑定手机号点击"跳过"增加弹窗提示 2020-08-21 18:24:33 +08:00
36fd8cf408 双击论坛tab回到顶部 2020-08-21 15:04:42 +08:00
e48b47b315 处理个人主页论坛列表不显示问题 2020-08-21 14:17:09 +08:00
46935e4cad 补充网页游戏详情用的跳转规则 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/966 2020-08-21 11:45:14 +08:00
b8a6b4baea 处理游戏详情的闪退 2020-08-21 11:42:36 +08:00
8a8f0a95ed 光环助手V4.2.0-视频详情优化(第二期)20200820测试(4,6) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/970 2020-08-21 10:32:52 +08:00
cdbefd2d4f 完成部分帖子详情的功能 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/967 2020-08-20 21:01:40 +08:00
7e79b4e328 基本完成礼仪考试APP端功能 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/945 2020-08-20 19:53:10 +08:00
11dc9f9be0 游戏详情增加论坛Tab 2020-08-20 18:01:27 +08:00
ec255099eb 光环助手V4.2.0-论坛详情功能(9) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/956 2020-08-20 16:21:49 +08:00
64738dceaf 光环助手V4.2.0-论坛详情功能 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/956 2020-08-20 15:40:08 +08:00
7d518696f0 Merge branch 'dev_4.2.0' into dev
# Conflicts:
#	app/src/main/java/com/gh/common/util/EntranceUtils.java
2020-08-20 10:56:44 +08:00
fcd97b66df 光环助手V4.2.0-论坛详情功能 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/956 2020-08-20 10:53:26 +08:00
47f5c3b7c1 缩小保存测试路径的长按区域 2020-08-20 10:33:50 +08:00
498efdf5ea Merge branch 'dev' into 'dev_4.2.0'
# Conflicts:
#   dependencies.gradle
2020-08-20 09:08:12 +08:00
59d6450ded 更改论坛帖子详情的实现方式 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/967 2020-08-19 18:41:47 +08:00
62570aed9e Merge remote-tracking branch 'origin/dev_lyr' into dev_4.2.0
# Conflicts:
#	app/src/main/java/com/gh/common/constant/Constants.java
#	dependencies.gradle
2020-08-19 17:45:17 +08:00