diff --git a/README.md b/README.md index e554b91..ec13de7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -> MVP+Retrofit+RxJava实践小结，此Sample最初是Android MVP示例，后来融合Retrofit和RxJava，供参考。 +> MVP + Retrofit + RxJava2 实践小结，此 Sample 最初是 Android MVP 示例，后来融合 Retrofit 和 RxJava2，供参考。 # 效果预览 @@ -19,17 +19,8 @@ 1. [RxBus](http://wuxiaolong.me/2016/04/07/rxbus/) # 联系我 -我的微信公众号：吴小龙同学，欢迎关注交流。 +我的微信公众号：吴小龙同学，欢迎交流。 ![](http://7q5c2h.com1.z0.glb.clouddn.com/qrcode_wuxiaolong.jpg) -# 更多交流 -Android技术交流群-剩者为王⑤群：590967484 - -![](http://7q5c2h.com1.z0.glb.clouddn.com/qun5.png) - - - -# 关于作者 -[点击查看](http://wuxiaolong.me/about/) diff --git a/app/build.gradle b/app/build.gradle index 0e2895b..54ac6af 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,9 +1,7 @@ apply plugin: 'com.android.application' -apply plugin: 'com.jakewharton.butterknife' android { compileSdkVersion 27 - buildToolsVersion "27.0.3" defaultConfig { applicationId "com.wuxiaolong.androidmvpsample" @@ -14,13 +12,11 @@ android { } ext { - androidutilsVersion = '1.0.5' + androidutilsVersion = '1.0.6' appcompatVersion = '27.1.0' butterknifeVersion = '8.4.0' retrofitVersion = '2.3.0' - logginginterceptor = '3.9.1' - rxjavaVersion = '2.1.11' rxandroidVersion = "2.0.2" } @@ -28,16 +24,12 @@ ext { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "com.wuxiaolong.androidutils:androidutils:$androidutilsVersion" - implementation "com.android.support:appcompat-v7:$appcompatVersion" -// //butterknife - //noinspection GradleDependency - implementation "com.jakewharton:butterknife:$butterknifeVersion" annotationProcessor "com.jakewharton:butterknife-compiler:$butterknifeVersion" implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" implementation "com.squareup.okhttp3:logging-interceptor:$logginginterceptor" implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion" - implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion" + implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion" implementation "io.reactivex.rxjava2:rxandroid:$rxandroidVersion" implementation "io.reactivex.rxjava2:rxjava:$rxjavaVersion" diff --git a/app/src/androidTest/java/com/wuxiaolong/androidmvpsample/ApplicationTest.java b/app/src/androidTest/java/com/wuxiaolong/androidmvpsample/ApplicationTest.java deleted file mode 100644 index 66431ab..0000000 --- a/app/src/androidTest/java/com/wuxiaolong/androidmvpsample/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.wuxiaolong.androidmvpsample; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20a686e..ec0ad2f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,8 @@ android:theme="@style/AppTheme"> + android:label="@string/app_name" + android:screenOrientation="portrait"> diff --git a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java index 29887ad..872fea1 100644 --- a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java +++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java @@ -20,7 +20,6 @@ import com.wuxiaolong.androidutils.library.LogUtil; import java.util.ArrayList; import java.util.List; -import butterknife.ButterKnife; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; @@ -43,7 +42,6 @@ public abstract class BaseActivity extends AppCompatActivity { @Override public void setContentView(@LayoutRes int layoutResID) { super.setContentView(layoutResID); - ButterKnife.bind(this); mActivity = this; } @@ -51,14 +49,12 @@ public abstract class BaseActivity extends AppCompatActivity { @Override public void setContentView(View view) { super.setContentView(view); - ButterKnife.bind(this); mActivity = this; } @Override public void setContentView(View view, ViewGroup.LayoutParams params) { super.setContentView(view, params); - ButterKnife.bind(this); mActivity = this; } diff --git a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseFragment.java b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseFragment.java index 428d1c3..a032f15 100644 --- a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseFragment.java +++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseFragment.java @@ -11,9 +11,6 @@ import android.widget.Toast; import com.wuxiaolong.androidmvpsample.R; -import org.reactivestreams.Subscription; - -import butterknife.ButterKnife; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.observers.DisposableObserver; @@ -30,7 +27,6 @@ public class BaseFragment extends Fragment { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - ButterKnife.bind(this, view); mActivity = getActivity(); } diff --git a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java index e8d0b8f..fb4b005 100644 --- a/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java +++ b/app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java @@ -12,8 +12,6 @@ import com.wuxiaolong.androidmvpsample.mvp.other.MvpActivity; import com.wuxiaolong.androidmvpsample.retrofit.ApiCallback; import com.wuxiaolong.androidmvpsample.retrofit.RetrofitCallback; -import butterknife.BindView; -import butterknife.OnClick; import retrofit2.Call; /** @@ -25,14 +23,14 @@ import retrofit2.Call; */ public class MainActivity extends MvpActivity implements MainView { - @BindView(R.id.text) - TextView text; + private TextView text; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - initToolBarAsHome("MVP+Retrofit+Rxjava"); + text = findViewById(R.id.text); + initToolBarAsHome(getString(R.string.title)); } @Override @@ -49,12 +47,11 @@ public class MainActivity extends MvpActivity implements MainView @Override public void getDataFail(String msg) { - toastShow("网络不给力"); + toastShow(getString(R.string.net_error)); } - @OnClick({R.id.button0, R.id.button1, R.id.button2}) public void onClick(View view) { switch (view.getId()) { case R.id.button0: diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d8d046c..c435c75 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,12 +1,11 @@ - - +