merger

Author: geeklx

gradle.properties

@@ -20,7 +20,7 @@ android.injected.testOnly=false
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 PROJ_GROUP=com.geek
-PROJ_VERSION=1.9.9
+PROJ_VERSION=2.0.0
 PROJ_WEBSITEURL=https://github.com/GeekCodesTeam
 PROJ_ISSUETRACKERURL=https://github.com/GeekCodesTeam/geeklibs
 PROJ_VCSURL=https://github.com/GeekCodesTeam/geeklibs.git

libbase/src/main/java/com/geek/libbase/recycleviewcard2/StackAct.java

@@ -5,17 +5,17 @@
 import android.view.View;
 import android.widget.Button;
 
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-
 import com.geek.libbase.R;
+import com.geek.libbase.base.SlbBaseActivity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class StackAct extends AppCompatActivity {
+public class StackAct extends SlbBaseActivity {
     private static final String TAG = "MainActivity";
     private RecyclerView recyclerview;
     private RecyclerView hrRecyclerView;
@@ -35,9 +35,15 @@ public class StackAct extends AppCompatActivity {
             R.drawable.icon_lunbo2
     );
 
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    protected int getLayoutId() {
+        return R.layout.activity_recard2;
+    }
+
+    @Override
+    protected void setup(@Nullable Bundle savedInstanceState) {
+        super.setup(savedInstanceState);
         setContentView(R.layout.activity_recard2);
         recyclerview = findViewById(R.id.recyclerview);
         hrRecyclerView = findViewById(R.id.recyclerview1);
@@ -73,6 +79,12 @@ public void onClick(View v) {
         resetRight();
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+    }
+
     public void resetDefault() {
         List<StackBean> datas = new ArrayList<>();
         for (int i = 0; i < imageUrls.size(); i++) {
@@ -146,4 +158,5 @@ protected void onPause() {
         }
         super.onPause();
     }
+
 }

libbase/src/main/java/com/geek/libbase/recycleviewcard2/StackActVertical.java

@@ -4,18 +4,18 @@
 import android.view.View;
 import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-
 import com.geek.libbase.R;
+import com.geek.libbase.base.SlbBaseActivity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 
-public class StackActVertical extends AppCompatActivity {
+public class StackActVertical extends SlbBaseActivity {
 
     private TextView tv1;
     private RecyclerView verticalRecyclerview;
@@ -32,8 +32,13 @@ public class StackActVertical extends AppCompatActivity {
     );
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    protected int getLayoutId() {
+        return R.layout.activity_recard2_vertical;
+    }
+
+    @Override
+    protected void setup(@Nullable Bundle savedInstanceState) {
+        super.setup(savedInstanceState);
         setContentView(R.layout.activity_recard2_vertical);
         tv1 = findViewById(R.id.tv1);
         verticalRecyclerview = findViewById(R.id.recyclerview_vertical);
@@ -46,6 +51,12 @@ public void onClick(View v) {
         vr();
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+    }
+
     private void vr() {
         List<StackBean> datas = new ArrayList<>();
         for (int i = 0; i < imageUrls.size(); i++) {