admin/July
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d

Browse Source
This commit is contained in:
jianbo
2020-09-03 18:10:45 +08:00
parent 8678704456
commit 346415d75e
37 changed files with 1332 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

804
app/src/main/assets/dede.json Normal file
View File

@@ -0,0 +1,804 @@
{
"v": "5.7.1",
"fr": 120,
"ip": 0,
"op": 230,
"w": 500,
"h": 500,
"nm": "加载动画",
"ddd": 0,
"assets": [
{
"id": "comp_0",
"layers": [
{
"ddd": 0,
"ind": 1,
"ty": 4,
"nm": "形状图层 3",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 0,
"k": 0,
"ix": 10
},
"p": {
"a": 0,
"k": [
248,
274,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6
}
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"ind": 0,
"ty": "sh",
"ix": 1,
"ks": {
"a": 0,
"k": {
"i": [
[
0,
0
],
[
0,
0
],
[
0,
0
]
],
"o": [
[
0,
0
],
[
0,
0
],
[
0,
0
]
],
"v": [
[
-90,
-28
],
[
-21,
38
],
[
101,
-105
]
],
"c": false
},
"ix": 2
},
"nm": "路径 1",
"mn": "ADBE Vector Shape - Group",
"hd": false
},
{
"ty": "st",
"c": {
"a": 0,
"k": [
0.149019613862,
0.501960813999,
0.921568632126,
1
],
"ix": 3
},
"o": {
"a": 0,
"k": 100,
"ix": 4
},
"w": {
"a": 0,
"k": 33,
"ix": 5
},
"lc": 2,
"lj": 2,
"bm": 0,
"nm": "描边 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
},
{
"ty": "tr",
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
72,
72
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 6
},
"o": {
"a": 0,
"k": 100,
"ix": 7
},
"sk": {
"a": 0,
"k": 0,
"ix": 4
},
"sa": {
"a": 0,
"k": 0,
"ix": 5
},
"nm": "变换"
}
],
"nm": "形状 1",
"np": 2,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
},
{
"ty": "tm",
"s": {
"a": 0,
"k": 0,
"ix": 1
},
"e": {
"a": 1,
"k": [
{
"i": {
"x": [
0
],
"y": [
0.982
]
},
"o": {
"x": [
0.333
],
"y": [
0
]
},
"t": 191,
"s": [
0
]
},
{
"t": 230,
"s": [
100
]
}
],
"ix": 2
},
"o": {
"a": 0,
"k": 0,
"ix": 3
},
"m": 1,
"ix": 2,
"nm": "修剪路径 1",
"mn": "ADBE Vector Filter - Trim",
"hd": false
}
],
"ip": 191,
"op": 231,
"st": -69,
"bm": 0
},
{
"ddd": 0,
"ind": 2,
"ty": 4,
"nm": "形状图层 2",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 0,
"k": 0,
"ix": 10
},
"p": {
"a": 0,
"k": [
251.5,
256.5,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6
}
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": {
"a": 0,
"k": [
321,
321
],
"ix": 2
},
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 3
},
"nm": "椭圆路径 1",
"mn": "ADBE Vector Shape - Ellipse",
"hd": false
},
{
"ty": "st",
"c": {
"a": 0,
"k": [
0.149019613862,
0.501960813999,
0.921568632126,
1
],
"ix": 3
},
"o": {
"a": 0,
"k": 100,
"ix": 4
},
"w": {
"a": 0,
"k": 20,
"ix": 5
},
"lc": 2,
"lj": 1,
"ml": 4,
"bm": 0,
"nm": "描边 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
},
{
"ty": "tr",
"p": {
"a": 0,
"k": [
-1.5,
-6.5
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 6
},
"o": {
"a": 0,
"k": 100,
"ix": 7
},
"sk": {
"a": 0,
"k": 0,
"ix": 4
},
"sa": {
"a": 0,
"k": 0,
"ix": 5
},
"nm": "变换"
}
],
"nm": "椭圆 1",
"np": 2,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
},
{
"ty": "tm",
"s": {
"a": 0,
"k": 0,
"ix": 1
},
"e": {
"a": 1,
"k": [
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 0,
"s": [
15
]
},
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 46,
"s": [
25
]
},
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 96,
"s": [
15
]
},
{
"t": 191,
"s": [
100
]
}
],
"ix": 2
},
"o": {
"a": 1,
"k": [
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 0,
"s": [
0
]
},
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 96,
"s": [
360
]
},
{
"t": 191,
"s": [
720
]
}
],
"ix": 3
},
"m": 1,
"ix": 2,
"nm": "修剪路径 1",
"mn": "ADBE Vector Filter - Trim",
"hd": false
}
],
"ip": 0,
"op": 360,
"st": 0,
"bm": 0
},
{
"ddd": 0,
"ind": 3,
"ty": 4,
"nm": "形状图层 1",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 0,
"k": 0,
"ix": 10
},
"p": {
"a": 0,
"k": [
251.5,
256.5,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6
}
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": {
"a": 0,
"k": [
321,
321
],
"ix": 2
},
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 3
},
"nm": "椭圆路径 1",
"mn": "ADBE Vector Shape - Ellipse",
"hd": false
},
{
"ty": "st",
"c": {
"a": 0,
"k": [
1,
1,
1,
1
],
"ix": 3
},
"o": {
"a": 0,
"k": 100,
"ix": 4
},
"w": {
"a": 0,
"k": 21,
"ix": 5
},
"lc": 1,
"lj": 1,
"ml": 4,
"bm": 0,
"nm": "描边 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
},
{
"ty": "tr",
"p": {
"a": 0,
"k": [
-1.5,
-6.5
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 6
},
"o": {
"a": 0,
"k": 100,
"ix": 7
},
"sk": {
"a": 0,
"k": 0,
"ix": 4
},
"sa": {
"a": 0,
"k": 0,
"ix": 5
},
"nm": "变换"
}
],
"nm": "椭圆 1",
"np": 2,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
}
],
"ip": 0,
"op": 360,
"st": 0,
"bm": 0
}
]
}
],
"layers": [
{
"ddd": 0,
"ind": 1,
"ty": 0,
"nm": "1",
"refId": "comp_0",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 0,
"k": 0,
"ix": 10
},
"p": {
"a": 0,
"k": [
250,
250,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
250,
250,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6
}
},
"ao": 0,
"w": 500,
"h": 500,
"ip": 0,
"op": 97,
"st": 0,
"bm": 0
}
],
"markers": []
}

