drake 5 jaren geleden
commit
c2ee81a786
56 gewijzigde bestanden met toevoegingen van 1823 en 0 verwijderingen
  1. 11 0
      .gitignore
  2. 177 0
      README.md
  3. 29 0
      build.gradle
  4. 21 0
      gradle.properties
  5. BIN
      gradle/wrapper/gradle-wrapper.jar
  6. 6 0
      gradle/wrapper/gradle-wrapper.properties
  7. 172 0
      gradlew
  8. 84 0
      gradlew.bat
  9. 1 0
      net/.gitignore
  10. 49 0
      net/build.gradle
  11. 0 0
      net/consumer-rules.pro
  12. 21 0
      net/proguard-rules.pro
  13. 24 0
      net/src/androidTest/java/com/drake/net/ExampleInstrumentedTest.kt
  14. 2 0
      net/src/main/AndroidManifest.xml
  15. 139 0
      net/src/main/java/com/drake/net/Net.kt
  16. 41 0
      net/src/main/java/com/drake/net/NetConfig.kt
  17. 85 0
      net/src/main/java/com/drake/net/convert/DefaultConverter.kt
  18. 16 0
      net/src/main/java/com/drake/net/exception/ResponseException.kt
  19. 30 0
      net/src/main/java/com/drake/net/listener/DefaultInterceptor.kt
  20. 17 0
      net/src/main/java/com/drake/net/listener/NetListener.kt
  21. 70 0
      net/src/main/java/com/drake/net/observer/DialogObserver.kt
  22. 73 0
      net/src/main/java/com/drake/net/observer/NetObserver.kt
  23. 144 0
      net/src/main/java/com/drake/net/observer/ObserverUtils.kt
  24. 64 0
      net/src/main/java/com/drake/net/observer/PageObserver.kt
  25. 49 0
      net/src/main/java/com/drake/net/observer/RefreshObserver.kt
  26. 65 0
      net/src/main/java/com/drake/net/observer/StateObserver.kt
  27. 3 0
      net/src/main/res/values/strings.xml
  28. 17 0
      net/src/test/java/com/drake/net/ExampleUnitTest.kt
  29. 1 0
      sample/.gitignore
  30. 38 0
      sample/build.gradle
  31. 21 0
      sample/proguard-rules.pro
  32. 24 0
      sample/src/androidTest/java/com/drake/net/ExampleInstrumentedTest.kt
  33. 24 0
      sample/src/main/AndroidManifest.xml
  34. 13 0
      sample/src/main/java/com/drake/net/sample/App.kt
  35. 17 0
      sample/src/main/java/com/drake/net/sample/MainActivity.kt
  36. 4 0
      sample/src/main/java/com/drake/net/sample/Model.kt
  37. 34 0
      sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
  38. 170 0
      sample/src/main/res/drawable/ic_launcher_background.xml
  39. 18 0
      sample/src/main/res/layout/activity_main.xml
  40. 5 0
      sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  41. 5 0
      sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  42. BIN
      sample/src/main/res/mipmap-hdpi/ic_launcher.png
  43. BIN
      sample/src/main/res/mipmap-hdpi/ic_launcher_round.png
  44. BIN
      sample/src/main/res/mipmap-mdpi/ic_launcher.png
  45. BIN
      sample/src/main/res/mipmap-mdpi/ic_launcher_round.png
  46. BIN
      sample/src/main/res/mipmap-xhdpi/ic_launcher.png
  47. BIN
      sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  48. BIN
      sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
  49. BIN
      sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  50. BIN
      sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  51. BIN
      sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  52. 6 0
      sample/src/main/res/values/colors.xml
  53. 3 0
      sample/src/main/res/values/strings.xml
  54. 11 0
      sample/src/main/res/values/styles.xml
  55. 17 0
      sample/src/test/java/com/drake/net/ExampleUnitTest.kt
  56. 2 0
      settings.gradle

+ 11 - 0
.gitignore

@@ -0,0 +1,11 @@
+*.iml
+.gradle
+/local.properties
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+/.idea/

+ 177 - 0
README.md

