diff --git a/app/src/main/assets/dede.json b/app/src/main/assets/dede.json new file mode 100644 index 0000000..da0381c --- /dev/null +++ b/app/src/main/assets/dede.json @@ -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": [] +} \ No newline at end of file diff --git a/app/src/main/assets/edsf.json b/app/src/main/assets/edsf.json index 0c8bf9a..b0ae2f8 100644 --- a/app/src/main/assets/edsf.json +++ b/app/src/main/assets/edsf.json @@ -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": [] -} \ No newline at end of file +{"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":[]} \ No newline at end of file diff --git a/app/src/main/assets/privacy.html b/app/src/main/assets/privacy.html new file mode 100644 index 0000000..ca678bd --- /dev/null +++ b/app/src/main/assets/privacy.html @@ -0,0 +1,88 @@ + + + + + + + Document + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java index 094ea84..8b1b5b7 100644 --- a/app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/SplashActivity.java @@ -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(); } diff --git a/app/src/main/java/com/fenghoo/seven/main/find/CloundSolutionActivity.java b/app/src/main/java/com/fenghoo/seven/main/find/CloundSolutionActivity.java index 8f72261..1fb18b8 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/CloundSolutionActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/CloundSolutionActivity.java @@ -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() { diff --git a/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java index 00c2ce8..9ade241 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java @@ -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 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(); - } - }); } } \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java index ad3cae0..7b4aaf0 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java @@ -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 industryData; + private TextView marking_fragment; + + private List 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() { @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 { diff --git a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java index 14f3833..8868d90 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/QuestionsFragment.java @@ -84,7 +84,7 @@ public class QuestionsFragment extends BaseTreeFragment() { @@ -80,6 +94,10 @@ public class PrivateletterFragment extends MobanFragment { List 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(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java index d28c5fe..6a14705 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Bean/CustomerListBean.java @@ -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 diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java index baa5164..63d5bbe 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustDialogActivity.java @@ -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() { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java index bf944f6..7e6fbef 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java @@ -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() { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java index 643b41b..b30b923 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java @@ -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); } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java index 63f2823..e9eab51 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java @@ -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 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() { @@ -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(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java index 0913661..5c51826 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java @@ -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 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; } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java index bfa45f2..af9d053 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java @@ -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 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; } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java index 8057672..5d5132b 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java @@ -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 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; } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java index a99c18a..7f04542 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java @@ -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 diff --git a/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java b/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java index 534a5d7..4aee234 100644 --- a/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java @@ -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; } diff --git a/app/src/main/res/drawable/share_tv_cus.xml b/app/src/main/res/drawable/share_tv_cus.xml index 8553d9c..e4e8381 100644 --- a/app/src/main/res/drawable/share_tv_cus.xml +++ b/app/src/main/res/drawable/share_tv_cus.xml @@ -2,6 +2,6 @@ - + diff --git a/app/src/main/res/layout/activity_password_login.xml b/app/src/main/res/layout/activity_password_login.xml index abda13f..fe2bb5c 100644 --- a/app/src/main/res/layout/activity_password_login.xml +++ b/app/src/main/res/layout/activity_password_login.xml @@ -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" /> diff --git a/app/src/main/res/layout/addcus_head_view.xml b/app/src/main/res/layout/addcus_head_view.xml index 1612d94..a099cae 100644 --- a/app/src/main/res/layout/addcus_head_view.xml +++ b/app/src/main/res/layout/addcus_head_view.xml @@ -87,6 +87,17 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + - + android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:background="#ffffff" + android:orientation="vertical"> - + android:layout_height="0dp" + android:layout_weight="1"> - - -