Merge branch 'dev' of https://github.com/luiing/StackViewLayout into dev

luiing · luiing · commit 6f0670b73ece · 2020-06-02T18:52:22.000+08:00
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 
  #### Captures
 
-![效果图](/pic/pic001.jpeg)
+![效果图]()
 
 ### Use
     implementation 'com.uis:stacklayout:0.5.0'
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
@@ -29,7 +29,7 @@ task clean(type: Delete) {
 
 ext{
     androidx = '1.0.0'
-    compileVer = 28
+    compileVer = 29
     minVer = 15
-    buildVer = '28.0.3'
+    buildVer = '29.0.3'
 }
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -30,5 +30,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation "androidx.viewpager:viewpager:${androidx}"
     implementation 'com.facebook.fresco:fresco:2.2.0'
+    implementation 'com.uis:stacklayout:0.3.4'
     implementation project(':stacklayout')
 }
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config"
         >
-        <activity android:name=".activity.MainActivity"
+        <activity android:name="com.uis.stackviewlayout.demo.activity.MainActivity"
             android:screenOrientation="portrait"
             >
             <intent-filter>
diff --git a/demo/src/main/java/com/uis/stackviewlayout/demo/activity/MainActivity.java b/demo/src/main/java/com/uis/stackviewlayout/demo/activity/MainActivity.java
@@ -1,4 +1,4 @@
-package com.uis.stackview.demo.activity;
+package com.uis.stackviewlayout.demo.activity;
 
 import android.graphics.Color;
 import android.os.Build;
@@ -9,7 +9,7 @@
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.uis.stackview.demo.R;
-import com.uis.stackview.demo.entity.ItemEntity;
+import com.uis.stackviewlayout.demo.entity.ItemEntity;
 import java.util.List;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
diff --git a/demo/src/main/java/com/uis/stackviewlayout/demo/activity/StackAdapter.java b/demo/src/main/java/com/uis/stackviewlayout/demo/activity/StackAdapter.java
@@ -1,14 +1,16 @@
-package com.uis.stackview.demo.activity;
+package com.uis.stackviewlayout.demo.activity;
 
 import android.content.Context;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import com.bumptech.glide.Glide;
-import com.uis.stackview.demo.R;
-import com.uis.stackview.demo.entity.ItemEntity;
 import com.uis.stackview.StackLayout;
