Commit 817352b AstaTus
committed
1 parent 8091a89 commit 817352b Copy full SHA for 817352b
File tree 7 files changed +16
-10
lines changed
src/main/java/com/astatus/easysocketlan
easysocketlansamplerclient
src/main/java/com/astatus/easysocketlansamplerclient
7 files changed +16
-10
lines changed Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ android {
36
36
}
37
37
38
38
dependencies {
39
+ implementation fileTree(dir : ' libs' , include : [' *.jar' ])
39
40
// databidning
40
41
kapt " com.android.databinding:compiler:3.0.0-alpha3"
41
42
implementation ' com.android.support:appcompat-v7:26.1.0'
@@ -49,6 +50,6 @@ dependencies {
49
50
implementation ' com.android.support:multidex:1.0.1'
50
51
implementation " org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version "
51
52
// implementation files('E:/Android/github/easysocketlansample/libs/easysocketlan.jar')
52
- implementation project(' :easysocketlan' )
53
+ // implementation project(':easysocketlan')
53
54
implementation ' com.android.support:support-v4:26.1.0'
54
55
}
Original file line number Diff line number Diff line change @@ -25,16 +25,16 @@ android {
25
25
}
26
26
27
27
dependencies {
28
- compile fileTree(dir : ' libs' , include : [' *.jar' ])
28
+ implementation fileTree(dir : ' libs' , include : [' *.jar' ])
29
29
30
30
// implementation 'com.android.support:appcompat-v7:26.1.0'
31
31
// testImplementation 'junit:junit:4.12'
32
32
// androidTestImplementation 'com.android.support.test:runner:1.0.1'
33
33
// androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
34
34
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'
38
38
39
39
}
40
40
Original file line number Diff line number Diff line change 9
9
import com .google .gson .Gson ;
10
10
11
11
import java .net .Socket ;
12
- import java .util .function .Consumer ;
13
12
14
13
import io .reactivex .Observable ;
15
14
import io .reactivex .Observer ;
18
17
import io .reactivex .plugins .RxJavaPlugins ;
19
18
import io .reactivex .schedulers .Schedulers ;
20
19
21
- import static android .content .ContentValues .TAG ;
22
20
23
21
/**
24
22
* Created by Administrator on 2017/10/20.
Original file line number Diff line number Diff line change @@ -49,6 +49,6 @@ dependencies {
49
49
implementation ' com.android.support:appcompat-v7:26.1.0'
50
50
testImplementation ' junit:junit:4.12'
51
51
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 '
54
54
}
Original file line number Diff line number Diff line change 1
1
package com.astatus.easysocketlansamplerclient
2
2
3
3
import android.app.Application
4
+ import android.content.Context
5
+ import android.support.multidex.MultiDex
4
6
import android.support.multidex.MultiDexApplication
5
7
6
8
/* *
7
9
* Created by Administrator on 2017/11/16.
8
10
*/
9
- class ClientApp : MultiDexApplication () {
11
+ class ClientApp : Application () {
10
12
11
13
companion object {
12
14
private var sSingleton: ClientApp ? = null
@@ -28,6 +30,11 @@ class ClientApp: MultiDexApplication() {
28
30
initCrashHandler()
29
31
}
30
32
33
+ override fun attachBaseContext (base : Context ? ) {
34
+ super .attachBaseContext(base)
35
+ MultiDex .install(this );
36
+ }
37
+
31
38
32
39
private fun initCrashHandler (){
33
40
You can’t perform that action at this time.
0 commit comments