解决合并冲突

getActivity · Jan 17, 2020 · 12fd135 · 12fd135
2 parents cd00f59 + 71731c6
commit 12fd135
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 109 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,50 +1,50 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 28
-
-    // 支持 JDK 1.8
-    compileOptions {
-        targetCompatibility JavaVersion.VERSION_1_8
-        sourceCompatibility JavaVersion.VERSION_1_8
-    }
-
-    defaultConfig {
-        applicationId "com.hjq.http.demo"
-        minSdkVersion 14
-        targetSdkVersion 28
-        versionCode 50
-        versionName "5.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':library')
-
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-
-    // 标题栏：https://github.com/getActivity/TitleBar
-    implementation 'com.hjq:titlebar:6.0'
-    // 吐司工具类：https://github.com/getActivity/ToastUtils
-    implementation 'com.hjq:toast:8.0'
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.hjq:xxpermissions:6.0'
-
-    // Json 解析框架：https://github.com/google/gson
-    implementation 'com.google.code.gson:gson:2.8.5'
-    // OkHttp 网络框架：https://github.com/square/okhttp
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+
+    // 支持 JDK 1.8
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        applicationId "com.hjq.http.demo"
+        minSdkVersion 14
+        targetSdkVersion 28
+        versionCode 50
+        versionName "5.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':library')
+
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+
+    // 标题栏：https://github.com/getActivity/TitleBar
+    implementation 'com.hjq:titlebar:6.0'
+    // 吐司工具类：https://github.com/getActivity/ToastUtils
+    implementation 'com.hjq:toast:8.0'
+    // 权限请求框架：https://github.com/getActivity/XXPermissions
+    implementation 'com.hjq:xxpermissions:6.0'
+
+    // Json 解析框架：https://github.com/google/gson
+    implementation 'com.google.code.gson:gson:2.8.5'
+    // OkHttp 网络框架：https://github.com/square/okhttp
+    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
 }
diff --git a/app/src/main/java/com/hjq/http/demo/MainActivity.java b/app/src/main/java/com/hjq/http/demo/MainActivity.java
@@ -120,7 +120,7 @@ public void onSucceed(HttpData<SearchBean> result) {
 
                             @Override
                             public void onSucceed(HttpData<SearchBean> result) {
-                                ToastUtils.show("请求成功");
+                                ToastUtils.show("请求成功" + result.getData().getSize());
                             }
                         });
                 break;

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,60 +1,60 @@
-// 文件开头配置
-apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
-
-android {
-    compileSdkVersion 26
-
-    // 使用 JDK 1.8
-    compileOptions {
-        targetCompatibility JavaVersion.VERSION_1_8
-        sourceCompatibility JavaVersion.VERSION_1_8
-    }
-
-    defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 26
-        versionCode 50
-        versionName "5.0"
-    }
-}
-
-dependencies {
-    compileOnly 'com.squareup.okhttp3:okhttp:3.12.1'
-    compileOnly 'com.android.support:support-fragment:26.0.0'
-}
-
-publish {
-    userOrg = 'getactivity'//填写bintray用户名，注意大小写
-    groupId = 'com.hjq'//定义的maven group id最终引用形式
-    artifactId = 'http'//maven的artifact id
-    version = '5.0'//maven 上发布版本号
-    description = 'Easy-to-use network request framework'//描述，自己定义
-    website = "https://github.com/getActivity/EasyHttp"//项目在github中的地址
-}
-
-tasks.withType(Javadoc) {//防止编码问题
-    options.addStringOption('Xdoclint:none', '-quiet')
-    options.addStringOption('encoding', 'UTF-8')
-    options.addStringOption('charSet', 'UTF-8')
-}
-
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
+// 文件开头配置
+apply plugin: 'com.android.library'
+apply plugin: 'com.novoda.bintray-release'
+
+android {
+    compileSdkVersion 26
+
+    // 使用 JDK 1.8
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 26
+        versionCode 50
+        versionName "5.0"
+    }
+}
+
+dependencies {
+    compileOnly 'com.squareup.okhttp3:okhttp:3.12.1'
+    compileOnly 'com.android.support:support-fragment:26.0.0'
+}
+
+publish {
+    userOrg = 'getactivity'//填写bintray用户名，注意大小写
+    groupId = 'com.hjq'//定义的maven group id最终引用形式
+    artifactId = 'http'//maven的artifact id
+    version = '5.0'//maven 上发布版本号
+    description = 'Easy-to-use network request framework'//描述，自己定义
+    website = "https://github.com/getActivity/EasyHttp"//项目在github中的地址
+}
+
+tasks.withType(Javadoc) {//防止编码问题
+    options.addStringOption('Xdoclint:none', '-quiet')
+    options.addStringOption('encoding', 'UTF-8')
+    options.addStringOption('charSet', 'UTF-8')
+}
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
 }