805
app/src/main/assets/edsf.json
View File

@@ -1,804 +1 @@
{
"v": "5.7.1",
"fr": 120,
"ip": 0,
"op": 132,
"w": 500,
"h": 500,
"nm": "合成 1",
"ddd": 0,
"assets": [
{
"id": "comp_0",
"layers": [
{
"ddd": 0,
"ind": 1,
"ty": 4,
"nm": "形状图层 3",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 0,
"k": 0,
"ix": 10
},
"p": {
"a": 0,
"k": [
248,
274,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6
}
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"ind": 0,
"ty": "sh",
"ix": 1,
"ks": {
"a": 0,
"k": {
"i": [
[
0,
0
],
[
0,
0
],
[
0,
0
]
],
"o": [
[
0,
0
],
[
0,
0
],
[
0,
0
]
],
"v": [
[
-90,
-28
],
[
-21,
38
],
[
101,
-105
]
],
"c": false
},
"ix": 2
},
"nm": "路径 1",
"mn": "ADBE Vector Shape - Group",
"hd": false
},
{
"ty": "st",
"c": {
"a": 0,
"k": [
0.149019607843,
0.501960784314,
0.921568627451,
1
],
"ix": 3
},
"o": {
"a": 0,
"k": 100,
"ix": 4
},
"w": {
"a": 0,
"k": 33,
"ix": 5
},
"lc": 2,
"lj": 2,
"bm": 0,
"nm": "描边 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
},
{
"ty": "tr",
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
72,
72
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 6
},
"o": {
"a": 0,
"k": 100,
"ix": 7
},
"sk": {
"a": 0,
"k": 0,
"ix": 4
},
"sa": {
"a": 0,
"k": 0,
"ix": 5
},
"nm": "变换"
}
],
"nm": "形状 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
},
{
"ty": "tm",
"s": {
"a": 0,
"k": 0,
"ix": 1
},
"e": {
"a": 1,
"k": [
{
"i": {
"x": [
0
],
"y": [
0.982
]
},
"o": {
"x": [
0.333
],
"y": [
0
]
},
"t": 191,
"s": [
0
]
},
{
"t": 230,
"s": [
100
]
}
],
"ix": 2
},
"o": {
"a": 0,
"k": 0,
"ix": 3
},
"m": 1,
"ix": 2,
"nm": "修剪路径 1",
"mn": "ADBE Vector Filter - Trim",
"hd": false
}
],
"ip": 191,
"op": 231,
"st": -69,
"bm": 0
},
{
"ddd": 0,
"ind": 2,
"ty": 4,
"nm": "形状图层 2",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 0,
"k": 0,
"ix": 10
},
"p": {
"a": 0,
"k": [
251.5,
256.5,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6
}
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": {
"a": 0,
"k": [
321,
321
],
"ix": 2
},
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 3
},
"nm": "椭圆路径 1",
"mn": "ADBE Vector Shape - Ellipse",
"hd": false
},
{
"ty": "st",
"c": {
"a": 0,
"k": [
0.149019607843,
0.501960784314,
0.921568627451,
1
],
"ix": 3
},
"o": {
"a": 0,
"k": 100,
"ix": 4
},
"w": {
"a": 0,
"k": 15,
"ix": 5
},
"lc": 2,
"lj": 1,
"ml": 4,
"bm": 0,
"nm": "描边 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
},
{
"ty": "tr",
"p": {
"a": 0,
"k": [
-1.5,
-6.5
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 6
},
"o": {
"a": 0,
"k": 100,
"ix": 7
},
"sk": {
"a": 0,
"k": 0,
"ix": 4
},
"sa": {
"a": 0,
"k": 0,
"ix": 5
},
"nm": "变换"
}
],
"nm": "椭圆 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
},
{
"ty": "tm",
"s": {
"a": 0,
"k": 0,
"ix": 1
},
"e": {
"a": 1,
"k": [
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 0,
"s": [
15
]
},
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 46,
"s": [
25
]
},
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 96,
"s": [
15
]
},
{
"t": 191,
"s": [
100
]
}
],
"ix": 2
},
"o": {
"a": 1,
"k": [
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 0,
"s": [
0
]
},
{
"i": {
"x": [
0.833
],
"y": [
0.833
]
},
"o": {
"x": [
0.167
],
"y": [
0.167
]
},
"t": 96,
"s": [
360
]
},
{
"t": 191,
"s": [
720
]
}
],
"ix": 3
},
"m": 1,
"ix": 2,
"nm": "修剪路径 1",
"mn": "ADBE Vector Filter - Trim",
"hd": false
}
],
"ip": 0,
"op": 360,
"st": 0,
"bm": 0
},
{
"ddd": 0,
"ind": 3,
"ty": 4,
"nm": "形状图层 1",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 0,
"k": 0,
"ix": 10
},
"p": {
"a": 0,
"k": [
251.5,
256.5,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6
}
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": {
"a": 0,
"k": [
321,
321
],
"ix": 2
},
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 3
},
"nm": "椭圆路径 1",
"mn": "ADBE Vector Shape - Ellipse",
"hd": false
},
{
"ty": "st",
"c": {
"a": 0,
"k": [
0.686274509804,
0.686274509804,
0.686274509804,
1
],
"ix": 3
},
"o": {
"a": 0,
"k": 100,
"ix": 4
},
"w": {
"a": 0,
"k": 15,
"ix": 5
},
"lc": 1,
"lj": 1,
"ml": 4,
"bm": 0,
"nm": "描边 1",
"mn": "ADBE Vector Graphic - Stroke",
"hd": false
},
{
"ty": "tr",
"p": {
"a": 0,
"k": [
-1.5,
-6.5
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 6
},
"o": {
"a": 0,
"k": 100,
"ix": 7
},
"sk": {
"a": 0,
"k": 0,
"ix": 4
},
"sa": {
"a": 0,
"k": 0,
"ix": 5
},
"nm": "变换"
}
],
"nm": "椭圆 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
}
],
"ip": 0,
"op": 360,
"st": 0,
"bm": 0
}
]
}
],
"layers": [
{
"ddd": 0,
"ind": 1,
"ty": 0,
"nm": "完整动画",
"refId": "comp_0",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 0,
"k": 0,
"ix": 10
},
"p": {
"a": 0,
"k": [
250,
250,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
250,
250,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6
}
},
"ao": 0,
"w": 500,
"h": 500,
"ip": 0,
"op": 132,
"st": -97,
"bm": 0
}
],
"markers": []
}
{"v":"5.7.1","fr":120,"ip":0,"op":96,"w":500,"h":500,"nm":"合成 1","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[248,274,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-90,-28],[-21,38],[101,-105]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.149019607843,0.501960784314,0.921568627451,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":33,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[72,72],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"形状 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0],"y":[0.982]},"o":{"x":[0.333],"y":[0]},"t":191,"s":[0]},{"t":230,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":191,"op":231,"st":-69,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"形状图层 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[251.5,256.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[321,321],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.149019607843,0.501960784314,0.921568627451,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-1.5,-6.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[15]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":46,"s":[25]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":96,"s":[15]},{"t":191,"s":[100]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":96,"s":[360]},{"t":191,"s":[720]}],"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"形状图层 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[251.5,256.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[321,321],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.686274509804,0.686274509804,0.686274509804,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-1.5,-6.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"完整动画","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":500,"h":500,"ip":0,"op":96,"st":0,"bm":0}],"markers":[]}

