#update lib

MirkoWu · Jul 21, 2021 · d495afb · d495afb
1 parent dee0803
commit d495afb
Show file tree

Hide file tree

Showing 55 changed files with 323 additions and 668 deletions.
diff --git 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
@@ -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<EmptyMediator>() {
     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
@@ -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<String> 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
@@ -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<String> {
+    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
@@ -20,7 +20,8 @@ public class ImageAdapter extends BaseRVAdapter<GankImageBean, ImageAdapter.Hold
     @Override
     public void onBindHolder(@NonNull Holder holder, GankImageBean item, int position) {
         ImageLoader.load(holder.binding.ivImage, item.url, glideOptions);
-        addOnItemChildClickListener(holder, holder.binding.ivImage);
+        addOnClickListener(holder, holder.binding.ivImage);
+        addOnLongClickListener(holder, holder.binding.ivImage);
 
     }
 

diff --git a/app/src/main/java/com/mirkowu/mvm/mvvm/MVVMActivity.java b/app/src/main/java/com/mirkowu/mvm/mvvm/MVVMActivity.java
@@ -58,6 +58,13 @@ public void onItemChildClick(View view, Object item, int position) {
 
             }
         });
+        imageAdapter.setOnItemChildLongClickListener(new BaseRVAdapter.OnItemChildLongClickListener() {
+            @Override
+            public boolean onItemChildLongClick(View view, Object item, int position) {
+                LogUtil.i("TAG", "onItemChildLongClick: " + position);
+                return false;
+            }
+        });
 
 //        LiveDataUtilKt.observerRequest(mMediator.mRequestImageListData, this,
 //                () -> 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
@@ -19,8 +19,8 @@ class GridAdapter : BaseRVAdapter<String, GridAdapter.Holder>() {
         holder.binding.apply {
             tvTitle.text = "第${position}XXXXXXXXXX"
             tvContent.text = "内容${position}"
-            addOnItemChildClickListener(holder,tvTitle)
-            addOnItemChildClickListener(holder,tvContent)
+            addOnClickListener(holder,tvTitle)
+            addOnClickListener(holder,tvContent)
         }
     }
 }
diff --git 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">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_mvc"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
     <TextView
         android:id="@+id/tvTime"
         android:layout_width="wrap_content"
@@ -23,4 +28,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvTime" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git 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" />
 
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="mvcClick"
+        android:text="MVP"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
@@ -173,6 +182,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_list"
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 </LinearLayout>

diff --git a/build.gradle b/build.gradle
@@ -42,12 +42,13 @@ task clean(type: Delete) {
 }
 
 ext {
-    minSdkVersion = 21
-    targetSdkVersion = 29
     compileSdkVersion = 30
+    targetSdkVersion = 29
+    minSdkVersion = 21
 
-    mvm_version = '1.0.19'
+    mvm_version = '1.0.22'
     appcompat_version = '1.3.0'
+    material_version = '1.4.0'
     core_ktx_version = '1.5.0'
     lifecycle_version = '2.3.1'
     rxjava3_version = '3.0.11'

diff --git a/lib_base/build.gradle b/lib_base/build.gradle
@@ -12,7 +12,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "proguard-rules.pro"
     }
 
@@ -43,10 +42,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.core:core-ktx:$ext.core_ktx_version"
-    implementation "androidx.appcompat:appcompat:$ext.appcompat_version"
-    api 'androidx.recyclerview:recyclerview:1.2.1'
+    compileOnly "androidx.appcompat:appcompat:$ext.appcompat_version"
+    compileOnly 'androidx.recyclerview:recyclerview:1.2.1'
+
+    implementation project(':lib_util')
+    implementation project(':lib_widget')
 
     // ViewModel
     api "androidx.lifecycle:lifecycle-viewmodel:$ext.lifecycle_version"
@@ -62,9 +62,6 @@ dependencies {
     //api 'com.uber.autodispose:autodispose-android-archcomponents:1.4.0'
     api "com.uber.autodispose2:autodispose-androidx-lifecycle:$ext.autodispose_version"
 
-    implementation project(':lib_util')
-    implementation project(':lib_widget')
-
     // SmartRefresh核心必须依赖 + 经典刷新头 + 经典加载
     api "com.scwang.smart:refresh-layout-kernel:$ext.refresh_version"
     api "com.scwang.smart:refresh-header-classics:$ext.refresh_version"

diff --git a/lib_base/src/androidTest/java/com/mirkowu/lib_base/ExampleInstrumentedTest.java b/lib_base/src/androidTest/java/com/mirkowu/lib_base/ExampleInstrumentedTest.java
diff --git a/lib_base/src/test/java/com/mirkowu/lib_base/ExampleUnitTest.java b/lib_base/src/test/java/com/mirkowu/lib_base/ExampleUnitTest.java
diff --git a/lib_bugly/build.gradle b/lib_bugly/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 
 def ext = rootProject.ext
 android {
@@ -12,7 +11,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "proguard-rules.pro"
 //        ndk {
 //            //设置支持的SO库架构
@@ -37,12 +35,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.core:core-ktx:$ext.core_ktx_version"
-    implementation "androidx.appcompat:appcompat:$ext.appcompat_version"
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    compileOnly "androidx.appcompat:appcompat:$ext.appcompat_version"
 
     implementation project(':lib_util')
     implementation project(':lib_widget')

diff --git a/lib_bugly/src/androidTest/java/com/mirkowu/lib_bugly/ExampleInstrumentedTest.kt b/lib_bugly/src/androidTest/java/com/mirkowu/lib_bugly/ExampleInstrumentedTest.kt
diff --git a/lib_bugly/src/test/java/com/mirkowu/lib_bugly/ExampleUnitTest.kt b/lib_bugly/src/test/java/com/mirkowu/lib_bugly/ExampleUnitTest.kt