Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
492 Commits 121 Branches 327 Tags
94b4d730e384383118927295e514a28ee5515df0
Commit Graph

117 Commits

Author SHA1 Message Date
huangzhuanghua
94b4d730e3 修改getToken逻辑 2016-12-29 17:50:12 +08:00
huangzhuanghua
419a4d830f 重命名gift为libao 2016-12-29 11:35:32 +08:00
huangzhuanghua
c01db35297 同步2.2修改 2016-12-26 17:04:24 +08:00
huangzhuanghua
e8cbbbb4bc Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 
Conflicts:
	PushSDK/build/intermediates/bundles/debug/classes.jar
	PushSDK/build/intermediates/bundles/release/classes.jar
	PushSDK/build/intermediates/incremental/mergeAssets/androidTest/debug/merger.xml
	PushSDK/build/intermediates/incremental/mergeAssets/debug/merger.xml
	PushSDK/build/intermediates/incremental/mergeAssets/release/merger.xml
	PushSDK/build/intermediates/incremental/mergeResourcesandroidTest/debug/merger.xml
	PushSDK/build/intermediates/incremental/packageResourcesdebug/merger.xml
	PushSDK/build/intermediates/incremental/packageResourcesrelease/merger.xml
	PushSDK/build/intermediates/mockable-android-22.jar
	PushSDK/build/intermediates/res/resources-debug-androidTest.ap_
	PushSDK/build/outputs/aar/PushSDK-debug.aar
	PushSDK/build/outputs/aar/PushSDK-release.aar
 2016-12-26 16:13:24 +08:00
huangzhuanghua
f2500aeb6e 推送消息跳转 2016-12-26 15:31:21 +08:00
khy
0df714b9ea 合并优化 2016-12-23 16:53:09 +08:00
huangzhuanghua
e2e4f53d3e 针对助手2.3版本关注数据的迁移 2016-12-23 11:22:57 +08:00
huangzhuanghua
4b2e3d876b 阴影添加，对接v1d1的user.ghzhushou.com接口 2016-12-23 11:00:40 +08:00
huangzhuanghua
46668e32f6 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 
Conflicts:
	app/src/main/java/com/gh/gamecenter/MainActivity.java
 2016-12-21 17:20:23 +08:00
khy
3f98bcea33 优化礼包模块 2016-12-21 10:41:48 +08:00
huangzhuanghua
920bacd5aa 修改HomeFragment 2016-12-14 10:59:35 +08:00
huangzhuanghua
f05f95dc41 切换CountDownLatch用Observable.merge 2016-12-13 15:30:02 +08:00
huangzhuanghua
e29741cf17 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 
Conflicts:
	app/src/main/java/com/gh/gamecenter/MainActivity.java
	app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java
 2016-12-12 16:54:45 +08:00
huangzhuanghua
3cbc850d12 项目整理 2016-12-12 16:34:19 +08:00
khy
3b5f921c01 首页改版, 游戏专题优化(游戏主页actionbar下载数没同步) 2016-12-09 18:33:23 +08:00
huangzhuanghua
c7ceb5cf82 去除volley 2016-12-05 18:43:58 +08:00
khy
3d82162b4d 修复平台名字为null问题 2016-12-02 17:39:21 +08:00
khy
0fcf70a2bf Merge remote-tracking branch 'origin/2.2' into 2.2 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
#	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
 2016-11-30 10:39:35 +08:00
khy
68f8bee146 文章详情增加评论入口 2016-11-30 10:29:35 +08:00
huangzhuanghua
21f1a161c9 Merge branch '2.2' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.2 
Conflicts:
	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
 2016-11-29 10:59:15 +08:00