88
app/src/main/assets/privacy.html Normal file
View File

@@ -0,0 +1,88 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>Document</title>
<script src="http://www.fenghoo.com.cn/JS/fenghuSta/jquery.min.js" type="text/javascript" charset="utf-8"></script>
<script src="http://www.fenghoo.com.cn/JS/fenghuSta/yidongduan.js" type="text/javascript" charset="utf-8"></script>
<style type="text/css">
html,body,ul,li,ol{padding: 0;margin: 0;}
body{
width: 94%;
margin-left: 3%;
}
li{list-style: none;text-indent: 2em;}
li{
font-size: .28rem;
}
</style>
</head>
<body>
<ul>
<li>七月柒尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，七月柒会按照本隐私权政策的规定使用和披露您的个人信息。但七月柒将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，七月柒不会将这些信息对外披露或向第三方提供。七月柒会不时更新本隐私权政策。 您在同意七月柒服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于七月柒服务使用协议不可分割的一部分。 </li>
<li>
<h5>1. 适用范围</h5>
<ol>
<li>(a) 在您注册七月柒帐号时，您根据七月柒要求提供的个人注册信息；</li>
<li>(b) 在您使用七月柒网络服务，或访问七月柒平台网页时，七月柒自动接收并记录的您的浏览器和计算机上的信息，包括但不限于您的IP地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据；</li>
<li>(c) 七月柒通过合法途径从商业伙伴处取得的用户个人数据。 </li>
<li>您了解并同意，以下信息不适用本隐私权政策：</li>
<li>(a) 您在使用七月柒平台提供的搜索服务时输入的关键字信息；</li>
<li>(b) 七月柒收集到的您在七月柒发布的有关信息数据，包括但不限于参与活动、成交信息及评价详情；</li>
<li>(c) 违反法律规定或违反七月柒规则行为及七月柒已对您采取的措施。</li>
</ol>
</li>
<li>
<h5>2. 信息使用</h5>
<ol>
<li>(a)七月柒不会向任何无关第三方提供、出售、出租、分享或交易您的个人信息，除非事先得到您的许可，或该第三方和七月柒（含七月柒关联公司）单独或共同为您提供服务，且在该服务结束后，其将被禁止访问包括其以前能够访问的所有这些资料。</li>
<li>(b) 七月柒亦不允许任何第三方以任何手段收集、编辑、出售或者无偿传播您的个人信息。任何七月柒平台用户如从事上述活动，一经发现，七月柒有权立即终止与该用户的服务协议。</li>
<li>(c) 为服务用户的目的，七月柒可能通过使用您的个人信息，向您提供您感兴趣的信息，包括但不限于向您发出产品和服务信息，或者与七月柒合作伙伴共享信息以便他们向您发送有关其产品和服务的信息（后者需要您的事先同意）。</li>
</ol>
</li>
<li>
<h5>3. 信息披露</h5>
<ol>
<li>在如下情况下，七月柒将依据您的个人意愿或法律的规定全部或部分的披露您的个人信息：</li>
<li>(a) 经您事先同意，向第三方披露；</li>
<li>(b)为提供您所要求的产品和服务，而必须和第三方分享您的个人信息；</li>
<li>(c) 根据法律的有关规定，或者行政或司法机构的要求，向第三方或者行政、司法机构披露；</li>
<li>(d) 如您出现违反中国有关法律、法规或者七月柒服务协议或相关规则的情况，需要向第三方披露；</li>
<li>(e) 如您是适格的知识产权投诉人并已提起投诉，应被投诉人要求，向被投诉人披露，以便双方处理可能的权利纠纷；</li>
<li>(f) 在七月柒平台上创建的某一交易中，如交易任何一方履行或部分履行了交易义务并提出信息披露请求的，七月柒有权决定向该用户提供其交易对方的联络方式等必要信息，以促成交易的完成或纠纷的解决。</li>
<li>(g) 其它七月柒根据法律、法规或者网站政策认为合适的披露。</li>
</ol>
</li>
<li>
<h5>4. 信息存储和交换</h5>
<ol>
<li>七月柒收集的有关您的信息和资料将保存在七月柒及（或）其关联公司的服务器上，这些信息和资料可能传送至您所在国家、地区或七月柒收集信息和资料所在地的境外并在境外被访问、存储和展示。</li>
</ol>
</li>
<li>
<h5>5. Cookie的使用</h5>
<ol>
<li>(a) 在您未拒绝接受cookies的情况下，七月柒会在您的计算机上设定或取用cookies，以便您能登录或使用依赖于cookies的七月柒平台服务或功能。七月柒使用cookies可为您提供更加周到的个性化服务，包括推广服务。</li>
<li>(b) 您有权选择接受或拒绝接受cookies。您可以通过修改浏览器设置的方式拒绝接受cookies。但如果您选择拒绝接受cookies，则您可能无法登录或使用依赖于cookies的七月柒网络服务或功能。</li>
<li>(c) 通过七月柒所设cookies所取得的有关信息，将适用本政策。</li>
</ol>
</li>
<li>
<h5>6. 信息安全</h5>
<ol>
<li>(a) 七月柒帐号均有安全保护功能，请妥善保管您的用户名及密码信息。七月柒将通过对用户密码进行加密等安全措施确保您的信息不丢失，不被滥用和变造。尽管有前述安全措施，但同时也请您注意在信息网络上不存在“完善的安全措施”。</li>
<li>(b) 在使用七月柒网络服务进行网上交易时，您不可避免的要向交易对方或潜在的交易对方披露自己的个人信息，如联络方式或者邮政地址。请您妥善保护自己的个人信息，仅在必要的情形下向他人提供。如您发现自己的个人信息泄密，尤其是七月柒用户名及密码发生泄露，请您立即联络七月柒客服，以便七月柒采取相应措施。</li>
</ol>
</li>
<li>
<h5>7.本隐私政策的更改</h5>
<ol>
<li>(a)如果决定更改隐私政策，我们会在本政策中、本公司网站中以及我们认为适当的位置发布这些更改，以便您了解我们如何收集、使用您的个人信息，哪些人可以访问这些信息，以及在什么情况下我们会透露这些信息。</li>
<li>(b)本公司保留随时修改本政策的权利，因此请经常查看。如对本政策作出重大更改，本公司会通过网站通知的形式告知。方披露自己的个人信息，如联络方式或者邮政地址。请您妥善保护自己的个人信息，仅在必要的情形下向他人提供。如您发现自己的个人信息泄密，尤其是本应用用户名及密码发生泄露，请您立即联络本应用客服，以便本应用采取相应措施。</li>
</ol>
</li>
</ul>
</body>
</html>