@@ -0,0 +1,177 @@
+# Net
+
+针对[Kalle](https://github.com/yanzhenjie/Kalle)网络请求框架进行扩展
+
+
+
+主要新增特性
+
+- Kotlin DSL
+- RxJava
+- 自动错误信息吐司
+- 自动JSON解析
+- 自动处理下拉刷新和上拉加载
+- 自动处理分页加载
+- 自动缺省页
+- 自动生命周期
+- 自动处理加载对话框
+
+
+
+同时具备[Kalle](https://github.com/yanzhenjie/Kalle)的网络缓存/进度监听等特性
+
+
+
+## 安装
+
+project of build.gradle
+
+```groovy
+allprojects {
+    repositories {
+        // ...
+        maven { url 'https://jitpack.io' }
+    }
+}
+```
+
+
+
+module of build.gradle
+
+```groovy
+implementation 'com.github.liangjingkanji:Net:1.0'
+```
+
+
+## 请求方式
+
+
+
+Post
+
+```kotlin
+post<Model>(""){
+  param("key", "value")
+}.net { 
+
+}
+```
+
+`Model` 即JSONBean或者说POJO 数据模型, 会将服务器返回的JSON解析成该数据模型在`net`回调中可以使用`it`调用
+
+
+
+Get
+
+```
+get<Model>(""){
+  param("key", "value")
+}.net { 
+
+}
+```
+
+`Model` 泛型如果换成String, 将会在成功回调中得到字符串对象.
+
+
+
+文件上传
+
+```kotlin
+post<Model>(""){
+  file("file", File("path"))
+}.net {
+
+}
+```
+
+这是支持Kalle任何参数添加方式
+
+
+
+## 生命周期
+
+将Fragment或者Activity作为参数传递即可在页面关闭时自动取消订阅, 避免操作已销毁视图.
+
+```kotlin
+post<Model>(""){
+  param("key", "value")
+}.net(activity) { 
+
+}
+```
+
+其他的对话框或者缺省页和下拉刷新等自动支持生命周期管理
+
+## 对话框
+
+将会在网络请求开始时弹出对话框, 结束时关闭对话框.
+
+```kotlin
+post<Model>(""){
+  file("file", File("path"))
+}.dialog(this) {
+
+}
+```
+
+
+
+自定义对话框
+
+```kotlin
+fun <M> Observable<M>.dialog(
+    activity: FragmentActivity,
+    dialog: Dialog = ProgressDialog(activity),
+    cancelable: Boolean = true,
+    block: (DialogObserver<M>.(M) -> Unit)? = null
+)
+```
+
+- `cancelable` 决定对话框是否可以点击用户关闭
+- `dialog` 传入自定义对话框
+
+
+
+对话框关闭会导致网络请求被取消订阅
+
+## 缺省页
+
+需要引入第三方库: [StateLayout](https://github.com/liangjingkanji/StateLayout)
+
+```
+post<Model>(""){
+  param("key", "value")
+}.state(stateLayout) { 
+
+}
+```
+
+
+
+关于`state`函数支持参数类型有如下: 
+
+- stateLayout
+- activity
+- fragment
+- view
+
+
+
+会根据参数的不同而给不同的对象添加缺省页状态
+
+## 分页加载
+
+需要引入第三方库: [BRV](https://github.com/liangjingkanji/BRV)
+
+
+
+```kotlin
+post<Model>(""){
+  file("file", File("path"))
+}.page(page) {
+
+}
+```
+

+ 29 - 0
build.gradle

@@ -0,0 +1,29 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext.kotlin_version = '1.3.50'
+    repositories {
+        google()
+        jcenter()
+
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

+ 21 - 0
gradle.properties

@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official

BIN
gradle/wrapper/gradle-wrapper.jar


+ 6 - 0
gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Sun Sep 15 22:43:32 PHT 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

+ 172 - 0
gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

+ 84 - 0
gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

+ 1 - 0
net/.gitignore

@@ -0,0 +1 @@
+/build

+ 49 - 0
net/build.gradle

@@ -0,0 +1,49 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+apply plugin: 'com.github.dcendents.android-maven'
+group = 'com.gitlab.liangjingkanji'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.0"
+
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    api 'com.yanzhenjie:okalle:0.1.7'
+    api 'com.squareup.moshi:moshi-kotlin:1.8.0'
+    kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.8.0'
+
+    compileOnly 'com.github.liangjingkanji:BRV:1.0.5'
+    compileOnly 'io.reactivex.rxjava2:rxandroid:2.1.1'
+
+}

+ 0 - 0
net/consumer-rules.pro


+ 21 - 0
net/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

+ 24 - 0
net/src/androidTest/java/com/drake/net/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.drake.net
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.drake.net.test", appContext.packageName)
+    }
+}

+ 2 - 0
net/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.drake.net" />

+ 139 - 0
net/src/main/java/com/drake/net/Net.kt

@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net
+
+import com.drake.net.exception.ResponseException
+import com.yanzhenjie.kalle.Kalle
+import com.yanzhenjie.kalle.download.UrlDownload
+import com.yanzhenjie.kalle.simple.SimpleBodyRequest
+import com.yanzhenjie.kalle.simple.SimpleUrlRequest
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+
+/**
+ * Get请求
+ * @param path String 默认加上Host
+ * @param isAbsolutePath Boolean Path是否是绝对路径
+ * @param block SimpleUrlRequest.Api.() -> UnitUtils
+ * @return Observable<M>
+ */
+inline fun <reified M> get(
+    path: String,
+    isAbsolutePath: Boolean = false,
+    noinline block: (SimpleUrlRequest.Api.() -> Unit)? = null
+): Observable<M> {
+
+    return Observable.create<M> {
+        try {
+            val get = Kalle.get(if (isAbsolutePath) path else (NetConfig.host + path))
+            val response = if (block == null) {
+                get.perform(M::class.java, String::class.java)
+            } else {
+                get.apply(block).perform<M, String>(M::class.java, String::class.java)
+            }
+
+            if (!it.isDisposed) {
+                if (response.isSucceed) {
+                    it.onNext(response.succeed())
+                    it.onComplete()
+                } else {
+                    it.onError(
+                        ResponseException(response.failed(), response.code())
+                    )
+                }
+            }
+        } catch (e: java.lang.Exception) {
+            if (!it.isDisposed) {
+                it.onError(e)
+            }
+        }
+    }.subscribeOn(Schedulers.computation()).observeOn(AndroidSchedulers.mainThread())
+}
+
+/**
+ * Post提交
+ * @param path String 默认加上Host
+ * @param isAbsolutePath Boolean 是否是绝对路径
+ * @param block SimpleBodyRequest.Api.() -> UnitUtils
+ * @return Observable<M>
+ */
+inline fun <reified M> post(
+    path: String,
+    isAbsolutePath: Boolean = false,
+    noinline block: (SimpleBodyRequest.Api.() -> Unit)? = null
+): Observable<M> {
+
+    return Observable.create<M> {
+        try {
+            val post = Kalle.post(if (isAbsolutePath) path else (NetConfig.host + path))
+            val response = if (block == null) {
+                post.perform<M, String>(M::class.java, String::class.java)
+            } else {
+                post.apply(block).perform<M, String>(M::class.java, String::class.java)
+            }
+
+            if (!it.isDisposed) {
+                if (response.isSucceed) {
+                    it.onNext(response.succeed())
+                    it.onComplete()
+                } else {
+                    it.onError(
+                        ResponseException(response.failed(), response.code())
+                    )
+                }
+            }
+        } catch (e: java.lang.Exception) {
+            if (!it.isDisposed) {
+                it.onError(e)
+            }
+        }
+    }.subscribeOn(Schedulers.computation()).observeOn(AndroidSchedulers.mainThread())
+}
+
+
+/**
+ * 下载文件
+ *
+ * @param path String 自动加上Host
+ * @param directory String 下载文件存放目录 {默认存在android/data/packageName/cache目录}
+ * @param isAbsolutePath Boolean 下载链接是否是绝对路径
+ * @return Observable<String>
+ */
+fun download(
+    path: String,
+    directory: String = NetConfig.App.externalCacheDir!!.absolutePath,
+    isAbsolutePath: Boolean = false,
+    block: (UrlDownload.Api.() -> Unit)? = null
+): Observable<String> {
+
+    return Observable.create<String> {
+        try {
+            val download = Kalle.Download.get(if (isAbsolutePath) path else (NetConfig.host + path))
+                .directory(directory)
+
+            val filePath = if (block == null) {
+                download.perform()
+            } else {
+                download.apply(block).perform()
+            }
+
+            if (!it.isDisposed) {
+                it.onNext(filePath)
+                it.onComplete()
+            }
+        } catch (e: Exception) {
+            if (!it.isDisposed) {
+                it.onError(e)
+            }
+        }
+    }.subscribeOn(Schedulers.computation()).observeOn(AndroidSchedulers.mainThread())
+}
+
+

+ 41 - 0
net/src/main/java/com/drake/net/NetConfig.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net
+
+import android.app.Application
+import com.drake.net.convert.DefaultConverter
+import com.drake.net.listener.DefaultInterceptor
+import com.drake.net.listener.NetListener
+import com.yanzhenjie.kalle.Kalle
+import com.yanzhenjie.kalle.KalleConfig
+
+
+object NetConfig {
+
+    lateinit var host: String
+    lateinit var App: Application
+    var listener: NetListener? = null
+
+    fun set(block: KalleConfig.Builder.() -> Unit) {
+        val builder = KalleConfig.newBuilder()
+        builder.block()
+        Kalle.setConfig(builder.build())
+    }
+}
+
+
+fun Application.setDefaultNetConfig(host: String, successCode: Int = 1) {
+    NetConfig.App = this
+    NetConfig.host = host
+
+    NetConfig.set {
+        addInterceptor(DefaultInterceptor())
+        converter(DefaultConverter(successCode))
+    }
+
+}

+ 85 - 0
net/src/main/java/com/drake/net/convert/DefaultConverter.kt

@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.convert
+
+import com.drake.net.NetConfig
+import com.squareup.moshi.Moshi
+import com.yanzhenjie.kalle.Response
+import com.yanzhenjie.kalle.simple.Converter
+import com.yanzhenjie.kalle.simple.SimpleResponse
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+import java.lang.reflect.Type
+
+
+@Suppress("UNCHECKED_CAST")
+class DefaultConverter(val successCode: Int = 1) :
+    Converter {
+
+
+    @Throws(Exception::class)
+    override fun <S, F> convert(
+        succeed: Type,
+        failed: Type,
+        response: Response,
+        fromCache: Boolean
+    ): SimpleResponse<S, F> {
+        var succeedData: S? = null
+        var failedData: F? = null
+
+        val json: String =
+            NetConfig.listener?.parse(response.body().string()) ?: response.body().string()
+
+        var code = response.code()
+
+        when {
+            code in 200..299 -> {
+                try {
+                    val jsonObject = JSONObject(json)
+                    val responseCode = jsonObject.optInt("code")
+
+                    if (responseCode == successCode) {
+                        run {
+                            if (succeed === String::class.java) {
+                                succeedData = json as S
+                            } else {
+                                try {
+                                    succeedData = MOSHI.adapter<S>(succeed).fromJson(json)
+                                } catch (e: IOException) {
+                                    e.printStackTrace()
+                                    failedData = "无法解析数据" as F
+                                }
+                            }
+                        }
+                    } else {
+                        failedData = jsonObject.optString("errorMessage") as F
+                        code = responseCode
+                    }
+                } catch (e: JSONException) {
+                    e.printStackTrace()
+                    failedData = "无法解析错误信息" as F
+                }
+            }
+            code in 400..499 -> failedData = "发生异常错误" as F
+            code >= 500 -> failedData = "服务器开小差啦" as F
+        }
+
+        return SimpleResponse.newBuilder<S, F>().code(code)
+            .headers(response.headers())
+            .fromCache(fromCache)
+            .succeed(succeedData)
+            .failed(failedData)
+            .build()
+    }
+
+    companion object {
+
+        private val MOSHI = Moshi.Builder().build()
+    }
+}

+ 16 - 0
net/src/main/java/com/drake/net/exception/ResponseException.kt

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.exception
+
+/**
+ *  对应网络请求后台定义的错误信息
+ * @property errorMessage String 网络请求错误信息
+ * @property errorCode Int 网络请求错误码
+ * @constructor
+ */
+class ResponseException(val errorMessage: String, val errorCode: Int) : Throwable()

+ 30 - 0
net/src/main/java/com/drake/net/listener/DefaultInterceptor.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.listener
+
+import com.drake.net.NetConfig
+import com.yanzhenjie.kalle.Response
+import com.yanzhenjie.kalle.connect.Interceptor
+import com.yanzhenjie.kalle.connect.http.Chain
+import java.io.IOException
+
+/**
+ * 响应体的日志打印器
+ */
+class DefaultInterceptor : Interceptor {
+
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Chain): Response {
+        val request = chain.request()
+        val response = chain.proceed(request)
+        NetConfig.listener?.net(request, response)
+        return response
+    }
+}
+

+ 17 - 0
net/src/main/java/com/drake/net/listener/NetListener.kt

@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.listener
+
+import com.yanzhenjie.kalle.Request
+import com.yanzhenjie.kalle.Response
+
+interface NetListener {
+
+    fun net(request: Request, response: Response)
+    fun parse(body: String): String
+}

+ 70 - 0
net/src/main/java/com/drake/net/observer/DialogObserver.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+@file:Suppress("DEPRECATION")
+
+package com.drake.net.observer
+
+import android.app.Dialog
+import android.app.ProgressDialog
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.Lifecycle.Event
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import io.reactivex.observers.DefaultObserver
+
+/**
+ * 自动加载对话框网络请求
+ *
+ *
+ * 开始: 显示对话框
+ * 错误: 提示错误信息, 关闭对话框
+ * 完全: 关闭对话框
+ */
+abstract class DialogObserver<M>(
+    var activity: FragmentActivity,
+    var dialog: Dialog = ProgressDialog(activity),
+    var cancelable: Boolean = true
+) : DefaultObserver<M>(), LifecycleObserver {
+
+
+    override fun onStart() {
+
+        activity.lifecycle.addObserver(this)
+
+
+        if (dialog is ProgressDialog) {
+            (dialog as ProgressDialog).setMessage("加载中")
+        }
+
+        dialog.setOnDismissListener { cancel() }
+        dialog.setCancelable(cancelable)
+        dialog.show()
+    }
+
+    @OnLifecycleEvent(Event.ON_DESTROY)
+    fun dismissDialog() {
+        if (dialog.isShowing) {
+            dialog.dismiss()
+        }
+    }
+
+    /**
+     * 关闭进度对话框并提醒错误信息
+     *
+     * @param e 包括错误信息
+     */
+    override fun onError(e: Throwable) {
+        dismissDialog()
+        NetObserver.showErrorMsg(e)
+    }
+
+    override fun onComplete() {
+        dismissDialog()
+    }
+
+}

+ 73 - 0
net/src/main/java/com/drake/net/observer/NetObserver.kt

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.observer
+
+import android.widget.Toast
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.OnLifecycleEvent
+import com.drake.net.NetConfig
+import com.drake.net.exception.ResponseException
+import com.yanzhenjie.kalle.exception.*
+import io.reactivex.observers.DefaultObserver
+
+
+/**
+ * 自动显示错误信息
+ */
+abstract class NetObserver<M>() : DefaultObserver<M>(), LifecycleObserver {
+
+    constructor(lifecycleOwner: LifecycleOwner?) : this() {
+        lifecycleOwner?.lifecycle?.addObserver(this)
+    }
+
+    /**
+     * 关闭进度对话框并提醒错误信息
+     *
+     * @param e 包括错误信息
+     */
+    override fun onError(e: Throwable) {
+        showErrorMsg(e)
+    }
+
+    override fun onComplete() {
+
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    fun cancelRequest() {
+        cancel()
+    }
+
+    companion object {
+
+        fun showErrorMsg(e: Throwable) {
+            val message: String
+            when (e) {
+                is NetworkError -> message = "当前网络不可用"
+                is URLError -> message = "请求资源地址错误"
+                is HostError -> message = "无法找到指定服务器主机"
+                is ConnectTimeoutError -> message = "连接服务器超时,请重试"
+                is ConnectException -> message = "请检查网络连接"
+                is WriteException -> message = "发送数据错误"
+                is ReadTimeoutError -> message = "读取服务器数据超时,请检查网络"
+                is DownloadError -> message = "下载过程发生错误"
+                is NoCacheError -> message = "读取缓存错误"
+                is ParseError -> message = "解析数据时发生异常"
+                is ReadException -> message = "读取数据错误"
+                is ResponseException -> message = e.errorMessage
+                else -> {
+                    e.printStackTrace()
+                    message = "服务器未响应"
+                }
+            }
+            Toast.makeText(NetConfig.App, message, Toast.LENGTH_SHORT).show()
+        }
+    }
+}

+ 144 - 0
net/src/main/java/com/drake/net/observer/ObserverUtils.kt

@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.observer
+
+import android.app.Dialog
+import android.app.ProgressDialog
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.LifecycleOwner
+import com.drake.brv.BindingAdapter
+import com.drake.brv.PageRefreshLayout
+import com.drake.statelayout.StateLayout
+import io.reactivex.Observable
+
+
+/**
+ * 自动打印错误信息
+ * @receiver Observable<M>
+ * @param lifecycleOwner FragmentActivity? 如果不为null 则会根据当前activity销毁而取消订阅
+ * @param block (M) -> UnitUtils
+ */
+fun <M> Observable<M>.net(
+    lifecycleOwner: LifecycleOwner? = null,
+    block: (NetObserver<M>.(M) -> Unit)? = null
+) {
+
+    subscribe(object : NetObserver<M>(lifecycleOwner) {
+        override fun onNext(t: M) {
+            block?.invoke(this, t)
+        }
+    })
+}
+
+/**
+ * 自动处理多状态页面
+ * @receiver Observable<M>
+ * @param stateLayout StateLayout
+ * @param block (M) -> UnitUtils
+ */
+fun <M> Observable<M>.state(stateLayout: StateLayout, block: StateObserver<M>.(M) -> Unit) {
+    subscribe(object : StateObserver<M>(stateLayout) {
+        override fun onNext(t: M) {
+            block(t)
+        }
+    })
+}
+
+fun <M> Observable<M>.state(view: View, block: StateObserver<M>.(M) -> Unit) {
+    subscribe(object : StateObserver<M>(view) {
+        override fun onNext(t: M) {
+            block(t)
+        }
+    })
+}
+
+fun <M> Observable<M>.state(activity: FragmentActivity, block: StateObserver<M>.(M) -> Unit) {
+    subscribe(object : StateObserver<M>(activity) {
+        override fun onNext(t: M) {
+            block(t)
+        }
+    })
+}
+
+fun <M> Observable<M>.state(fragment: Fragment, block: StateObserver<M>.(M) -> Unit) {
+    subscribe(object : StateObserver<M>(fragment) {
+        override fun onNext(t: M) {
+            block(t)
+        }
+    })
+}
+
+/**
+ * 请求网络自动开启和关闭对话框
+ * @receiver Observable<M>
+ * @param activity FragmentActivity
+ * @param cancelable Boolean 对话框是否可以被用户取消
+ * @param block (M) -> Unit
+ */
+fun <M> Observable<M>.dialog(
+    activity: FragmentActivity,
+    cancelable: Boolean = true,
+    block: (DialogObserver<M>.(M) -> Unit)? = null
+) {
+    subscribe(object : DialogObserver<M>(activity, cancelable = cancelable) {
+        override fun onNext(t: M) {
+            block?.invoke(this, t)
+        }
+    })
+}
+
+fun <M> Observable<M>.dialog(
+    activity: FragmentActivity,
+    dialog: Dialog = ProgressDialog(activity),
+    cancelable: Boolean = true,
+    block: (DialogObserver<M>.(M) -> Unit)? = null
+) {
+    subscribe(object : DialogObserver<M>(activity, dialog, cancelable) {
+        override fun onNext(t: M) {
+            block?.invoke(this, t)
+        }
+    })
+}
+
+/**
+ * 自动结束下拉加载
+ * @receiver Observable<M>
+ * @param pageRefreshLayout SmartRefreshLayout
+ * @param block (M) -> UnitUtils
+ */
+fun <M> Observable<M>.refresh(
+    pageRefreshLayout: PageRefreshLayout,
+    block: RefreshObserver<M>.(M) -> Unit
+) {
+    subscribe(object : RefreshObserver<M>(pageRefreshLayout) {
+        override fun onNext(t: M) {
+            block(t)
+        }
+    })
+}
+
+/**
+ * 自动处理分页加载更多和下拉加载
+ *
+ * @receiver Observable<M>
+ * @param pageRefreshLayout PageRefreshLayout
+ * @param block (M) -> UnitUtils
+ */
+fun <M> Observable<M>.page(
+    pageRefreshLayout: PageRefreshLayout,
+    adapter: BindingAdapter? = null,
+    block: PageObserver<M>.(M) -> Unit
+) {
+    subscribe(object : PageObserver<M>(pageRefreshLayout, adapter) {
+        override fun onNext(t: M) {
+            block(t)
+        }
+    })
+}

+ 64 - 0
net/src/main/java/com/drake/net/observer/PageObserver.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.observer
+
+import android.view.View
+import android.view.View.OnAttachStateChangeListener
+import com.drake.brv.BindingAdapter
+import com.drake.brv.PageRefreshLayout
+import io.reactivex.observers.DefaultObserver
+
+/**
+ * 自动结束下拉刷新和上拉加载状态
+ */
+abstract class PageObserver<M>(
+    val pageRefreshLayout: PageRefreshLayout,
+    val adapter: BindingAdapter? = null
+) :
+    DefaultObserver<M>() {
+
+    init {
+
+        pageRefreshLayout.addOnAttachStateChangeListener(object : OnAttachStateChangeListener {
+            override fun onViewAttachedToWindow(v: View) {
+
+            }
+
+            override fun onViewDetachedFromWindow(v: View) {
+                cancel()
+            }
+        })
+    }
+
+    /**
+     * 关闭进度对话框并提醒错误信息
+     *
+     * @param e 包括错误信息
+     */
+    override fun onError(e: Throwable) {
+        pageRefreshLayout.finish(false)
+    }
+
+    override fun onComplete() {
+        pageRefreshLayout.finish(true)
+    }
+
+    /**
+     * 自动判断是添加数据还是覆盖数据
+     *
+     * @param data 要添加的数据集
+     */
+    fun addData(data: List<Any>, hasMore: PageRefreshLayout.() -> Boolean) {
+        pageRefreshLayout.addData(data, hasMore)
+    }
+
+
+    fun showEmpty() {
+        pageRefreshLayout.showEmpty()
+    }
+}

+ 49 - 0
net/src/main/java/com/drake/net/observer/RefreshObserver.kt

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.observer
+
+import android.view.View
+import android.view.View.OnAttachStateChangeListener
+import com.drake.brv.PageRefreshLayout
+import io.reactivex.observers.DefaultObserver
+
+/**
+ * 自动结束下拉刷新和上拉加载状态
+ */
+abstract class RefreshObserver<M>(val pageRefreshLayout: PageRefreshLayout) :
+    DefaultObserver<M>() {
+
+
+    init {
+        pageRefreshLayout.addOnAttachStateChangeListener(object : OnAttachStateChangeListener {
+            override fun onViewAttachedToWindow(v: View) {
+
+            }
+
+            override fun onViewDetachedFromWindow(v: View) {
+                cancel()
+            }
+        })
+    }
+
+
+    /**
+     * 关闭进度对话框并提醒错误信息
+     *
+     * @param e 包括错误信息
+     */
+    override fun onError(e: Throwable) {
+        pageRefreshLayout.finish(false)
+        NetObserver.showErrorMsg(e)
+    }
+
+
+    override fun onComplete() {
+        pageRefreshLayout.finish(true)
+    }
+}

+ 65 - 0
net/src/main/java/com/drake/net/observer/StateObserver.kt

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2018, Umbrella CompanyLimited All rights reserved.
+ * Project:Net
+ * Author:Drake
+ * Date:9/16/19 12:54 AM
+ */
+
+package com.drake.net.observer
+
+import android.app.Activity
+import android.view.View
+import android.view.View.OnAttachStateChangeListener
+import androidx.fragment.app.Fragment
+import com.drake.statelayout.StateLayout
+import com.drake.statelayout.state
+import io.reactivex.observers.DefaultObserver
+
+/**
+ * 自动显示多状态布局
+ */
+abstract class StateObserver<S> : DefaultObserver<S> {
+
+    var stateLayout: StateLayout
+
+    constructor(view: View) {
+        stateLayout = view.state()
+    }
+
+    constructor(activity: Activity) {
+        stateLayout = activity.state()
+    }
+
+    constructor(fragment: Fragment) {
+        stateLayout = fragment.state()
+    }
+
+    constructor(stateLayout: StateLayout) {
+        this.stateLayout = stateLayout
+    }
+
+    fun showEmpty() {
+        stateLayout.showEmpty()
+        cancel()
+    }
+
+    public override fun onStart() {
+        stateLayout.showLoading()
+        stateLayout.addOnAttachStateChangeListener(object : OnAttachStateChangeListener {
+            override fun onViewAttachedToWindow(v: View?) {
+            }
+
+            override fun onViewDetachedFromWindow(v: View) {
+                cancel()
+            }
+        })
+    }
+
+    override fun onError(e: Throwable) {
+        stateLayout.showError()
+    }
+
+    override fun onComplete() {
+        stateLayout.showContent()
+    }
+}

+ 3 - 0
net/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Net</string>
+</resources>

+ 17 - 0
net/src/test/java/com/drake/net/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.drake.net
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

+ 1 - 0
sample/.gitignore

@@ -0,0 +1 @@
+/build

+ 38 - 0
sample/build.gradle

@@ -0,0 +1,38 @@
+apply plugin: 'com.android.application'
+
+apply plugin: 'kotlin-android'
+
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.0"
+    defaultConfig {
+        applicationId "com.drake.net.sample"
+        minSdkVersion 19
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation project(path: ':net')
+
+    implementation 'com.github.liangjingkanji:BRV:1.0.5'
+}

+ 21 - 0
sample/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

+ 24 - 0
sample/src/androidTest/java/com/drake/net/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.drake.net
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.drake.net", appContext.packageName)
+    }
+}

