Skip to content

Commit 355e5e2

Browse files
author
1170762202@qq.com
committed
优化:
1.优化网页界面显示 2.广场模块封装BaseSquareFg 3.广场界面优化,新增动画交互 修复: 1.Fix 网页界面更多点击空白无法取消
1 parent 9645204 commit 355e5e2

File tree

32 files changed

+1020
-126
lines changed

32 files changed

+1020
-126
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@
2020
![公众号.gif](https://upload-images.jianshu.io/upload_images/4906229-d48f9cbd51cf4eb8.gif?imageMogr2/auto-orient/strip) | ![项目.gif](https://upload-images.jianshu.io/upload_images/4906229-80cbbffc39439e92.gif?imageMogr2/auto-orient/strip) | ![广场.gif](https://upload-images.jianshu.io/upload_images/4906229-188c6ab70160c07b.gif?imageMogr2/auto-orient/strip) | ![分享文章.gif](https://upload-images.jianshu.io/upload_images/4906229-8a2e58bd4c6dd95b.gif?imageMogr2/auto-orient/strip)
2121
|:-|:-|:-|:-|
2222

23+
![1.gif](https://upload-images.jianshu.io/upload_images/4906229-ff3a3a02522c6a23.gif?imageMogr2/auto-orient/strip) | ![1.gif](https://upload-images.jianshu.io/upload_images/4906229-ff3a3a02522c6a23.gif?imageMogr2/auto-orient/strip) | ![1.gif](https://upload-images.jianshu.io/upload_images/4906229-ff3a3a02522c6a23.gif?imageMogr2/auto-orient/strip) | ![1.gif](https://upload-images.jianshu.io/upload_images/4906229-ff3a3a02522c6a23.gif?imageMogr2/auto-orient/strip) |
24+
|:-|:-|:-|:-|
2325

2426
### 主要功能
25-
2627
* 首页、项目、广场、公众号、我的
2728
* 登录、注册 动画交互
2829
* 搜索页面共享元素动画过渡
2930
* 项目页面仿高德地图滑动面板交互
3031
* 广场页面tab跟随滑动系数渐变、列表采用谷歌爸爸的[flexboxlayout]([https://github.com/google/flexbox-layout](https://github.com/google/flexbox-layout)
3132
)流式布局
33+
* 广场页面根据滑动系数给indicator添加动画效果
3234
* 公众号页面点击左上角为一个90°的arc交互动画,列表数据从下往上过渡的动画效果
3335
* 我的页面仿百度外卖个人中心水波纹效果
3436
* 整体采用[Material Design]([https://www.material.io/](https://www.material.io/)

library-base/src/main/java/com/zlx/module_base/base_api/module/TreeApi.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import androidx.lifecycle.LiveData;
44

5-
import com.zlx.module_base.base_api.res_data.NaviListRes;
65
import com.zlx.module_base.base_api.res_data.TreeListRes;
76
import com.zlx.module_network.bean.ApiResponse;
87

@@ -29,7 +28,7 @@ public interface TreeApi {
2928
LiveData<ApiResponse<List<TreeListRes>>> listTrees();
3029

3130
@GET("navi/json")
32-
LiveData<ApiResponse<List<NaviListRes>>> listNavis();
31+
LiveData<ApiResponse<List<TreeListRes>>> listNavis();
3332

3433

3534
}

library-base/src/main/java/com/zlx/module_base/base_api/res_data/NaviListRes.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

library-base/src/main/java/com/zlx/module_base/base_api/res_data/TreeListRes.java

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
* FileName: TreeListRes
77
* Created by zlx on 2020/9/18 13:59
88
* Email: 1170762202@qq.com
9-
* Description: 体系
9+
* Description: 体系&导航
1010
*/
11-
public class TreeListRes {
11+
public class TreeListRes implements Cloneable{
12+
13+
1214
/**
1315
* children : [{"children":[],"courseId":13,"id":60,"name":"Android Studio相关","order":1000,"parentChapterId":150,"userControlSetTop":false,"visible":1},{"children":[],"courseId":13,"id":169,"name":"gradle","order":1001,"parentChapterId":150,"userControlSetTop":false,"visible":1},{"children":[],"courseId":13,"id":269,"name":"官方发布","order":1002,"parentChapterId":150,"userControlSetTop":false,"visible":1},{"children":[],"courseId":13,"id":529,"name":"90-120hz","order":1003,"parentChapterId":150,"userControlSetTop":false,"visible":1}]
1416
* courseId : 13
@@ -19,16 +21,40 @@ public class TreeListRes {
1921
* userControlSetTop : false
2022
* visible : 1
2123
*/
24+
/*共用*/
25+
private String name;
26+
2227

28+
/*体系*/
2329
private String courseId;
2430
private String id;
25-
private String name;
2631
private int order;
2732
private int parentChapterId;
2833
private boolean userControlSetTop;
2934
private int visible;
3035
private List<ChildrenBean> children;
3136

37+
38+
/*导航*/
39+
private String cid;
40+
private List<ArticleBean> articles;
41+
42+
public String getCid() {
43+
return cid;
44+
}
45+
46+
public void setCid(String cid) {
47+
this.cid = cid;
48+
}
49+
50+
public List<ArticleBean> getArticles() {
51+
return articles;
52+
}
53+
54+
public void setArticles(List<ArticleBean> articles) {
55+
this.articles = articles;
56+
}
57+
3258
public String getCourseId() {
3359
return courseId;
3460
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.zlx.module_base.base_util;
2+
3+
import java.lang.reflect.Field;
4+
5+
/**
6+
* Created by zlx on 2020/9/29 9:18
7+
* Email: 1170762202@qq.com
8+
* Description:
9+
*/
10+
public class ResourceUtil {
11+
public static int getResId(String variableName, Class<?> c) {
12+
try {
13+
Field idField = c.getDeclaredField(variableName);
14+
return idField.getInt(idField);
15+
} catch (Exception e) {
16+
e.printStackTrace();
17+
return -1;
18+
}
19+
}
20+
}

library-widget/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,6 @@ dependencies {
4343
api 'com.github.razerdp:BasePopup:2.2.8'
4444

4545
api 'com.yanzhenjie.recyclerview:x:1.3.2'
46+
47+
api "com.github.skydoves:indicatorscrollview:1.0.2"
4648
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.zlx.widget.indicatorview;
2+
3+
/**
4+
* Created by zlx on 2020/9/29 9:58
5+
* Email: 1170762202@qq.com
6+
* Description:
7+
*/
8+
public enum IndicatorAnimation {
9+
NORMAL(0),
10+
ACCELERATE(1),
11+
BOUNCE(2);
12+
13+
int value;
14+
15+
IndicatorAnimation(int value) {
16+
this.value = value;
17+
}
18+
}

0 commit comments

Comments
 (0)