4
app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java
View File

@@ -59,9 +59,9 @@ public class SplashActivity extends BaseActivity implements EasyPermissions.Perm
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//设置共同沉浸式样式
ImmersionBar.with(this).navigationBarColor(R.color.colorPrimary).init();
// ImmersionBar.with(this).navigationBarColor(R.color.colorPrimary).init();
//将屏幕设置为全屏
// getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
methodRequiresTwoPermission();
}

6
app/src/main/java/com/fenghoo/seven/main/find/CloundSolutionActivity.java
View File

@@ -59,18 +59,22 @@ public class CloundSolutionActivity extends BaseActivity implements View.OnClick
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_clound_solution);
initView();
// HotCity();
HotCity();
//开始定位
// location();
}
private void HotCity() {
hotCities = new ArrayList<>();
hotCities.add(new HotCity("全国", "全国", ""));
hotCities.add(new HotCity("北京", "北京", "101010100"));
hotCities.add(new HotCity("上海", "上海", "101020100"));
hotCities.add(new HotCity("广州", "广东", "101280101"));
hotCities.add(new HotCity("深圳", "广东", "101280601"));
hotCities.add(new HotCity("西安", "西安", "101280601"));
hotCities.add(new HotCity("杭州", "浙江", "101210101"));
hotCities.add(new HotCity("成都", "成都", "101210101"));
hotCities.add(new HotCity("武汉", "武汉", "101210101"));
}
private void initView() {

67
app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java
View File

@@ -2,28 +2,15 @@ package com.fenghoo.seven.main.find;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.fenghoo.seven.R;
import com.fenghoo.seven.main.find.ui.FindFragmenttwo;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.test.BaseFragment;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.zaaach.citypicker.CityPicker;
import com.zaaach.citypicker.adapter.OnPickListener;
import com.zaaach.citypicker.model.City;
import com.zaaach.citypicker.model.HotCity;
import com.zaaach.citypicker.model.LocateState;
import com.zaaach.citypicker.model.LocatedCity;
import java.util.List;
/**
* 发现
@@ -35,11 +22,6 @@ public class FindFragment extends BaseFragment {
private String pagetype="0";//0是家居 1是私信
private RelativeLayout dianpubuju;
private LinearLayout dianyuanbuju;
private TextView marking_fragment;
private List<HotCity> hotCities;
private int anim;
private boolean enable;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -63,7 +45,7 @@ public class FindFragment extends BaseFragment {
}
private void initView(View mContentView) {
marking_fragment = (TextView)view.findViewById(R.id.marking_fragment);
dianpubuju = (RelativeLayout)view.findViewById(R.id.dianpubuju);
dianyuanbuju = (LinearLayout)view.findViewById(R.id.dianyuanbuju);
rl_live = (RelativeLayout)view.findViewById(R.id.rl_live);
@@ -93,52 +75,5 @@ public class FindFragment extends BaseFragment {
}
});
marking_fragment.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// ShowAty.CloundSolutionActivity(getActivity());
// ShowAty.MainActivitytwot(getActivity());
CityPicker.from(getActivity())
.enableAnimation(enable)
.setAnimationStyle(anim)
.setLocatedCity(null)
.setHotCities(hotCities)
.setOnPickListener(new OnPickListener() {
@Override
public void onPick(int position, City data) {
// mDangqianchengshi.setText(String.format("当前城市：%s，%s", data.getName(), data.getCode()));
marking_fragment.setText(String.format(data.getName()));
Toast.makeText(
getActivity().getApplicationContext(),
String.format("点击的数据：%s，%s", data.getName(), data.getCode()),
Toast.LENGTH_SHORT)
.show();
}
@Override
public void onCancel() {
Toast.makeText(getActivity().getApplicationContext(), "取消选择", Toast.LENGTH_SHORT).show();
}
@Override
public void onLocate() {
//开始定位，这里模拟一下定位
// new Handler().postDelayed(new Runnable() {
// @Override
// public void run() {
// CityPicker.from(getActivity()).locateComplete(new LocatedCity(city, province, adCode), LocateState.SUCCESS);
// }
// }, 3000);
}
})
.show();
}
});
}
}

86
app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java
View File

@@ -2,11 +2,13 @@ package com.fenghoo.seven.main.find;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
@@ -17,7 +19,14 @@ import com.fenghoo.seven.main.kehu.Dialog.HangyeSelectDialog;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
import com.lzy.okgo.model.Response;
import com.zaaach.citypicker.CityPicker;
import com.zaaach.citypicker.adapter.OnPickListener;
import com.zaaach.citypicker.model.City;
import com.zaaach.citypicker.model.HotCity;
import com.zaaach.citypicker.model.LocateState;
import com.zaaach.citypicker.model.LocatedCity;
import java.util.ArrayList;
import java.util.List;
/**
@@ -32,6 +41,16 @@ public class PriLetFragment extends BaseFragment {
private TextView marking_fragment_title;
private PrivateletterFragment privateletterFragment;
private List<industryBean.ResultBean.DataBean> industryData;
private TextView marking_fragment;
private List<HotCity> hotCities;
private int anim;
private boolean enable;
private String city="西安";
private String province;
private String adCode;
private String danqiancity="全国";
private String danqianindustry_id="";
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -50,6 +69,7 @@ public class PriLetFragment extends BaseFragment {
}
view = inflater.inflate(R.layout.findfragment, container, false);
initView(view);
HotCity();
new NetApi().industry().subscribe(new Observer<Response>() {
@Override
public void onNext(Response response) {
@@ -74,7 +94,21 @@ public class PriLetFragment extends BaseFragment {
return view;
}
private void HotCity() {
hotCities = new ArrayList<>();
hotCities.add(new HotCity("全国", "全国", ""));
hotCities.add(new HotCity("北京", "北京", "101010100"));
hotCities.add(new HotCity("上海", "上海", "101020100"));
hotCities.add(new HotCity("广州", "广东", "101280101"));
hotCities.add(new HotCity("深圳", "广东", "101280601"));
hotCities.add(new HotCity("西安", "西安", "101280601"));
hotCities.add(new HotCity("杭州", "浙江", "101210101"));
hotCities.add(new HotCity("成都", "成都", "101210101"));
hotCities.add(new HotCity("武汉", "武汉", "101210101"));
}
private void initView(View mContentView) {
marking_fragment = (TextView)view.findViewById(R.id.marking_fragment);
rl_privateletter = (RelativeLayout)view.findViewById(R.id.rl_privateletter);
left_tvtwo = (TextView)view.findViewById(R.id.left_tvtwo);
marking_fragment_title = (TextView)view.findViewById(R.id.marking_fragment_title);
@@ -85,12 +119,60 @@ public class PriLetFragment extends BaseFragment {
@Override
public void uploadAvatar(String industry_id, String industry) {
marking_fragment_title.setText(industry);
danqianindustry_id=industry_id;
//刷新抖音列表数据
privateletterFragment.onRefresh(industry_id);
}
privateletterFragment.refresh(danqiancity,danqianindustry_id);
}
}).show();
}
});
marking_fragment.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// ShowAty.CloundSolutionActivity(getActivity());
// ShowAty.MainActivitytwot(getActivity());
CityPicker.from(getActivity())
.enableAnimation(enable)
.setAnimationStyle(anim)
.setLocatedCity(null)
.setHotCities(hotCities)
.setOnPickListener(new OnPickListener() {
@Override
public void onPick(int position, City data) {
// mDangqianchengshi.setText(String.format("当前城市：%s，%s", data.getName(), data.getCode()));
marking_fragment.setText(String.format(data.getName()));
danqiancity=String.format(data.getName());
// Toast.makeText(
// getActivity().getApplicationContext(),
// String.format("点击的数据：%s，%s", data.getName(), data.getCode()),
// Toast.LENGTH_SHORT)
// .show();
//刷新数据
privateletterFragment.refresh(danqiancity,danqianindustry_id);
}
@Override
public void onCancel() {
Toast.makeText(getActivity().getApplicationContext(), "取消选择", Toast.LENGTH_SHORT).show();
}
@Override
public void onLocate() {
//开始定位，这里模拟一下定位
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
CityPicker.from(getActivity()).locateComplete(new LocatedCity(city, province, adCode), LocateState.SUCCESS);
}
}, 3000);
}
})
.show();
}
});
}
interface ClickCallback {

2
app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java
View File

@@ -84,7 +84,7 @@ public class QuestionsFragment extends BaseTreeFragment<QuestionsContract.View,
@Override
public void onClick(View view) {
//进入添加客户和完善信息
ShowAty.AddCustDialogActivity(getActivity(),"","");
ShowAty.AddCustDialogActivity(getActivity(),"","","","");
}
});
btnSend = (Button) view.findViewById(R.id.btn_send);

27
app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java
View File

@@ -1,14 +1,16 @@
package com.fenghoo.seven.main.find.ui;
import android.view.View;
import android.view.ViewParent;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.find.adapter.AwemeAdapter;
import com.fenghoo.seven.main.kehu.Bean.awemeBean;
import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.main.kehu.fragment.MobanFragment;
import com.fenghoo.seven.okgonet.HttpConstants;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
@@ -28,6 +30,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
public class PrivateletterFragment extends MobanFragment {
TextView left_tvtwo;
private String industry_id="";
private String city="";
public PrivateletterFragment(TextView left_tvtwo) {
super();
this.left_tvtwo=left_tvtwo;
@@ -53,11 +56,22 @@ public class PrivateletterFragment extends MobanFragment {
});
}
public void refresh(String city,String industry_id){
mMarkingFragmentRecyclerView.removeAllViews();
this.city=city;
this.industry_id=industry_id;
IS_LOADED=false;
sendMessage();
}
@Override
public void requestData() {
if(city.equals("全国")){
city="";
}
final HttpParams paramsPost = new HttpParams();
paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
paramsPost.put("city", "");
paramsPost.put("city", city);
paramsPost.put("industry_id", industry_id);
paramsPost.put("page", mNextRequestPage);
new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_aweme).subscribe(new Observer<Response>() {
@@ -80,6 +94,10 @@ public class PrivateletterFragment extends MobanFragment {
List<awemeBean.ResultBean.DataBean> data = result.getData();
if (mNextRequestPage == 1) {
if (data.size() == 0) {
ViewParent parent = notDataView.getParent();
FrameLayout mFrameLayout = (FrameLayout)parent;
if(mFrameLayout!=null){
mFrameLayout.removeView(notDataView);}
markingtwoAdapter.setEmptyView(notDataView);
return;
}
@@ -102,11 +120,6 @@ public class PrivateletterFragment extends MobanFragment {
});
}
public void onRefresh(String industry_id){
this.industry_id=industry_id;
requestData();
}
@Override
public void onDestroy() {
super.onDestroy();

3
app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java
View File

@@ -2,6 +2,7 @@ package com.fenghoo.seven.main.kehu.Bean;
import com.fenghoo.seven.test.BaseModel;
import java.io.Serializable;
import java.util.List;
/**
@@ -80,7 +81,7 @@ public class CustomerListBean extends BaseModel {
this.data = data;
}
public static class DataBean {
public static class DataBean implements Serializable {
/**
* headimg :
* phone : 15862656263

6
app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java
View File

@@ -22,6 +22,8 @@ public class AddCustDialogActivity extends BaseActivity {
private TitleBar mTitleBar;
private String customer_id="";
private String source="";
private String search="";
private String pagetype="";
@Override
@@ -32,7 +34,9 @@ public class AddCustDialogActivity extends BaseActivity {
StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
customer_id = getIntent().getStringExtra("customer_id");
source = getIntent().getStringExtra("source");
addCusFragment = new AddCusFragment(customer_id,source);
search = getIntent().getStringExtra("search");
pagetype = getIntent().getStringExtra("pagetype");
addCusFragment = new AddCusFragment(customer_id,source,search,pagetype,null);
getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit();
findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() {

15
app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
View File

@@ -6,6 +6,7 @@ import android.view.View;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseActivity;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.fragment.AddCusFragment;
import com.fenghoo.seven.widget.TitleBar;
@@ -18,6 +19,8 @@ public class AddCustomerActivity extends BaseActivity {
private TitleBar mTitleBar;
private String customer_id="";
private String source="";
private String search="";
private String pagetype="";
@Override
@@ -27,9 +30,15 @@ public class AddCustomerActivity extends BaseActivity {
mTitleBar = (TitleBar) findViewById(R.id.title_bar);
mTitleBar.setTitle("信息完善");
initNormalBack();
customer_id = getIntent().getStringExtra("customer_id");
source = getIntent().getStringExtra("source");
addCusFragment = new AddCusFragment(customer_id,source);
// customer_id = getIntent().getStringExtra("customer_id");
// source = getIntent().getStringExtra("source");
search = getIntent().getStringExtra("search");
pagetype = getIntent().getStringExtra("pagetype");
CustomerListBean.ResultBean.DataBean dataBean = (CustomerListBean.ResultBean.DataBean) getIntent().getSerializableExtra("dataBean");
customer_id = dataBean.getCustomer_id();
source = dataBean.getSource();
addCusFragment = new AddCusFragment(this.customer_id, this.source,search,pagetype,dataBean);
getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit();
findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() {

15
app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
View File

@@ -129,10 +129,15 @@ public class ShowAty {
* @param
* @return
*/
public static void AddCustomerActivity(Context ctx,String customer_id,String source) {
public static void AddCustomerActivity(Context ctx,CustomerListBean.ResultBean.DataBean dataBean,String search,String pagetype) {
Intent i = new Intent(ctx, AddCustomerActivity.class);
i.putExtra("customer_id",customer_id);
i.putExtra("source",source);
// i.putExtra("customer_id",customer_id);
// i.putExtra("source",source);
i.putExtra("search",search);
i.putExtra("pagetype",pagetype);
Bundle bundle = new Bundle();
bundle.putSerializable("dataBean", dataBean);
i.putExtras(bundle);
ctx.startActivity(i);
}
/**
@@ -140,10 +145,12 @@ public class ShowAty {
* @param
* @return
*/
public static void AddCustDialogActivity(Context ctx,String customer_id,String source) {
public static void AddCustDialogActivity(Context ctx,String customer_id,String source,String search,String pagetype) {
Intent i = new Intent(ctx, AddCustDialogActivity.class);
i.putExtra("customer_id",customer_id);
i.putExtra("source",source);
i.putExtra("search",search);
i.putExtra("pagetype",pagetype);
ctx.startActivity(i);
}

52
app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java
View File

@@ -18,6 +18,8 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseBean;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.Bean.FirstEvent;
import com.fenghoo.seven.main.kehu.Bean.LabelBean;
import com.fenghoo.seven.main.kehu.Bean.SecondEvent;
@@ -31,6 +33,7 @@ import com.fenghoo.seven.utils.AbStrUtil;
import com.fenghoo.seven.utils.GlideTools;
import com.fenghoo.seven.utils.ImageUtils;
import com.fenghoo.seven.utils.ToastUtils;
import com.fenghoo.seven.utils.WidgetTools;
import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
import com.fenghoo.seven.widget.CircleImageView;
import com.lzy.okgo.model.Response;
@@ -76,12 +79,18 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
private TextView textView14;
private String customer_id;
private String source;
private String search;
private String pagetype;
private ArrayList<LabelBean> label=new ArrayList<>();
CustomerListBean.ResultBean.DataBean dataBean;
public AddCusFragment(String customer_id,String source) {
public AddCusFragment(String customer_id, String source, String search, String pagetype, CustomerListBean.ResultBean.DataBean dataBean) {
super();
this.customer_id=customer_id;
this.source=source;
this.search=search;
this.pagetype=pagetype;//pagetype为""说明是添加客户，否则是信息完善
this.dataBean=dataBean;
addCustomerBean = new addCustomerBean();
EventBus.getDefault().register(this);
}
@@ -139,6 +148,13 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
textView8 = (EditText) view.findViewById(R.id.textView8);
textView12 = (TextView) view.findViewById(R.id.textView12);
textView14 = (TextView) view.findViewById(R.id.textView14);
if(!pagetype.equals("")){
WidgetTools.setTextfive(textView0, "", dataBean.getName());
WidgetTools.setTextfive(textView4, "", dataBean.getPhone());
WidgetTools.setTextfive(textView6, "", dataBean.getWechat());
GlideTools.init(mContext).displaypic(imageView, dataBean.getHeadimg(), R.mipmap.icon_default_head);
}
ConstraintLayout constraintLayout7 = (ConstraintLayout) view.findViewById(R.id.constraintLayout7);
constraintLayout7.setOnClickListener(this);
ConstraintLayout constraintLayout8 = (ConstraintLayout) view.findViewById(R.id.constraintLayout8);
@@ -168,22 +184,22 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
ToastUtils.showToast(mContext, "请输入客户电话");
return;
}
if( AbStrUtil.isEmpty(addCustomerBean.getWechat())){
ToastUtils.showToast(mContext, "请输入客户微信");
return;
}
if( AbStrUtil.isEmpty(addCustomerBean.getAddress())){
ToastUtils.showToast(mContext, "请输入客户住址");
return;
}
if( AbStrUtil.isEmpty(addCustomerBean.getStyle_id())){
ToastUtils.showToast(mContext, "请选择装修风格");
return;
}
if( AbStrUtil.isEmpty(addCustomerBean.getBudget())){
ToastUtils.showToast(mContext, "请选择装修预算");
return;
}
// if( AbStrUtil.isEmpty(addCustomerBean.getWechat())){
// ToastUtils.showToast(mContext, "请输入客户微信");
// return;
// }
// if( AbStrUtil.isEmpty(addCustomerBean.getAddress())){
// ToastUtils.showToast(mContext, "请输入客户住址");
// return;
// }
// if( AbStrUtil.isEmpty(addCustomerBean.getStyle_id())){
// ToastUtils.showToast(mContext, "请选择装修风格");
// return;
// }
// if( AbStrUtil.isEmpty(addCustomerBean.getBudget())){
// ToastUtils.showToast(mContext, "请选择装修预算");
// return;
// }
//网络请求提交数据
new NetApi().addCustomer(addCustomerBean.getUid(),addCustomerBean.getHeadimg(),addCustomerBean.getName(),addCustomerBean.getPhone(),addCustomerBean.getWechat(),addCustomerBean.getAddress(),addCustomerBean.getDecoration(),addCustomerBean.getStyle_id(),addCustomerBean.getBudget(),addCustomerBean.getSource(),addCustomerBean.getCustomer_id()).subscribe(new Observer<Response>() {
@@ -192,6 +208,8 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
String body = (String) response.body();
BaseBean.ResultBean result = JsonUtils.fromJson(body, BaseBean.class).getResult();
if(result.getSuccess()==0){
//通知客户列表刷新数据
EventBus.getDefault().post(new ThreeEvent(pagetype,search));
getActivity().finish();
}else {
String msg = result.getMsg();

9
app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
View File

@@ -1,6 +1,8 @@
package com.fenghoo.seven.main.kehu.fragment;
import android.util.Log;
import android.view.ViewParent;
import android.widget.FrameLayout;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.R;
@@ -80,7 +82,8 @@ public class CustomerFragment extends MobanFragment {
//进入添加客户和完善信息
String customer_id = item.getCustomer_id();
String source = item.getSource();
ShowAty.AddCustomerActivity(getActivity(),customer_id,source);
// ShowAty.AddCustomerActivity(getActivity(),customer_id,source,search,"0");
ShowAty.AddCustomerActivity(getActivity(),item,search,"0");
}
}).show();
@@ -122,6 +125,10 @@ public class CustomerFragment extends MobanFragment {
List<CustomerListBean.ResultBean.DataBean> data = result.getData();
if (mNextRequestPage == 1) {
if (data.size() == 0) {
ViewParent parent = notDataView.getParent();
FrameLayout mFrameLayout = (FrameLayout)parent;
if(mFrameLayout!=null){
mFrameLayout.removeView(notDataView);}
markingtwoAdapter.setEmptyView(notDataView);
return;
}

6
app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java
View File

@@ -1,6 +1,8 @@
package com.fenghoo.seven.main.kehu.fragment;
import android.util.Log;
import android.view.ViewParent;
import android.widget.FrameLayout;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
@@ -83,6 +85,10 @@ public class DealFragment extends MobanFragment {
List<orderListBean.ResultBean.DataBean> data = result.getData();
if (mNextRequestPage == 1) {
if (data.size() == 0) {
ViewParent parent = notDataView.getParent();
FrameLayout mFrameLayout = (FrameLayout)parent;
if(mFrameLayout!=null){
mFrameLayout.removeView(notDataView);}
markingtwoAdapter.setEmptyView(notDataView);
return;
}

6
app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java
View File

@@ -1,6 +1,8 @@
package com.fenghoo.seven.main.kehu.fragment;
import android.util.Log;
import android.view.ViewParent;
import android.widget.FrameLayout;
import com.fenghoo.seven.JsonUtils;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
@@ -82,6 +84,10 @@ public class DistriFragment extends MobanFragment {
List<FpListBean.ResultBean.DataBean> data = result.getData();
if (mNextRequestPage == 1) {
if (data.size() == 0) {
ViewParent parent = notDataView.getParent();
FrameLayout mFrameLayout = (FrameLayout)parent;
if(mFrameLayout!=null){
mFrameLayout.removeView(notDataView);}
markingtwoAdapter.setEmptyView(notDataView);
return;
}

9
app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java
View File

@@ -42,6 +42,7 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
private DealFragment yichengjiaoFragment;
private Savaselect savaselect;
private String pagetype="0";
private TextView floatingActionButton;
@SuppressLint("HandlerLeak")
private Handler handler = new Handler() {
@@ -154,6 +155,14 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
mEnterShopTitle.setOnClickListener(this);
bt_fenpei = (RelativeLayout)view.findViewById(R.id.bt_fenpei);
bt_fenpei.setOnClickListener(this);
floatingActionButton = (TextView)view.findViewById(R.id.floatingActionButton);
floatingActionButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//进入添加客户和完善信息
ShowAty.AddCustDialogActivity(getActivity(),"","","","");
}
});
}
@Override

8
app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java
View File

@@ -158,10 +158,10 @@ public class MyFragment
switch (view.getId()) {
case R.id.item_my_twitter:
XfiveWebActivity.runActivity(getActivity(), "隐私政策", "http://www.fenghoo.cn/public/statement/7");
// XfiveWebActivity.runActivity(getActivity(), "隐私政策", "http://192.168.1.3/public/statement/statement");
// WebActivitytwo.runActivity(getActivity(), "隐私政策", "http://192.168.1.3/public/statement/statement");
// webView.loadUrl("file:///android_asset/h5Text0.html"); //加载assets文件中的H5页面
// XfiveWebActivity.runActivity(getActivity(), "隐私政策", "http://www.fenghoo.cn/public/statement/7");
XfiveWebActivity.runActivity(getActivity(), "隐私政策", "file:///android_asset/privacy.html");
// WebActivitytwo.runActivity(getActivity(), "隐私政策", "file:///android_asset/privacy.html");
break;
}

2
app/src/main/res/drawable/share_tv_cus.xml
View File

@@ -2,6 +2,6 @@
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="2dp" android:color="#ff333333" />
<stroke android:width="1dp" android:color="#ff333333" />
<corners android:radius="16dp" />
</shape>

2
app/src/main/res/layout/activity_password_login.xml
View File

@@ -33,7 +33,7 @@
android:layout_height="38dp"
android:layout_marginTop="10dp"
android:layout_marginLeft="32dp"
android:text="欢迎来到七月七"
android:text="欢迎来到七月柒"
android:textColor="#ff333333"
android:textSize="28sp"
/>

21
app/src/main/res/layout/addcus_head_view.xml
View File

@@ -87,6 +87,17 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FF6A6A"
android:text="*"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textView3"
android:layout_marginRight="5dp"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -129,6 +140,16 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView17"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FF6A6A"
android:layout_marginRight="5dp"
android:text="*"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textView5"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout

197
app/src/main/res/layout/fragment_kehu.xml
View File

@@ -1,104 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffff"
android:orientation="vertical">
android:layout_height="match_parent">
<androidx.drawerlayout.widget.DrawerLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_height="match_parent"
android:background="#ffffff"
android:orientation="vertical">
<LinearLayout
<androidx.drawerlayout.widget.DrawerLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="0dp"
android:layout_weight="1">
<RelativeLayout
android:id="@+id/titlebar"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@color/colorWhite">
<Button
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:background="@mipmap/icon_back"
android:textColor="#000000"
android:visibility="invisible" />
<TextView
android:id="@+id/enter_shop_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="客户"
android:textColor="@color/black"
android:textSize="18sp" />
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/bt_sousuo_ditu"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/bt_fenpei"
android:layout_marginLeft="8dp"
android:gravity="center">
android:id="@+id/titlebar"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@color/colorWhite">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:background="@mipmap/marking_sousuo"
/>
</RelativeLayout>
<Button
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:background="@mipmap/icon_back"
android:textColor="#000000"
android:visibility="invisible" />
<RelativeLayout
android:id="@+id/bt_fenpei"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:gravity="center">
<TextView
android:id="@+id/enter_shop_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="客户"
android:textColor="@color/black"
android:textSize="18sp" />
<RelativeLayout
android:id="@+id/bt_sousuo_ditu"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="8dp"
android:layout_toLeftOf="@+id/bt_fenpei"
android:gravity="center">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:background="@mipmap/marking_sousuo" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/bt_fenpei"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:gravity="center">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:background="@mipmap/icon_fenpei" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/bt_sousuo_two"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:gravity="center"
android:visibility="gone">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:background="@mipmap/marking_sousuo" />
</RelativeLayout>
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:background="@mipmap/icon_fenpei"
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/bt_sousuo_two"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:visibility="gone"
android:gravity="center">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:background="@mipmap/marking_sousuo"
/>
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.tabs.TabLayout
android:id="@+id/main_tab_layout"
@@ -106,23 +106,32 @@
android:layout_height="wrap_content"
android:background="@color/colorWhite"
app:tabGravity="fill"
app:tabIndicatorColor="@color/colortheme"
app:tabIndicatorFullWidth="false"
app:tabIndicatorHeight="4dp"
app:tabIndicatorColor="@color/colortheme"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/black"
app:tabTextColor="@color/black" />
</RelativeLayout>
</RelativeLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_vp"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_vp"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
</androidx.drawerlayout.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/floatingActionButton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="right|bottom"
android:background="@mipmap/icon_fudong"
android:clickable="true" />
</FrameLayout>

1
app/src/main/res/layout/item_base_dialog.xml
View File

@@ -36,6 +36,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:layout_marginLeft="20dp"
android:gravity="center"
android:autoLink = "web"
android:layout_marginRight="20dp"
android:text=""

2
app/src/main/res/layout/layout_my_content.xml
View File

@@ -268,7 +268,7 @@
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="89dp"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:text="退出当前账户"
android:textColor="#ffff6868"

3
app/src/main/res/layout/markquestionsadapter_item.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:background="#ffffff"
@@ -12,6 +12,7 @@
android:id="@+id/agree_provision_chk"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:button="@null" />

BIN
app/src/main/res/mipmap-hdpi/icon_wode.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/mipmap-mdpi/icon_wode.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 906 B

BIN
app/src/main/res/mipmap-xhdpi/icon_wode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 932 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_wode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/icon_wode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

2
app/src/main/res/values/strings.xml
View File

@@ -1,5 +1,5 @@
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="app_name">七月七</string>
<string name="app_name">七月柒</string>
<string name="text_commit_apply">提交申请</string>