+ 24 - 0
sample/src/main/AndroidManifest.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.drake.net.sample">
+
+    <application
+        android:allowBackup="true"
+        android:name=".App"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

+ 13 - 0
sample/src/main/java/com/drake/net/sample/App.kt

@@ -0,0 +1,13 @@
+package com.drake.net.sample
+
+import android.app.Application
+import com.drake.net.setDefaultNetConfig
+
+class App : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        setDefaultNetConfig("http://192.168.1.1")
+    }
+}

+ 17 - 0
sample/src/main/java/com/drake/net/sample/MainActivity.kt

@@ -0,0 +1,17 @@
+package com.drake.net.sample
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.drake.net.post
+
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        post<Model>("") {
+            param("key", "value")
+        }
+    }
+}

+ 4 - 0
sample/src/main/java/com/drake/net/sample/Model.kt

@@ -0,0 +1,4 @@
+package com.drake.net.sample
+
+class Model {
+}

+ 34 - 0
sample/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

+ 170 - 0
sample/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

+ 18 - 0
sample/src/main/res/layout/activity_main.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 5 - 0
sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

+ 5 - 0
sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

BIN
sample/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
sample/src/main/res/mipmap-hdpi/ic_launcher_round.png


BIN
sample/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
sample/src/main/res/mipmap-mdpi/ic_launcher_round.png


BIN
sample/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png


BIN
sample/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png


BIN
sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png


BIN
sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png


+ 6 - 0
sample/src/main/res/values/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>

+ 3 - 0
sample/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Net</string>
+</resources>

+ 11 - 0
sample/src/main/res/values/styles.xml

@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>

+ 17 - 0
sample/src/test/java/com/drake/net/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.drake.net
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

+ 2 - 0
settings.gradle

@@ -0,0 +1,2 @@
+include ':sample', ':net'
+rootProject.name='Net'