|
|
f6c82dd767
|
Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev
|
2017-07-21 18:21:16 +08:00 |
|
|
|
f88205f957
|
消息页面入口移到我的光环
|
2017-07-21 18:19:59 +08:00 |
|
|
|
3a0a4726b9
|
fix host and gradle vars
|
2017-07-21 10:11:30 +08:00 |
|
|
|
a113fc1c73
|
优化登录流程，修复２．６已知的ＢＵＧ
|
2017-07-20 18:04:38 +08:00 |
|
|
|
92d122b0a3
|
Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev
|
2017-07-19 11:24:15 +08:00 |
|
|
|
d96a2d22e0
|
增加收藏页面，优化登录流程
|
2017-07-19 11:21:42 +08:00 |
|
|
|
8d96b9fe7f
|
add init submodule scripts
|
2017-07-19 10:25:17 +08:00 |
|
|
|
fdf7bdd64d
|
修改用户信息（更换头像未完成）
|
2017-07-18 15:43:02 +08:00 |
|
|
|
4f4c90f792
|
对接测试登录流程（第三方登录以及手机号码登录）
|
2017-07-18 10:43:38 +08:00 |
|
|
|
f42674ed6f
|
add dev/public host product flavors
v3.0
|
2017-07-14 17:15:05 +08:00 |
|
|
|
e66b697663
|
修改域名为ghzs666
|
2017-07-14 16:45:00 +08:00 |
|
|
|
a21e40a4f1
|
Merge branch '3.0' of gitlab.ghzhushou.com:halo/assistant-android into 3.0
|
2017-07-10 17:03:06 +08:00 |
|
|
|
03dd58ca41
|
..
|
2017-07-10 17:00:41 +08:00 |
|
|
|
6f3827db15
|
Merge branch '3.0' of gitlab.ghzhushou.com:halo/assistant-android into 3.0
# Conflicts:
# app/src/main/java/com/gh/common/util/GetLoginDataUtils.java
# app/src/main/java/com/gh/gamecenter/LoginActivity.java
|
2017-07-10 17:00:22 +08:00 |
|
|
|
fd2b333bc7
|
fix weibo webview proguard
|
2017-07-10 16:37:18 +08:00 |
|
|
|
ba3e882f47
|
微信获取登录数据成功回调，登录模块优化
|
2017-07-10 16:22:13 +08:00 |
|
|
|
b9a80e12a8
|
patch viewpagerfragment for onactivityresult callback
|
2017-07-10 16:07:38 +08:00 |
|
|
|
979ee209dd
|
Merge branch '3.0' of gitlab.ghzhushou.com:halo/assistant-android into 3.0
|
2017-07-10 15:01:39 +08:00 |
|
|
|
10b1380aad
|
1、下载模块部分重构
2、整理actionbar高度问题，测试toolbar，暂时未启用
3、sharedpreference使用default文件
|
2017-07-10 14:35:32 +08:00 |
|
|
|
b239407c25
|
模拟对接登录接口已经登录流程（未完成）
|
2017-07-07 19:31:58 +08:00 |
|
|
|
475221a011
|
debug和release生成对应域名
|
2017-07-07 14:36:15 +08:00 |
|
|
|
658ee78213
|
分离build/release key
|
2017-07-07 10:46:23 +08:00 |
|
|
|
5244fe73ea
|
1、处理release debug build区分
|
2017-07-07 10:43:29 +08:00 |
|
|
|
243e024d1a
|
修复友盟推送初始化异常，ImageUtils代码转换kotlin
|
2017-07-06 19:50:40 +08:00 |
|
|
|
5930996e1c
|
修复插件平台图片（旧版本）无法更新问题， 优化登录
|
2017-07-06 09:10:44 +08:00 |
|
|
|
a05e6917b8
|
更改弹出软键盘时移动布局方法（防止软键盘挡住布局），以适配个别手机计算错误
|
2017-07-05 15:09:51 +08:00 |
|
|
|
d05e9e57c3
|
实体类全部转换成kotlin
|
2017-07-04 17:07:12 +08:00 |
|
|
|
1b88e9c238
|
...
|
2017-07-03 19:51:51 +08:00 |
|
|
|
ce32b8d63a
|
Merge remote-tracking branch 'origin/3.0' into 3.0
|
2017-07-03 10:04:15 +08:00 |
|
|
|
2bc26c9046
|
接入微信登录， 增加个人信息编辑页面，我的光环增加自动检测更新，登录页面增加新老用户切换
|
2017-07-03 09:58:54 +08:00 |
|
|
|
714a64975f
|
1、对下载器任务的状态变化修改
2、对下载器内部的handler的消息屏蔽，pause的修改，剩余download roll未改动。
|
2017-07-02 09:49:21 +08:00 |
|
|
|
7a6354e781
|
Merge remote-tracking branch 'origin/3.0' into 3.0
|
2017-06-30 17:30:03 +08:00 |
|
|
|
5f11c2d0b6
|
接入微信登录， 增加个人信息编辑页面，我的光环增加自动检测更新，登录页面增加新老用户切换
|
2017-06-30 17:29:43 +08:00 |
|
|
|
9c6814482d
|
1、downloadmangeractivity逻辑改动到viewpager fragment
|
2017-06-30 11:44:23 +08:00 |
|
|
|
94a5736939
|
fix data error in gameentity
|
2017-06-29 16:36:27 +08:00 |
|
|
|
bc496d8277
|
update lib
|
2017-06-29 16:00:32 +08:00 |
|
|
|
2b23665cb5
|
fix entity
|
2017-06-29 15:59:36 +08:00 |
|
|
|
1d1c9666dc
|
Merge remote-tracking branch 'origin/3.0' into 3.0
|
2017-06-29 11:27:21 +08:00 |
|
|
|
1b14f3f608
|
微博登录改动
|
2017-06-29 11:27:07 +08:00 |
|
|
|
d370e817c0
|
update lib
|
2017-06-29 11:25:06 +08:00 |
|
|
|
ea4c6c95a1
|
Merge branch '3.0' of gitlab.ghzhushou.com:halo/assistant-android into 3.0
# Conflicts:
# app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java
# app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
# app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
|
2017-06-29 11:23:47 +08:00 |
|
|
|
f97ccd5c5d
|
1、更改部分下载类，未完成
2、@#&@*#
|
2017-06-29 11:17:01 +08:00 |
|
|
|
0b2a672f2d
|
Merge remote-tracking branch 'origin/3.0' into 3.0
# Conflicts:
# app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
|
2017-06-28 18:09:08 +08:00 |
|
|
|
f960b07ee1
|
涉及到用户操作的加上登录验证， 把评论点赞抽离成工具方法
|
2017-06-28 18:06:36 +08:00 |
|
|
|
5cbf06f6a6
|
1、回退umeng push版本到3.1.1
2、catch umeng初始化。
|
2017-06-28 11:06:50 +08:00 |
|
|
|
70ea517a3a
|
update LGLibrary, fix libaodetail entrance
|
2017-06-28 10:12:48 +08:00 |
|
|
|
957305d6f5
|
抽离详情页面下载模块（已完成）
|
2017-06-28 09:53:03 +08:00 |
|
|
|
bbd1d429a6
|
Merge remote-tracking branch 'origin/3.0' into 3.0
|
2017-06-27 16:31:48 +08:00 |
|
|
|
56ba47a844
|
抽离详情页面下载模块（新闻详情已完成）
|
2017-06-27 16:31:27 +08:00 |
|
|
|
8101d394a8
|
fix conflict
|
2017-06-27 16:28:33 +08:00 |
|