+import com.uis.stackview.demo.R;
+import com.uis.stackviewlayout.demo.entity.ItemEntity;
+import com.uis.stackviewlayout.StackViewLayout;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import java.io.InputStream;
@@ -72,9 +74,9 @@ public static ArrayList<ItemEntity> initDataList(Context context) {
     }
 
     static class StackVH extends RecyclerView.ViewHolder{
-        StackLayout stackLayout;
+        StackViewLayout stackLayout;
         List<ItemEntity> stackData = new ArrayList<>();
-        StackLayout.StackAdapter adapter = new StackLayout.StackAdapter() {
+        StackViewLayout.StackViewAdapter adapter = new StackViewLayout.StackViewAdapter() {
 
             @Override
             public View onCreateView(ViewGroup parent,int viewType) {
@@ -83,6 +85,7 @@ public View onCreateView(ViewGroup parent,int viewType) {
 
             @Override
             public void onBindView(View view, int position) {
+                Log.e("xx","onBind="+position);
                 ImageView imageView = view.findViewById(R.id.imageView);
                 try{
                     Glide.with(view.getContext()).load(stackData.get(position).getMapImageUrl()).into(imageView);
@@ -95,25 +98,46 @@ public void onBindView(View view, int position) {
             public int getItemCount() {
                 return stackData.size();
             }
+        };
 
+        StackLayout layout;
+        StackLayout.StackAdapter adapter1 = new StackLayout.StackAdapter() {
             @Override
-            public void onItemDisplay(int position) {
+            public View onCreateView(ViewGroup parent) {
+                return LayoutInflater.from(parent.getContext()).inflate(R.layout.item_layout,parent,false);
+            }
+
+            @Override
+            public void onBindView(View view, int position) {
+                ImageView imageView = view.findViewById(R.id.imageView);
+                try{
+                    Glide.with(view.getContext()).load(stackData.get(position).getMapImageUrl()).into(imageView);
+                }catch (Exception ex){
+                    ex.printStackTrace();
+                }
+            }
 
+            @Override
+            public int getItemCount() {
+                return stackData.size();
             }
         };
 
         public StackVH(boolean left,ViewGroup parent) {
             super(LayoutInflater.from(parent.getContext()).inflate(
                     left ? R.layout.stack_left : R.layout.stack_right,parent,false));
-            stackLayout = itemView.findViewById(R.id.stacklayout);
+            if(left)
+                stackLayout = itemView.findViewById(R.id.stacklayout);
+            else
+                layout = itemView.findViewById(R.id.stacklayout);
         }
 
         public void binderVH(final List<ItemEntity> dataList){
             stackData = dataList;
-            if(stackLayout.getAdapter() == null) {
+            if(stackLayout != null && stackLayout.getAdapter() == null) {
                 stackLayout.setAdapter(adapter);
-            }else{
-                stackLayout.notifyDataChanged();
+            }else if(layout != null && layout.getAdapter() == null){
+                layout.setAdapter(adapter1);
             }
         }
     }
diff --git a/demo/src/main/java/com/uis/stackviewlayout/demo/activity/ViewPagerAdapter.java b/demo/src/main/java/com/uis/stackviewlayout/demo/activity/ViewPagerAdapter.java
@@ -1,12 +1,12 @@
-package com.uis.stackview.demo.activity;
+package com.uis.stackviewlayout.demo.activity;
 
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.uis.stackview.demo.R;
-import com.uis.stackview.demo.entity.ItemEntity;
+import com.uis.stackviewlayout.demo.entity.ItemEntity;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/demo/src/main/java/com/uis/stackviewlayout/demo/entity/ItemEntity.java b/demo/src/main/java/com/uis/stackviewlayout/demo/entity/ItemEntity.java
@@ -1,4 +1,4 @@
-package com.uis.stackview.demo.entity;
+package com.uis.stackviewlayout.demo.entity;
 
 import org.json.JSONObject;
 
diff --git a/demo/src/main/res/layout/stack_left.xml b/demo/src/main/res/layout/stack_left.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.uis.stackview.StackLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.uis.stackviewlayout.StackViewLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:stack="http://schemas.android.com/apk/res-auto"
     android:id="@+id/stacklayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    stack:stackAspectRatio="3"
+    stack:stackAspectRatio="1.5"
     stack:stackPaddingX="10dp"
-    stack:stackOffsetX="1dp"
+    stack:stackOffsetX="0dp"
     stack:stackOffsetY="5dp"
+    stack:stackEdge="10dp"
     stack:stackPaddingY="20dp"
     stack:stackSize = "5"
     stack:stackModel="left">
-</com.uis.stackview.StackLayout>
+</com.uis.stackviewlayout.StackViewLayout>
diff --git a/demo/src/main/res/layout/stack_right.xml b/demo/src/main/res/layout/stack_right.xml
@@ -4,10 +4,7 @@
     android:id="@+id/stacklayout"
     android:layout_width="match_parent"
     android:layout_height="150dp"
-    stack:stackPaddingX="10dp"
-    stack:stackOffsetX="1dp"
-    stack:stackOffsetY="5dp"
-    stack:stackPaddingY="20dp"
-    stack:stackSize = "3"
-    stack:stackModel="right">
+    stack:stackEdge="5dp"
+    stack:stackSize="3">
+
 </com.uis.stackview.StackLayout>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
diff --git a/stacklayout/build.gradle b/stacklayout/build.gradle
@@ -20,4 +20,8 @@ android {
     }
 }
 
+dependencies{
+    compileOnly "androidx.appcompat:appcompat:${androidx}"
+}
+
 //apply from: '../../bintray.gradle'
diff --git a/stacklayout/src/main/AndroidManifest.xml b/stacklayout/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.uis.stackview">
+    package="com.uis.stackviewlayout">
 </manifest>
diff --git a/stacklayout/src/main/java/com/uis/stackview/StackLayout.java b/stacklayout/src/main/java/com/uis/stackview/StackLayout.java
diff --git a/stacklayout/src/main/java/com/uis/stackviewlayout/StackLayout1.java b/stacklayout/src/main/java/com/uis/stackviewlayout/StackLayout1.java
diff --git a/stacklayout/src/main/java/com/uis/stackviewlayout/StackViewLayout.java b/stacklayout/src/main/java/com/uis/stackviewlayout/StackViewLayout.java
diff --git a/stacklayout/src/main/res/values/attrs.xml b/stacklayout/src/main/res/values/attrs.xml

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:3.6.3'`
	`12`	`+ classpath 'com.android.tools.build:gradle:4.0.0'`
`13`	`13`	`classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'`
`14`	`14`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`15`	`15`	`}`
`@@ -29,7 +29,7 @@ task clean(type: Delete) {`
`29`	`29`
`30`	`30`	`ext{`
`31`	`31`	`androidx = '1.0.0'`
`32`		`- compileVer = 28`
	`32`	`+ compileVer = 29`
`33`	`33`	`minVer = 15`
`34`		`- buildVer = '28.0.3'`
	`34`	`+ buildVer = '29.0.3'`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,6 @@ dependencies {`
`30`	`30`	`implementation 'com.google.code.gson:gson:2.8.5'`
`31`	`31`	`implementation "androidx.viewpager:viewpager:${androidx}"`
`32`	`32`	`implementation 'com.facebook.fresco:fresco:2.2.0'`
	`33`	`+ implementation 'com.uis:stacklayout:0.3.4'`
`33`	`34`	`implementation project(':stacklayout')`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`android:theme="@style/AppTheme"`
`18`	`18`	`android:networkSecurityConfig="@xml/network_security_config"`
`19`	`19`	`>`
`20`		`- <activity android:name=".activity.MainActivity"`
	`20`	`+ <activity android:name="com.uis.stackviewlayout.demo.activity.MainActivity"`
`21`	`21`	`android:screenOrientation="portrait"`
`22`	`22`	`>`
`23`	`23`	`<intent-filter>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.uis.stackview.demo.entity;`
	`1`	`+package com.uis.stackviewlayout.demo.entity;`
`2`	`2`
`3`	`3`	`import org.json.JSONObject;`
`4`	`4`