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

488 Commits

Author SHA1 Message Date
khy
da20b817d2 快传成绩单 - 热点优化 2017-02-24 15:11:00 +08:00
khy
ef1f2251b5 快传增加连接动画 安装包清理优化遍历apk方法防止内存溢出， 页面优化 2017-02-22 10:17:54 +08:00
khy
045c1e0305 快传优化以及增加传完继续传的功能， 增加8个默认头像（未与服务器交互） 2017-02-15 19:01:24 +08:00
khy
cb54d87daf 快传（接收方图片缩略图尚需改进， 连接断开处理尚需改进），安装包清理， 网页传网页乱码未解决 2017-02-10 10:33:09 +08:00
khy
575ba33e43 分享光环（普通分享和热点网页分享） 2017-02-07 17:06:32 +08:00
khy
30bb750d94 解决搜索页面点下载软键盘不发收起来问题 2017-01-25 10:10:12 +08:00
huangzhuanghua
c045d4e2cc Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 
Conflicts:
	app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java
 2017-01-20 17:14:07 +08:00
huangzhuanghua
b2d568d646 entrance检查与统一 2017-01-20 17:11:03 +08:00
khy
22c2b47506 解决更新游戏平台不显示问题，我的光环已安装列表文案不匹配问题 2017-01-20 16:41:56 +08:00
khy
2ddaf3ee66 修复弹窗文案显示不全问题和游戏检查更新接口拼凑错误问题 2017-01-19 15:18:07 +08:00
khy
d4dbee023e Merge remote-tracking branch 'origin/2.3' into 2.3 2017-01-17 11:06:35 +08:00
khy
560c34afed 首页专题模块不盖住轮播图 2017-01-17 11:06:08 +08:00
huangzhuanghua
b3fc66f6b9 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 2017-01-16 12:28:43 +08:00
huangzhuanghua
0ca70316dc findviewbyid简化 2017-01-16 12:28:15 +08:00
huangzhuanghua
dd0f475944 换一换算法修复 2017-01-16 12:27:12 +08:00
khy
80bb4a1888 礼包验证切换正式接口 2017-01-13 11:17:21 +08:00
khy
d7e72a96f9 领取礼包增加验证 2017-01-12 19:51:06 +08:00
khy
e552987663 .... 2017-01-11 18:15:37 +08:00
khy
33dea97475 Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/java/com/gh/common/util/LibaoUtils.java
 2017-01-11 18:11:26 +08:00
khy
4cbaae1567 礼包提示文案修改 2017-01-11 18:07:02 +08:00
huangzhuanghua
a8a9e58fe9 Response的onFailure参数修改为HttpException 2017-01-11 12:00:20 +08:00
khy
93ec154b7e Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/java/com/gh/common/util/ConcernUtils.java
 2017-01-09 17:54:16 +08:00
khy
ed71d3e348 优化汇总（20170106），礼包相关优化补充（20170104）， 快速点击弹窗按钮可能会出现卡死 2017-01-09 17:51:38 +08:00
huangzhuanghua
62fb61a8bb 优化网络劫持检测机制 2017-01-09 17:34:56 +08:00
huangzhuanghua
de75e67de7 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 2017-01-09 11:53:41 +08:00
huangzhuanghua
4fc10d360a 跳转修改 2017-01-09 11:53:13 +08:00
khy
40615976e1 Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/res/layout/game_normal_item.xml
 2017-01-04 16:33:40 +08:00
khy
c6bd428c46 专题入口界面调整 2017-01-04 16:32:32 +08:00
huangzhuanghua
1e077a7b0c Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 
Conflicts:
	app/src/main/java/com/gh/base/GHPushMessageReceiver.java
	app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
	app/src/main/java/com/gh/common/util/PostCommentUtils.java
	app/src/main/java/com/gh/gamecenter/MainActivity.java
	app/src/main/res/layout/fragment_personal.xml
	app/src/main/res/layout/game_test_item.xml
 2017-01-04 16:26:10 +08:00
huangzhuanghua
659d6fc263 项目修改与整理 2017-01-04 16:16:34 +08:00
khy
d56fa926d2 issues 优化汇总（20161230）， 文章详情加强评论功能，礼包功能补充（20161226） + 新增活跃的统计（未完成） 2017-01-04 15:32:10 +08:00
huangzhuanghua
321121d5ef 修改getToken 2016-12-30 09:24:54 +08:00
huangzhuanghua
a50b4ba041 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 
Conflicts:
	app/src/main/java/com/gh/common/util/LibaoUtils.java
 2016-12-30 09:24:11 +08:00
huangzhuanghua
94b4d730e3 修改getToken逻辑 2016-12-29 17:50:12 +08:00
khy
f4a946f5e2 解决本次合并冲突 2016-12-29 15:15:09 +08:00
khy
23a062abea Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/java/com/gh/common/util/LibaoUtils.java
#	app/src/main/java/com/gh/gamecenter/db/info/LibaoInfo.java
#	app/src/main/java/com/gh/gamecenter/entity/GiftEntity.java
#	app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
#	app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
 2016-12-29 14:53:21 +08:00
khy
986f67adf6 新闻详情增加评论列表 游戏列表增加礼包标识 2016-12-29 14:35:44 +08:00
huangzhuanghua
419a4d830f 重命名gift为libao 2016-12-29 11:35:32 +08:00
huangzhuanghua
814daa5d3c 添加libao.ghzhushou.com域名 2016-12-29 10:28:33 +08:00
khy
308bd369bc Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	PushSDK/build/intermediates/bundles/debug/AndroidManifest.xml
#	PushSDK/build/intermediates/bundles/debug/aapt/AndroidManifest.xml
#	PushSDK/build/intermediates/bundles/release/AndroidManifest.xml
#	PushSDK/build/intermediates/bundles/release/aapt/AndroidManifest.xml
#	PushSDK/build/intermediates/bundles/release/classes.jar
#	PushSDK/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
#	PushSDK/build/intermediates/res/resources-debug-androidTest.ap_
#	PushSDK/build/outputs/aar/PushSDK-debug.aar
#	PushSDK/build/outputs/aar/PushSDK-release.aar
 2016-12-28 10:24:29 +08:00
khy
80670a9c4b 界面优化 友盟增加so 2016-12-28 10:20:10 +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
khy
3ebbb27c3a Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/gh/common/util/GiftUtils.java
 2016-12-23 16:34:51 +08:00
khy
8e9cf4603c 增加安装指引 2016-12-23 16:28:06 +08:00
khy
c9147dc64d Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	.idea/modules.xml
 2016-12-23 11:57:31 +08:00
khy
aabca8f771 添加友盟推送，升级小米推送 2016-12-23 11:56:02 +08:00
huangzhuanghua
e2e4f53d3e 针对助手2.3版本关注数据的迁移 2016-12-23 11:22:57 +08:00