Merge pull request #2 from qluan/master

update readme
douban · Oct 12, 2016 · a1a5bd6 · a1a5bd6
2 parents 958095c + abcd8bf
commit a1a5bd6
Show file tree

Hide file tree

Showing 56 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -26,6 +26,12 @@ Demo 中使用 github 的 raw 文件服务提供一个简单的路由表文件 r
 
 ### 安装
 
+#### gradle
+
+```groovy
+   compile 'com.douban.rexxar:core:0.1.1'
+```
+
 #### [jitpack](https://jitpack.io/)
 
 ```groovy

diff --git a/library/.gitignore → core/.gitignore b/library/.gitignore → core/.gitignore
@@ -1,4 +1,4 @@
 /build
-library.iml
+core.iml
 /local.properties
 /project.properties
diff --git a/library/build.gradle → core/build.gradle b/library/build.gradle → core/build.gradle
diff --git a/library/gradle.properties → core/gradle.properties b/library/gradle.properties → core/gradle.properties
@@ -1,11 +1,11 @@
-PROJ_GROUP=com.douban
-PROJ_VERSION=0.1.0
-PROJ_NAME=rexxar
+PROJ_GROUP=com.douban.rexxar
+PROJ_VERSION=0.1.1
+PROJ_NAME=rexxar-android
 PROJ_WEBSITEURL=https://github.com/douban/rexxar-android
 PROJ_ISSUETRACKERURL=https://github.com/douban/rexxar-android/issues
 PROJ_VCSURL=https://github.com/douban/rexxar-android.git
 PROJ_DESCRIPTION=rexxar-android
-PROJ_ARTIFACTID=rexxar
+PROJ_ARTIFACTID=core
 
 LICENSE_NAME='The Apache Software License, Version 2.0'
 LICENSE_URL='http://www.apache.org/licenses/LICENSE-2.0.txt'

diff --git a/library/proguard-rules.pro → core/proguard-rules.pro b/library/proguard-rules.pro → core/proguard-rules.pro
diff --git a/library/src/main/AndroidManifest.xml → core/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml → core/src/main/AndroidManifest.xml
diff --git a/...ain/java/com/douban/rexxar/Constants.java → ...ain/java/com/douban/rexxar/Constants.java b/...ain/java/com/douban/rexxar/Constants.java → ...ain/java/com/douban/rexxar/Constants.java
diff --git a/...c/main/java/com/douban/rexxar/Rexxar.java → ...c/main/java/com/douban/rexxar/Rexxar.java b/...c/main/java/com/douban/rexxar/Rexxar.java → ...c/main/java/com/douban/rexxar/Rexxar.java
diff --git a/...n/rexxar/resourceproxy/ResourceProxy.java → ...n/rexxar/resourceproxy/ResourceProxy.java b/...n/rexxar/resourceproxy/ResourceProxy.java → ...n/rexxar/resourceproxy/ResourceProxy.java
diff --git a/...exxar/resourceproxy/cache/AssetCache.java → ...exxar/resourceproxy/cache/AssetCache.java b/...exxar/resourceproxy/cache/AssetCache.java → ...exxar/resourceproxy/cache/AssetCache.java
diff --git a/...exxar/resourceproxy/cache/CacheEntry.java → ...exxar/resourceproxy/cache/CacheEntry.java b/...exxar/resourceproxy/cache/CacheEntry.java → ...exxar/resourceproxy/cache/CacheEntry.java
diff --git a/...xxar/resourceproxy/cache/CacheHelper.java → ...xxar/resourceproxy/cache/CacheHelper.java b/...xxar/resourceproxy/cache/CacheHelper.java → ...xxar/resourceproxy/cache/CacheHelper.java
diff --git a/...ar/resourceproxy/cache/HtmlFileCache.java → ...ar/resourceproxy/cache/HtmlFileCache.java b/...ar/resourceproxy/cache/HtmlFileCache.java → ...ar/resourceproxy/cache/HtmlFileCache.java
diff --git a/...an/rexxar/resourceproxy/cache/ICache.java → ...an/rexxar/resourceproxy/cache/ICache.java b/...an/rexxar/resourceproxy/cache/ICache.java → ...an/rexxar/resourceproxy/cache/ICache.java
diff --git a/...ar/resourceproxy/cache/InternalCache.java → ...ar/resourceproxy/cache/InternalCache.java b/...ar/resourceproxy/cache/InternalCache.java → ...ar/resourceproxy/cache/InternalCache.java
diff --git a/...xar/resourceproxy/network/HtmlHelper.java → ...xar/resourceproxy/network/HtmlHelper.java b/...xar/resourceproxy/network/HtmlHelper.java → ...xar/resourceproxy/network/HtmlHelper.java
diff --git a/...exxar/resourceproxy/network/INetwork.java → ...exxar/resourceproxy/network/INetwork.java b/...exxar/resourceproxy/network/INetwork.java → ...exxar/resourceproxy/network/INetwork.java
diff --git a/...ar/resourceproxy/network/NetworkImpl.java → ...ar/resourceproxy/network/NetworkImpl.java b/...ar/resourceproxy/network/NetworkImpl.java → ...ar/resourceproxy/network/NetworkImpl.java
diff --git a/...urceproxy/network/RexxarContainerAPI.java → ...urceproxy/network/RexxarContainerAPI.java b/...urceproxy/network/RexxarContainerAPI.java → ...urceproxy/network/RexxarContainerAPI.java
diff --git a/...oxy/network/RexxarContainerAPIHelper.java → ...oxy/network/RexxarContainerAPIHelper.java b/...oxy/network/RexxarContainerAPIHelper.java → ...oxy/network/RexxarContainerAPIHelper.java
diff --git a/...n/java/com/douban/rexxar/route/Route.java → ...n/java/com/douban/rexxar/route/Route.java b/...n/java/com/douban/rexxar/route/Route.java → ...n/java/com/douban/rexxar/route/Route.java
diff --git a/...com/douban/rexxar/route/RouteFetcher.java → ...com/douban/rexxar/route/RouteFetcher.java b/...com/douban/rexxar/route/RouteFetcher.java → ...com/douban/rexxar/route/RouteFetcher.java
diff --git a/...com/douban/rexxar/route/RouteManager.java → ...com/douban/rexxar/route/RouteManager.java b/...com/douban/rexxar/route/RouteManager.java → ...com/douban/rexxar/route/RouteManager.java
diff --git a/.../java/com/douban/rexxar/route/Routes.java → .../java/com/douban/rexxar/route/Routes.java b/.../java/com/douban/rexxar/route/Routes.java → .../java/com/douban/rexxar/route/Routes.java
diff --git a/...a/com/douban/rexxar/utils/AppContext.java → ...a/com/douban/rexxar/utils/AppContext.java b/...a/com/douban/rexxar/utils/AppContext.java → ...a/com/douban/rexxar/utils/AppContext.java
diff --git a/.../com/douban/rexxar/utils/BusProvider.java → .../com/douban/rexxar/utils/BusProvider.java b/.../com/douban/rexxar/utils/BusProvider.java → .../com/douban/rexxar/utils/BusProvider.java
diff --git a/...a/com/douban/rexxar/utils/GsonHelper.java → ...a/com/douban/rexxar/utils/GsonHelper.java b/...a/com/douban/rexxar/utils/GsonHelper.java → ...a/com/douban/rexxar/utils/GsonHelper.java
diff --git a/...ava/com/douban/rexxar/utils/LogUtils.java → ...ava/com/douban/rexxar/utils/LogUtils.java b/...ava/com/douban/rexxar/utils/LogUtils.java → ...ava/com/douban/rexxar/utils/LogUtils.java
diff --git a/...va/com/douban/rexxar/utils/MimeUtils.java → ...va/com/douban/rexxar/utils/MimeUtils.java b/...va/com/douban/rexxar/utils/MimeUtils.java → ...va/com/douban/rexxar/utils/MimeUtils.java
diff --git a/...n/java/com/douban/rexxar/utils/Utils.java → ...n/java/com/douban/rexxar/utils/Utils.java b/...n/java/com/douban/rexxar/utils/Utils.java → ...n/java/com/douban/rexxar/utils/Utils.java
diff --git a/...uban/rexxar/utils/io/AssetFileReader.java → ...uban/rexxar/utils/io/AssetFileReader.java b/...uban/rexxar/utils/io/AssetFileReader.java → ...uban/rexxar/utils/io/AssetFileReader.java
diff --git a/.../com/douban/rexxar/utils/io/Charsets.java → .../com/douban/rexxar/utils/io/Charsets.java b/.../com/douban/rexxar/utils/io/Charsets.java → .../com/douban/rexxar/utils/io/Charsets.java
diff --git a/...com/douban/rexxar/utils/io/FileUtils.java → ...com/douban/rexxar/utils/io/FileUtils.java b/...com/douban/rexxar/utils/io/FileUtils.java → ...com/douban/rexxar/utils/io/FileUtils.java
diff --git a/...douban/rexxar/utils/io/FilenameUtils.java → ...douban/rexxar/utils/io/FilenameUtils.java b/...douban/rexxar/utils/io/FilenameUtils.java → ...douban/rexxar/utils/io/FilenameUtils.java
diff --git a/...a/com/douban/rexxar/utils/io/IOUtils.java → ...a/com/douban/rexxar/utils/io/IOUtils.java b/...a/com/douban/rexxar/utils/io/IOUtils.java → ...a/com/douban/rexxar/utils/io/IOUtils.java
diff --git a/...an/rexxar/utils/io/StringCodingUtils.java → ...an/rexxar/utils/io/StringCodingUtils.java b/...an/rexxar/utils/io/StringCodingUtils.java → ...an/rexxar/utils/io/StringCodingUtils.java
diff --git a/...tils/io/stream/ByteArrayOutputStream.java → ...tils/io/stream/ByteArrayOutputStream.java b/...tils/io/stream/ByteArrayOutputStream.java → ...tils/io/stream/ByteArrayOutputStream.java
diff --git a/...ar/utils/io/stream/ClosedInputStream.java → ...ar/utils/io/stream/ClosedInputStream.java b/...ar/utils/io/stream/ClosedInputStream.java → ...ar/utils/io/stream/ClosedInputStream.java
diff --git a/.../utils/io/stream/StringBuilderWriter.java → .../utils/io/stream/StringBuilderWriter.java b/.../utils/io/stream/StringBuilderWriter.java → .../utils/io/stream/StringBuilderWriter.java
diff --git a/...m/douban/rexxar/view/RexxarErrorView.java → ...m/douban/rexxar/view/RexxarErrorView.java b/...m/douban/rexxar/view/RexxarErrorView.java → ...m/douban/rexxar/view/RexxarErrorView.java
diff --git a/...an/rexxar/view/RexxarWebChromeClient.java → ...an/rexxar/view/RexxarWebChromeClient.java b/...an/rexxar/view/RexxarWebChromeClient.java → ...an/rexxar/view/RexxarWebChromeClient.java
diff --git a/...com/douban/rexxar/view/RexxarWebView.java → ...com/douban/rexxar/view/RexxarWebView.java b/...com/douban/rexxar/view/RexxarWebView.java → ...com/douban/rexxar/view/RexxarWebView.java
diff --git a/...uban/rexxar/view/RexxarWebViewClient.java → ...uban/rexxar/view/RexxarWebViewClient.java b/...uban/rexxar/view/RexxarWebViewClient.java → ...uban/rexxar/view/RexxarWebViewClient.java
diff --git a/...douban/rexxar/view/RexxarWebViewCore.java → ...douban/rexxar/view/RexxarWebViewCore.java b/...douban/rexxar/view/RexxarWebViewCore.java → ...douban/rexxar/view/RexxarWebViewCore.java
diff --git a/.../com/douban/rexxar/view/RexxarWidget.java → .../com/douban/rexxar/view/RexxarWidget.java b/.../com/douban/rexxar/view/RexxarWidget.java → .../com/douban/rexxar/view/RexxarWidget.java
diff --git a/...a/com/douban/rexxar/view/SafeWebView.java → ...a/com/douban/rexxar/view/SafeWebView.java b/...a/com/douban/rexxar/view/SafeWebView.java → ...a/com/douban/rexxar/view/SafeWebView.java
diff --git a/...ouban/rexxar/view/SwipeRefreshLayout.java → ...ouban/rexxar/view/SwipeRefreshLayout.java b/...ouban/rexxar/view/SwipeRefreshLayout.java → ...ouban/rexxar/view/SwipeRefreshLayout.java
diff --git a/...s/drawable-xxhdpi/empty_click_refresh.png → ...s/drawable-xxhdpi/empty_click_refresh.png b/...s/drawable-xxhdpi/empty_click_refresh.png → ...s/drawable-xxhdpi/empty_click_refresh.png
diff --git a/...src/main/res/drawable-xxhdpi/ic_error.png → ...src/main/res/drawable-xxhdpi/ic_error.png b/...src/main/res/drawable-xxhdpi/ic_error.png → ...src/main/res/drawable-xxhdpi/ic_error.png
diff --git a/library/src/main/res/layout/view_error.xml → core/src/main/res/layout/view_error.xml b/library/src/main/res/layout/view_error.xml → core/src/main/res/layout/view_error.xml
diff --git a/...c/main/res/layout/view_rexxar_webview.xml → ...c/main/res/layout/view_rexxar_webview.xml b/...c/main/res/layout/view_rexxar_webview.xml → ...c/main/res/layout/view_rexxar_webview.xml
diff --git a/library/src/main/res/values/colors.xml → core/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml → core/src/main/res/values/colors.xml
diff --git a/library/src/main/res/values/dimens.xml → core/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml → core/src/main/res/values/dimens.xml
diff --git a/library/src/main/res/values/strings.xml → core/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml → core/src/main/res/values/strings.xml
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -19,5 +19,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile(project(':library'))
+    compile(project(':core'))
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':sample', ':library'
+include ':sample', ':core'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':sample', ':library'
		include ':sample', ':core'