Skip to content

Commit

Permalink
update sdk and fix package dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
MewX committed Dec 24, 2015
1 parent bb2b4c5 commit 1ae177e
Show file tree
Hide file tree
Showing 67 changed files with 1,773 additions and 319 deletions.
11 changes: 10 additions & 1 deletion studio-android/LightNovelLibrary/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions studio-android/LightNovelLibrary/.idea/vcs.xml

This file was deleted.

25 changes: 14 additions & 11 deletions studio-android/LightNovelLibrary/app/build.gradle
@@ -1,14 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "23.0.2"
useLibrary 'org.apache.http.legacy'
defaultConfig {
applicationId "org.mewx.wenku8"
minSdkVersion 15
targetSdkVersion 22
versionCode 31
versionName "1.3.1"
targetSdkVersion 23
versionCode 32
versionName "1.4"
}
buildTypes {
debug {
Expand Down Expand Up @@ -51,18 +52,20 @@ android {
}

dependencies {
compile 'com.android.support:support-v4:22.2.0'
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:cardview-v7:22.2.0'
compile 'com.android.support:recyclerview-v7:22.2.0'
compile 'com.android.support:design:22.2.0'
compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:cardview-v7:23.1.1'
compile 'com.android.support:recyclerview-v7:23.1.1'
compile 'com.android.support:design:23.1.1'

// external libraries
compile project(':umeng')
compile project(':volley')
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
compile 'com.afollestad:material-dialogs:0.7.6.0'
compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
transitive = true
}
compile 'com.getbase:floatingactionbutton:1.9.0'
compile 'com.makeramen:roundedimageview:2.0.1'
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.1.3'
Expand Down
Expand Up @@ -434,6 +434,7 @@ protected void onPostExecute(Wenku8Error.ErrorCode result) {
if (result != Wenku8Error.ErrorCode.SYSTEM_1_SUCCEEDED) {
Toast.makeText(Wenku8ReaderActivityV1.this, result.toString(), Toast.LENGTH_LONG).show();
if (md != null) md.dismiss();
Wenku8ReaderActivityV1.this.finish(); // return friendly
return;
}
Log.e("MewX", "-- 小说获取完成");
Expand Down
Expand Up @@ -71,7 +71,7 @@ public static byte[] LightHttpPostConnection(String u, ContentValues values) {
if(LightUserSession.getSession().length() != 0) {
http.setRequestProperty("Cookie", "PHPSESSID=" + LightUserSession.getSession());
}
http.setConnectTimeout(1000);
http.setConnectTimeout(3000);
http.setReadTimeout(3000);
http.setDoOutput(true); // has input name value pair
http.setInstanceFollowRedirects(true); // enable redirects
Expand Down Expand Up @@ -144,7 +144,7 @@ public static byte[] LightHttpDownload(String url) {
try {
URL localURL = new URL(url);
HttpURLConnection httpURLConnection = (HttpURLConnection)localURL.openConnection();
httpURLConnection.setConnectTimeout(1000);
httpURLConnection.setConnectTimeout(3000);
httpURLConnection.setReadTimeout(8000);

if (httpURLConnection.getResponseCode() != HttpURLConnection.HTTP_OK)
Expand Down
Expand Up @@ -100,8 +100,7 @@
android:textSize="14sp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="用户群号: 427577610"
android:singleLine="true"
android:text="所有数据来自于互联网,开发者、设计师、客服均与网站无任何关系,而且本项目完全免费,完整源代码均开放,纯凭兴趣做的app,仅供大家学习安卓应用程序制作之法,如有侵犯您的权益,请务必邮件联系,保证12小时内回复,app内会做屏蔽。"
android:textColor="@color/menu_text_color"
android:layout_below="@+id/app_site"
android:layout_centerHorizontal="true" />
Expand Down
3 changes: 2 additions & 1 deletion studio-android/LightNovelLibrary/build.gradle
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:1.5.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -14,6 +14,7 @@ buildscript {

allprojects {
repositories {
maven { url "https://jitpack.io" }
jcenter()
}
}
22 changes: 22 additions & 0 deletions studio-android/LightNovelLibrary/volley/.gitignore
@@ -0,0 +1,22 @@
*~
.gradle
gen
bin
local.properties
*.apk
.*.swp
.idea
gen-external-apklibs
target
classes
project.properties
*.iml
.DS_Store
out
.gradle
build
.settings
target
*.iml
.idea
local.properties
172 changes: 172 additions & 0 deletions studio-android/LightNovelLibrary/volley/README.md
@@ -0,0 +1,172 @@
Android Volley
----------
This is an unofficial mirror (with some minor bugfix, see [Changelog](#changelog) for details.) for [android volley library](https://android.googlesource.com/platform/frameworks/volley), the source code will synchronize periodically with the official volley repository. Documents see here: [Transmitting Network Data Using Volley](https://developer.android.com/training/volley/index.html).

## Status

Volley is already published to Maven Central.

* [![Maven Central](http://img.shields.io/badge/2015.09.08-com.mcxiaoke.volley:library:1.0.19-brightgreen.svg)](http://search.maven.org/#artifactdetails%7Ccom.mcxiaoke.volley%7Clibrary%7C1.0.19%7Cjar)

## Usage

### for Maven

``` xml
<dependency>
<groupId>com.mcxiaoke.volley</groupId>
<artifactId>library</artifactId>
<version>1.0.19</version>
</dependency>
```


### for Gradle

``` groovy
compile 'com.mcxiaoke.volley:library:1.0.19'
```


### Using SNAPSHOT

add this to repositories section in build.gradle

``` groovy
repositories {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
}
```

add this to dependencies section in build.gradle

```groovy
compile 'com.mcxiaoke.volley:library:1.0.19-SNAPSHOT'
```

## Changelog
* **1.0.19 2015.09.08**
* merge pr, fix request leak in CacheDispatcher
* set mListener and mErrorListener to null when finish request, fix #85 #93 #96

* **1.0.18 2015.07.28**
* merge upstream, process response bodies only when present
* tweak getCacheKey(), using method and original url, fix #67 #78
* add RedirectError, wrong exception for http 301 and 302, fix #51
* make NetworkResponse Serializable, fix #53
* create NetworkError using IOException, not using null response

* **1.0.17 2015.07.13**
* merge upstream, stop logging slow requests outside of debug logs
* merge pr #64, fix leaking the last request object

* **1.0.16 2015.05.18**
* fix duplicate retry, change DEFAULT_MAX_RETRIES to 0
* merge pr, fix NegativeArraySizeException
* merge upstream, Use a BufferedOutputStream to read and write cache

* **1.0.15 2015.03.18**
* add two missing constructors for JsonArrayRequest and JsonObjectRequest
* add unique identifier for Request

* **1.0.14 2015.03.17**
* add more constructors for JsonArrayRequest and JsonObjectRequest
* update and fix gradle build, using new build.gradle

* **1.0.13 2015.03.16**
* merge pr, added constructor to JSONArrayRequest

* **1.0.12 2015.03.12**
* merge upstream, fix ImageLoader.getCacheKey()
* merge upstream, Fix broken DiskBasedCache
* merge upstream, Modify header parser to handle must-revalidate.

* **1.0.11 2015.03.03**
* merge upstream, Add a RequestFinishedListener to RequestQueue.
* merge upstream, Change the default character encoding for JSON responses to UTF-8

* **1.0.10 2014.12.30**
* merge upstream, Use the view size and scale type to restrict NIV requests.
* merge pr, Add a getImageURL method to NetworkImageView
* merge pr, Add the options of setting DiskBasedCache sizes in Volley.java

* **1.0.9 2014.11.26**
* merge upstream, Fix deprecation warnings (now errors in 0.14.4) w/ gradle.

* **1.0.8 2014.11.07**
* merge upstream, Metric for network time and getBackoffMultiplier()


* **1.0.7 2014.10.13**
* merge upstream, Add locale to HttpHeaderParserTest.rfc1123Date(long millis)
* merge upstream, Copy cache header for 304 response

* **1.0.6 2014.09.10**
* merge pr, fixed bug where Disk cache misses for redirects
* merge upstream, Fix crash/OOM in DiskBasedCache
* merge upstream, allow use of custom ImageRequests in ImageLoader

* **1.0.5 2014.06.18**
* merge upstream, Fixes bug in PATCH method. Sets the method before setting the body.
* update gradle and build tools version, fix build

* **1.0.4 2014.05.04**
* merge upstream, Guard against NullPointerException currently occurring in Volley when a Request is given a url whose host is null.

* **1.0.3 2014.04.01**
* merge upstream, ImageLoader: setError after null check

* **1.0.2 2014.02.28**
* merge upstream, Use the view size to restrict NIV requests.
* merge upstream, Fix generic type parameter for RequestQueue.add(Request)
* merge pr, added support for handling 301 and 302 http redirects
* using standalone deploy gradle build file and script

* **1.0.1 2014.02.13**
* add gradle build support, add readme, release using gradle

* **1.0.0 2014.01.03**
* create volley mirror at github, release first version


## Attention

This project is just a mirror of volley, if you have found any bugs or need some features, please create an issue at [AOSP Issue Tracker](https://code.google.com/p/android/issues/list).

## About

#### Contacts

* Blog: <http://blog.mcxiaoke.com>
* Github: <https://github.com/mcxiaoke>
* Email: [github@mcxiaoke.com](mailto:github@mcxiaoke.com)

#### Projects

* Android-Next: <https://github.com/mcxiaoke/Android-Next>
* Packer-Ng: <https://github.com/mcxiaoke/packer-ng-plugin>
* Gradle-Packer: <https://github.com/mcxiaoke/gradle-packer-plugin>
* xBus: <https://github.com/mcxiaoke/xBus>
* RxJava Docs: <https://github.com/mcxiaoke/RxDocs>
* MQTT-CN: <https://github.com/mcxiaoke/mqtt>
* Minicat App: <https://github.com/mcxiaoke/minicat>
* Fanfou App: <https://github.com/mcxiaoke/fanfouapp-opensource>

## License


Copyright (C) 2014 Xiaoke Zhang
Copyright (C) 2011 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

51 changes: 46 additions & 5 deletions studio-android/LightNovelLibrary/volley/build.gradle
Expand Up @@ -5,21 +5,62 @@
// Any other changes to the build config belong in rules.gradle, which
// is used by projects that depend on Volley but define their own
// tools versions across all dependencies to ensure a consistent build.
//
// Most users should just add this line to settings.gradle:
// include(":volley")
//
// If you have a more complicated Gradle setup you can choose to use
// this instead:
// include(":volley")
// project(':volley').buildFileName = 'rules.gradle'

buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:1.3.1'
}
}

apply plugin: 'com.android.library'

allprojects {
group project.GROUP
version project.VERSION_NAME

repositories {
mavenCentral()
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}
}

dependencies {
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0'
androidTestCompile 'com.android.support.test:testing-support-lib:0.1'
testCompile 'junit:junit:4.12'
testCompile "org.mockito:mockito-core:1.9.5"
testCompile 'org.robolectric:robolectric:2.4'
}


android {
compileSdkVersion 21
buildToolsVersion = '21.1.2'
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION

defaultConfig {
minSdkVersion 8
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
}

lintOptions {
quiet true
abortOnError false
}
}

apply plugin: 'com.android.library'
apply from: 'https://raw.github.com/mcxiaoke/gradle-mvn-push/master/jar.gradle'
apply from: 'https://raw.github.com/mcxiaoke/gradle-mvn-push/master/gradle-mvn-push.gradle'

0 comments on commit 1ae177e

Please sign in to comment.