From d495afb334799eb9ece14f7f1fa7c55e41c879bc Mon Sep 17 00:00:00 2001 From: wumeng1 <1yw@Mirko> Date: Wed, 21 Jul 2021 19:12:49 +0800 Subject: [PATCH] #update lib --- app/build.gradle | 5 +- .../main/java/com/mirkowu/mvm/MainActivity.kt | 11 +- .../java/com/mirkowu/mvm/mvc/MVCActivity.java | 39 +++++++ .../java/com/mirkowu/mvm/mvc/TestAdapter.java | 22 ++++ .../com/mirkowu/mvm/mvvm/ImageAdapter.java | 3 +- .../com/mirkowu/mvm/mvvm/MVVMActivity.java | 7 ++ .../mirkowu/mvm/recycelerview/GridAdapter.kt | 4 +- app/src/main/res/layout/activity_m_v_c.xml | 7 ++ .../main/res/layout/fragment_databinding.xml | 10 ++ build.gradle | 7 +- lib_base/build.gradle | 13 +-- .../lib_base/ExampleInstrumentedTest.java | 26 ----- .../com/mirkowu/lib_base/ExampleUnitTest.java | 17 --- lib_bugly/build.gradle | 9 +- .../lib_bugly/ExampleInstrumentedTest.kt | 24 ----- .../com/mirkowu/lib_bugly/ExampleUnitTest.kt | 17 --- lib_crash/build.gradle | 2 +- .../lib_crash/ExampleInstrumentedTest.kt | 24 ----- .../com/mirkowu/lib_crash/ExampleUnitTest.kt | 17 --- lib_image/build.gradle | 12 +-- .../lib_image/ExampleInstrumentedTest.kt | 24 ----- .../com/mirkowu/lib_image/ExampleUnitTest.kt | 17 --- lib_network/build.gradle | 20 ++-- .../lib_network/ExampleInstrumentedTest.kt | 24 ----- .../lib_network/download/Downloader.java | 8 +- .../mirkowu/lib_network/ExampleUnitTest.kt | 17 --- lib_photo/build.gradle | 10 +- .../lib_photo/ExampleInstrumentedTest.kt | 24 ----- .../view/ImagePickerRecyclerView.java | 4 +- .../com/mirkowu/lib_photo/ExampleUnitTest.kt | 17 --- lib_qr/build.gradle | 9 +- .../mirkowu/lib_qr/ExampleInstrumentedTest.kt | 24 ----- .../com/mirkowu/lib_qr/ExampleUnitTest.kt | 17 --- lib_screen/build.gradle | 1 - .../lib_screen/ExampleInstrumentedTest.kt | 24 ----- .../com/mirkowu/lib_screen/ExampleUnitTest.kt | 17 --- lib_stat/build.gradle | 15 +-- .../lib_stat/ExampleInstrumentedTest.kt | 24 ----- .../com/mirkowu/lib_stat/ExampleUnitTest.kt | 17 --- lib_upgrade/build.gradle | 9 +- .../lib_upgrade/ExampleInstrumentedTest.kt | 24 ----- .../mirkowu/lib_upgrade/ExampleUnitTest.kt | 17 --- lib_util/build.gradle | 20 ++-- .../lib_util/ExampleInstrumentedTest.kt | 24 ----- .../com/mirkowu/lib_util/ExampleUnitTest.kt | 17 --- lib_webview/build.gradle | 12 +-- .../lib_webview/ExampleInstrumentedTest.kt | 24 ----- .../mirkowu/lib_webview/ExampleUnitTest.kt | 17 --- lib_widget/build.gradle | 13 +-- .../lib_widget/ExampleInstrumentedTest.kt | 24 ----- .../lib_widget/adapter/BaseRVAdapter.java | 100 ++++++++++++++++-- .../lib_widget/adapter/BaseRVHolder.java | 1 - .../lib_widget/adapter/SimpleRVAdapter.java | 81 ++++++++++++++ lib_widget/src/main/res/values/ids.xml | 2 +- .../com/mirkowu/lib_widget/ExampleUnitTest.kt | 17 --- 55 files changed, 323 insertions(+), 668 deletions(-) create mode 100644 app/src/main/java/com/mirkowu/mvm/mvc/TestAdapter.java delete mode 100644 lib_base/src/androidTest/java/com/mirkowu/lib_base/ExampleInstrumentedTest.java delete mode 100644 lib_base/src/test/java/com/mirkowu/lib_base/ExampleUnitTest.java delete mode 100644 lib_bugly/src/androidTest/java/com/mirkowu/lib_bugly/ExampleInstrumentedTest.kt delete mode 100644 lib_bugly/src/test/java/com/mirkowu/lib_bugly/ExampleUnitTest.kt delete mode 100644 lib_crash/src/androidTest/java/com/mirkowu/lib_crash/ExampleInstrumentedTest.kt delete mode 100644 lib_crash/src/test/java/com/mirkowu/lib_crash/ExampleUnitTest.kt delete mode 100644 lib_image/src/androidTest/java/com/mirkowu/lib_image/ExampleInstrumentedTest.kt delete mode 100644 lib_image/src/test/java/com/mirkowu/lib_image/ExampleUnitTest.kt delete mode 100644 lib_network/src/androidTest/java/com/mirkowu/lib_network/ExampleInstrumentedTest.kt delete mode 100644 lib_network/src/test/java/com/mirkowu/lib_network/ExampleUnitTest.kt delete mode 100644 lib_photo/src/androidTest/java/com/mirkowu/lib_photo/ExampleInstrumentedTest.kt delete mode 100644 lib_photo/src/test/java/com/mirkowu/lib_photo/ExampleUnitTest.kt delete mode 100644 lib_qr/src/androidTest/java/com/mirkowu/lib_qr/ExampleInstrumentedTest.kt delete mode 100644 lib_qr/src/test/java/com/mirkowu/lib_qr/ExampleUnitTest.kt delete mode 100644 lib_screen/src/androidTest/java/com/mirkowu/lib_screen/ExampleInstrumentedTest.kt delete mode 100644 lib_screen/src/test/java/com/mirkowu/lib_screen/ExampleUnitTest.kt delete mode 100644 lib_stat/src/androidTest/java/com/mirkowu/lib_stat/ExampleInstrumentedTest.kt delete mode 100644 lib_stat/src/test/java/com/mirkowu/lib_stat/ExampleUnitTest.kt delete mode 100644 lib_upgrade/src/androidTest/java/com/mirkowu/lib_upgrade/ExampleInstrumentedTest.kt delete mode 100644 lib_upgrade/src/test/java/com/mirkowu/lib_upgrade/ExampleUnitTest.kt delete mode 100644 lib_util/src/androidTest/java/com/mirkowu/lib_util/ExampleInstrumentedTest.kt delete mode 100644 lib_util/src/test/java/com/mirkowu/lib_util/ExampleUnitTest.kt delete mode 100644 lib_webview/src/androidTest/java/com/mirkowu/lib_webview/ExampleInstrumentedTest.kt delete mode 100644 lib_webview/src/test/java/com/mirkowu/lib_webview/ExampleUnitTest.kt delete mode 100644 lib_widget/src/androidTest/java/com/mirkowu/lib_widget/ExampleInstrumentedTest.kt create mode 100644 lib_widget/src/main/java/com/mirkowu/lib_widget/adapter/SimpleRVAdapter.java delete mode 100644 lib_widget/src/test/java/com/mirkowu/lib_widget/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index 408800b..f6ecd49 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,7 +29,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // ndk { // //设置支持的SO库架构 -// abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' +// abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a'//, 'x86', 'x86_64' // } } @@ -98,7 +98,7 @@ dependencies { implementation "androidx.core:core-ktx:$ext.core_ktx_version" implementation "androidx.appcompat:appcompat:$ext.appcompat_version" implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'com.google.android.material:material:1.3.0' + implementation "com.google.android.material:material:$ext.material_version" testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' @@ -134,6 +134,7 @@ dependencies { implementation project(path: ':lib_bugly') //bugly 包含升级SDK 二选一 // implementation project(path: ':lib_crash') //bugly 不含升级SDK 二选一 + implementation "com.github.bumptech.glide:glide:$ext.glide_version" //检测内测泄露 debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6' } diff --git a/app/src/main/java/com/mirkowu/mvm/MainActivity.kt b/app/src/main/java/com/mirkowu/mvm/MainActivity.kt index 5d08acd..bcdc0be 100644 --- a/app/src/main/java/com/mirkowu/mvm/MainActivity.kt +++ b/app/src/main/java/com/mirkowu/mvm/MainActivity.kt @@ -12,6 +12,7 @@ import com.mirkowu.lib_bugly.BuglyManager import com.mirkowu.lib_bugly.UpgradeDialog import com.mirkowu.lib_util.utilcode.util.ToastUtils import com.mirkowu.mvm.base.BaseActivity +import com.mirkowu.mvm.mvc.MVCActivity import com.mirkowu.mvm.mvp.MVPActivity import com.mirkowu.mvm.mvvm.MVVMActivity import com.mirkowu.mvm.recycelerview.GridListActivity @@ -77,10 +78,18 @@ class MainActivity : BaseActivity() { fun webNetClick(view: View?) { // CommonWebActivity.start(context, "ces", "http://www.baid") // WebViewActivity.start(context, "ces", "https://x5.tencent.com/docs/questions.html") - WebActivity.start(context, "标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题", "http://www.baidu.com/") + WebActivity.start( + context, + "标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题", + "http://www.baidu.com/" + ) Log.d("WebActivity", "start: ") } + fun mvcClick(view: View?) { + MVCActivity.start(this) + } + fun mvpClick(view: View?) { MVPActivity.start(this) } diff --git a/app/src/main/java/com/mirkowu/mvm/mvc/MVCActivity.java b/app/src/main/java/com/mirkowu/mvm/mvc/MVCActivity.java index 95d2e94..c59d6de 100644 --- a/app/src/main/java/com/mirkowu/mvm/mvc/MVCActivity.java +++ b/app/src/main/java/com/mirkowu/mvm/mvc/MVCActivity.java @@ -5,14 +5,22 @@ import android.view.View; import android.widget.TextView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.mirkowu.lib_base.mediator.BaseMediator; import com.mirkowu.lib_base.util.RxLife; import com.mirkowu.lib_network.ErrorType; +import com.mirkowu.lib_util.utilcode.util.ToastUtils; +import com.mirkowu.lib_widget.adapter.BaseRVAdapter; import com.mirkowu.mvm.BizModel; import com.mirkowu.mvm.R; import com.mirkowu.mvm.base.BaseActivity; import com.mirkowu.mvm.network.RxObserver; +import java.util.ArrayList; +import java.util.List; + /** * MVC 不太建议,只做参考 */ @@ -39,6 +47,37 @@ protected int getLayoutId() { @Override protected void initialize() { tvTime = findViewById(R.id.tvTime); + RecyclerView rvMvc = findViewById(R.id.rv_mvc); + TestAdapter adapter = new TestAdapter(); + rvMvc.setLayoutManager(new LinearLayoutManager(getContext())); + rvMvc.setAdapter(adapter); + adapter.setOnItemClickListener(new BaseRVAdapter.OnItemClickListener() { + @Override + public void onItemClick(View view, Object item, int position) { + ToastUtils.showShort("Item点击"); + } + }); + adapter.setOnItemChildClickListener(new BaseRVAdapter.OnItemChildClickListener() { + @Override + public void onItemChildClick(View view, Object item, int position) { + ToastUtils.showShort("Item child点击"); + + } + }); + adapter.setOnItemChildLongClickListener(new BaseRVAdapter.OnItemChildLongClickListener() { + @Override + public boolean onItemChildLongClick(View view, Object item, int position) { + ToastUtils.showShort("Item child long 点击"); + + return true; + } + }); + List list = new ArrayList<>(); + for (int i = 0; i < 10; i++) { + list.add(""); + } + adapter.setData(list); + loadData(); } diff --git a/app/src/main/java/com/mirkowu/mvm/mvc/TestAdapter.java b/app/src/main/java/com/mirkowu/mvm/mvc/TestAdapter.java new file mode 100644 index 0000000..02669dc --- /dev/null +++ b/app/src/main/java/com/mirkowu/mvm/mvc/TestAdapter.java @@ -0,0 +1,22 @@ +package com.mirkowu.mvm.mvc; + +import androidx.annotation.NonNull; + +import com.mirkowu.lib_widget.adapter.BaseRVHolder; +import com.mirkowu.lib_widget.adapter.SimpleRVAdapter; +import com.mirkowu.mvm.R; + +public class TestAdapter extends SimpleRVAdapter { + public TestAdapter() { + super(R.layout.item_binding_list); + } + + @Override + public void onBindHolder(@NonNull BaseRVHolder holder, String item, int position) { + holder.setText(R.id.tv_title, "标题" + position) + .setText(R.id.tv_content, "内容" + position); + + addOnClickListener(holder, R.id.tv_title, R.id.tv_content); + addOnLongClickListener(holder, R.id.tv_title, R.id.tv_content); + } +} diff --git a/app/src/main/java/com/mirkowu/mvm/mvvm/ImageAdapter.java b/app/src/main/java/com/mirkowu/mvm/mvvm/ImageAdapter.java index b28f91f..2493ae4 100644 --- a/app/src/main/java/com/mirkowu/mvm/mvvm/ImageAdapter.java +++ b/app/src/main/java/com/mirkowu/mvm/mvvm/ImageAdapter.java @@ -20,7 +20,8 @@ public class ImageAdapter extends BaseRVAdapter null, () -> null, diff --git a/app/src/main/java/com/mirkowu/mvm/recycelerview/GridAdapter.kt b/app/src/main/java/com/mirkowu/mvm/recycelerview/GridAdapter.kt index 61a5ba6..d2f3a99 100644 --- a/app/src/main/java/com/mirkowu/mvm/recycelerview/GridAdapter.kt +++ b/app/src/main/java/com/mirkowu/mvm/recycelerview/GridAdapter.kt @@ -19,8 +19,8 @@ class GridAdapter : BaseRVAdapter() { holder.binding.apply { tvTitle.text = "第${position}XXXXXXXXXX" tvContent.text = "内容${position}" - addOnItemChildClickListener(holder,tvTitle) - addOnItemChildClickListener(holder,tvContent) + addOnClickListener(holder,tvTitle) + addOnClickListener(holder,tvContent) } } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_m_v_c.xml b/app/src/main/res/layout/activity_m_v_c.xml index 8d7d5f5..6003d04 100644 --- a/app/src/main/res/layout/activity_m_v_c.xml +++ b/app/src/main/res/layout/activity_m_v_c.xml @@ -5,6 +5,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".mvc.MVCActivity"> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_databinding.xml b/app/src/main/res/layout/fragment_databinding.xml index 8883e1e..bd63619 100644 --- a/app/src/main/res/layout/fragment_databinding.xml +++ b/app/src/main/res/layout/fragment_databinding.xml @@ -32,6 +32,15 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.282" /> +