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

app

Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3

2016-12-26 16:13:24 +08:00

gradle/wrapper

集成热更

2016-05-10 15:09:50 +08:00

PushSDK

...

2016-12-26 15:55:15 +08:00

.gitignore

推送消息跳转

2016-12-26 15:31:21 +08:00

build.gradle

集成热更

2016-05-10 15:09:50 +08:00

gradle.properties

提交项目

2016-04-25 11:19:01 +08:00

gradlew

提交项目

2016-04-25 11:19:01 +08:00

gradlew.bat

提交项目

2016-04-25 11:19:01 +08:00

settings.gradle

添加友盟推送，升级小米推送

2016-12-23 11:56:02 +08:00

Description

光环助手Android

233 MiB

Languages

Kotlin 79.3%

Java 20.1%

Shell 0.3%

JavaScript 0.2%

Groovy 0.1%