Skip to content

Commit fd720bb

Browse files
jenly1314jenly1314
committed
1、新增WebFragment
2、更新de.greenrobot:eventbus:3.0.0-beta1 为 'org.greenrobot:eventbus:3.0.0'
1 parent 4ae7f3e commit fd720bb

File tree

8 files changed

+36
-22
lines changed

8 files changed

+36
-22
lines changed

‎Base.iml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,26 +81,39 @@
8181
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8282
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8383
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8590
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.0.0/jars" />
8691
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.0.0/jars" />
8792
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/24.0.0/jars" />
8893
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0/jars" />
8994
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.0.0/jars" />
9095
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
91100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
92101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
93106
</content>
94107
<orderEntry type="jdk" jdkName="Android API 24 Platform (1)" jdkType="Android SDK" />
95108
<orderEntry type="sourceFolder" forTests="false" />
96109
<orderEntry type="library" exported="" name="recyclerview-v7-24.0.0" level="project" />
97110
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
98111
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
99-
<orderEntry type="library" exported="" name="eventbus-3.0.0-beta1" level="project" />
100112
<orderEntry type="library" exported="" name="appcompat-v7-24.0.0" level="project" />
101113
<orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
102114
<orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
103115
<orderEntry type="library" exported="" name="support-vector-drawable-24.0.0" level="project" />
104116
<orderEntry type="library" exported="" name="animated-vector-drawable-24.0.0" level="project" />
117+
<orderEntry type="library" exported="" name="eventbus-3.0.0" level="project" />
105118
</component>
106119
</module>

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ Base是针对于Android开发封装好一些常用的基类，主要包括通用
1414
<dependency>
1515
<groupId>com.king.base</groupId>
1616
<artifactId>base</artifactId>
17-
<version>1.3</version>
17+
<version>2.0</version>
1818
<type>pom</type>
1919
</dependency>
2020
```
2121
###Gradle:
2222
```gradle
23-
compile 'com.king.base:base:1.3'
23+
compile 'com.king.base:base:2.0'
2424
```
2525
###Lvy:
2626
```lvy
27-
<dependency org='com.king.base' name='base' rev='1.3'>
27+
<dependency org='com.king.base' name='base' rev='2.0'>
2828
<artifact name='$AID' ext='pom'></artifact>
2929
</dependency>
3030
```
3131

3232
###引入的库：
3333
```gradle
34-
compile 'com.android.support:recyclerview-v7:24.0.+'
34+
provided 'com.android.support:recyclerview-v7:24.0.+'
3535
```
3636

3737
```gradle

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ android {
2828
dependencies {
2929
compile fileTree(include: ['*.jar'], dir: 'libs')
3030
testCompile 'junit:junit:4.12'
31-
provided 'com.android.support:appcompat-v7:24.0.+'
3231
provided 'com.android.support:recyclerview-v7:24.0.+'
33-
provided 'de.greenrobot:eventbus:3.0.+'
32+
compile 'com.android.support:appcompat-v7:24.0.+'
33+
compile 'org.greenrobot:eventbus:3.0.0'
3434

3535
}
3636

@@ -39,7 +39,7 @@ publish {
3939
userOrg = 'jenly'//bintray.com用户名
4040
groupId = 'com.king.base'//jcenter上的路径
4141
artifactId = 'base'//项目名称
42-
publishVersion = '1.3'//版本号
42+
publishVersion = '2.0'//版本号
4343
desc = 'Base for Android'//描述
4444
website = 'https://github.com/jenly1314/Base'//网站
4545
}

‎src/main/java/com/king/base/BaseActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
import com.king.base.util.StringUtils;
4949
import com.king.base.util.ToastUtils;
5050

51-
import de.greenrobot.event.EventBus;
52-
import de.greenrobot.event.Subscribe;
53-
import de.greenrobot.event.ThreadMode;
51+
import org.greenrobot.eventbus.EventBus;
52+
import org.greenrobot.eventbus.Subscribe;
53+
import org.greenrobot.eventbus.ThreadMode;
5454

5555
/**
5656
* @author Jenly
@@ -351,13 +351,13 @@ public boolean showAssist(Bundle args) {
351351
return super.showAssist(args);
352352
}
353353

354-
@Subscribe(threadMode = ThreadMode.MainThread)
354+
@Subscribe(threadMode = ThreadMode.MAIN)
355355
public void onEventExit(Boolean isExit){
356356
if(isExit)
357357
finish();
358358
}
359359

360-
@Subscribe(threadMode = ThreadMode.MainThread)
360+
@Subscribe(threadMode = ThreadMode.MAIN)
361361
public void onEventMainThread(EventMessage em){
362362
onEventMessage(em);
363363
}

‎src/main/java/com/king/base/BaseDialogFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
import com.king.base.util.StringUtils;
4747
import com.king.base.util.ToastUtils;
4848

49-
import de.greenrobot.event.EventBus;
50-
import de.greenrobot.event.Subscribe;
51-
import de.greenrobot.event.ThreadMode;
49+
import org.greenrobot.eventbus.EventBus;
50+
import org.greenrobot.eventbus.Subscribe;
51+
import org.greenrobot.eventbus.ThreadMode;
5252

5353
/**
5454
* @author Jenly
@@ -346,7 +346,7 @@ public void exit(){
346346
sendEvent(true);
347347
}
348348

349-
@Subscribe(threadMode = ThreadMode.MainThread)
349+
@Subscribe(threadMode = ThreadMode.MAIN)
350350
public void onEventMainThread(EventMessage em){
351351
onEventMessage(em);
352352
}

‎src/main/java/com/king/base/BaseFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import com.king.base.util.StringUtils;
4646
import com.king.base.util.ToastUtils;
4747

48-
import de.greenrobot.event.EventBus;
49-
import de.greenrobot.event.Subscribe;
50-
import de.greenrobot.event.ThreadMode;
48+
import org.greenrobot.eventbus.EventBus;
49+
import org.greenrobot.eventbus.Subscribe;
50+
import org.greenrobot.eventbus.ThreadMode;
5151

5252
/**
5353
* @author Jenly
@@ -381,7 +381,7 @@ public void exit(){
381381
sendEvent(true);
382382
}
383383

384-
@Subscribe(threadMode = ThreadMode.MainThread)
384+
@Subscribe(threadMode = ThreadMode.MAIN)
385385
public void onEventMainThread(EventMessage em){
386386
onEventMessage(em);
387387
}

‎src/main/java/com/king/base/fragment/WebFragment.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public int inflaterRootView() {
5757
return R.layout.fragment_web;
5858
}
5959

60+
6061
@Override
6162
public void initUI() {
6263
rootView.setFocusable(true);

‎src/main/res/values/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<item name="android:progressBarStyle">@style/Base.Widget.AppCompat.ProgressBar</item>
2929
</style>
3030

31-
<style name="progressBarHorizontalStyle" parent="Widget.AppCompat.ProgressBar.Horizontal">
31+
<style name="progressBarHorizontalStyle" parent="Base.Widget.AppCompat.ProgressBar.Horizontal">
3232
</style>
3333

3434
</resources>

0 commit comments

Comments
 (0)