huangzhuanghua
a31d2cd28b 去除volley 中TAG的滥用导致无法重复加载同一url，项目整理 2016-11-29 10:49:45 +08:00
huangzhuanghua
c2f2672421 增加跳转意见反馈页面带content参数 2016-11-28 17:25:53 +08:00
huangzhuanghua
f77a4eb3cb 删除静态searchHint的使用 2016-11-28 11:22:57 +08:00
khy
2dabd5492f 版本更新推送增加了一个“从不”的选项，修复微信好友分享不能扫描二维码问题 2016-11-24 17:19:23 +08:00
khy
64827028b5 接入微博分享官方SDK 2016-11-24 11:14:53 +08:00
huangzhuanghua
3273e9879b 。。。 2016-11-21 18:47:47 +08:00
huangzhuanghua
9c8898faa4 Merge branch '2.2' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.2 
Conflicts:
	app/src/main/java/com/gh/common/util/PostCommentUtils.java
	app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
	app/src/main/java/com/gh/gamecenter/entity/UserEntity.java
 2016-11-21 18:45:44 +08:00
huangzhuanghua
0ed314ed81 文件修改整理 2016-11-21 18:29:36 +08:00
khy
aeb5346606 消息相关优化汇总1120（3,6未完成） 2016-11-21 18:27:08 +08:00
huangzhuanghua
b2a7de0a72 去掉viewMap，在实体中添加views解决 
修复部分问题
 2016-11-16 19:13:40 +08:00
huangzhuanghua
9a17352156 Merge branch '2.2' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.2 
Conflicts:
	app/src/main/java/com/gh/common/util/PostCommentUtils.java
 2016-11-16 14:28:56 +08:00
huangzhuanghua
d74d91532b 添加网页跳转助手支持 2016-11-16 11:44:33 +08:00
khy
b6797131e7 Merge remote-tracking branch 'origin/2.2' into 2.2 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
#	app/src/main/java/com/gh/gamecenter/news/NewsConcernViewHolder.java
#	app/src/main/res/layout/news_digest_item.xml
 2016-11-16 10:11:25 +08:00
khy
20a5f25901 评论和分享优化， 设置增加“自动关注”的开关选项 2016-11-16 09:19:02 +08:00
huangzhuanghua
6ccc3e5cc6 添加首页轮播图数据统计 2016-11-14 19:01:27 +08:00
huangzhuanghua
54f2959d6a 提取DATA_HOST 2016-11-07 11:25:56 +08:00
huangzhuanghua
4c3a5492c7 去除Hotfix热更模块 2016-11-04 16:51:09 +08:00
khy
7862426144 光环助手更新数据统计 2016-11-01 09:59:03 +08:00
huangzhuanghua
6e196262a5 10.31 push 2016-10-31 09:57:59 +08:00
huangzhuanghua
11abd6d60f 下载事件统计，添加该游戏已安装数 2016-10-28 11:23:42 +08:00
huangzhuanghua
cb3c3eb046 更新提示Dialog 修改 2016-10-27 11:45:26 +08:00
huangzhuanghua
ab9a8fd106 修改错误上传逻辑，修改第一次启动判断字段 2016-10-26 10:54:43 +08:00
huangzhuanghua
2954260722 合并 2016-10-25 18:44:01 +08:00
huangzhuanghua
4471d95482 文件整理，删除无用资源 2016-10-25 16:39:11 +08:00
khy
c2cf64dfa0 Merge remote-tracking branch 'origin/2.1' into 2.1 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
 2016-10-25 14:56:42 +08:00
khy
719177b816 初始化关注 2016-10-25 14:50:14 +08:00
huangzhuanghua
f3ee2d2cf0 添加downloadOffText，检查下载上传数据是否完整 2016-10-25 09:32:39 +08:00
huangzhuanghua
24238acf0e 检查for循环中的remove，检查response的length ！= 0 2016-10-21 16:44:40 +08:00
khy
385d9155f7 Merge remote-tracking branch 'origin/2.1' into 2.1 2016-10-21 16:09:46 +08:00
khy
6eaef8388b 切换Fresco框架 2016-10-21 16:09:06 +08:00