Skip to content

Commit 817352b

Browse files
author
AstaTus
committed
gradle
1 parent 8091a89 commit 817352b

File tree

7 files changed

+16
-10
lines changed

7 files changed

+16
-10
lines changed

app/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ android {
3636
}
3737

3838
dependencies {
39+
implementation fileTree(dir: 'libs', include: ['*.jar'])
3940
//databidning
4041
kapt "com.android.databinding:compiler:3.0.0-alpha3"
4142
implementation 'com.android.support:appcompat-v7:26.1.0'
@@ -49,6 +50,6 @@ dependencies {
4950
implementation 'com.android.support:multidex:1.0.1'
5051
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
5152
//implementation files('E:/Android/github/easysocketlansample/libs/easysocketlan.jar')
52-
implementation project(':easysocketlan')
53+
//implementation project(':easysocketlan')
5354
implementation 'com.android.support:support-v4:26.1.0'
5455
}

app/libs/easysocketlan.jar

-36.9 KB
Binary file not shown.

easysocketlan/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ android {
2525
}
2626

2727
dependencies {
28-
compile fileTree(dir: 'libs', include: ['*.jar'])
28+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2929

3030
// implementation 'com.android.support:appcompat-v7:26.1.0'
3131
// testImplementation 'junit:junit:4.12'
3232
// androidTestImplementation 'com.android.support.test:runner:1.0.1'
3333
// androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
3434

35-
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
36-
compile 'io.reactivex.rxjava2:rxjava:2.1.6'
37-
compile 'com.google.code.gson:gson:2.8.2'
35+
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
36+
implementation 'io.reactivex.rxjava2:rxjava:2.1.6'
37+
implementation 'com.google.code.gson:gson:2.8.2'
3838

3939
}
4040

easysocketlan/src/main/java/com/astatus/easysocketlan/LanClient.java

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.google.gson.Gson;
1010

1111
import java.net.Socket;
12-
import java.util.function.Consumer;
1312

1413
import io.reactivex.Observable;
1514
import io.reactivex.Observer;
@@ -18,7 +17,6 @@
1817
import io.reactivex.plugins.RxJavaPlugins;
1918
import io.reactivex.schedulers.Schedulers;
2019

21-
import static android.content.ContentValues.TAG;
2220

2321
/**
2422
* Created by Administrator on 2017/10/20.

easysocketlansamplerclient/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ dependencies {
4949
implementation 'com.android.support:appcompat-v7:26.1.0'
5050
testImplementation 'junit:junit:4.12'
5151
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
52-
implementation project(':easysocketlan')
53-
implementation 'com.android.support:multidex:1.0.1'
52+
//implementation project(':easysocketlan')
53+
implementation 'com.android.support:multidex:1.0.0'
5454
}
39.9 KB
Binary file not shown.

easysocketlansamplerclient/src/main/java/com/astatus/easysocketlansamplerclient/ClientApp.kt

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.astatus.easysocketlansamplerclient
22

33
import android.app.Application
4+
import android.content.Context
5+
import android.support.multidex.MultiDex
46
import android.support.multidex.MultiDexApplication
57

68
/**
79
* Created by Administrator on 2017/11/16.
810
*/
9-
class ClientApp: MultiDexApplication() {
11+
class ClientApp: Application() {
1012

1113
companion object {
1214
private var sSingleton: ClientApp? = null
@@ -28,6 +30,11 @@ class ClientApp: MultiDexApplication() {
2830
initCrashHandler()
2931
}
3032

33+
override fun attachBaseContext(base: Context?) {
34+
super.attachBaseContext(base)
35+
MultiDex.install(this);
36+
}
37+
3138

3239
private fun initCrashHandler(){
3340

0 commit comments

Comments
 (0)