diff --git a/app/build.gradle b/app/build.gradle
index d0ee4ad..28c2a4b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,4 +93,7 @@ dependencies {
     //android 6.0权限处理
     api 'pub.devrel:easypermissions:1.2.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
+
+   // api 'com.airbnb.android:lottie:1.0.1'
+    implementation 'com.airbnb.android:lottie:3.4.0'
 }
diff --git a/app/src/main/assets/1.json b/app/src/main/assets/1.json
new file mode 100644
index 0000000..b0ae2f8
--- /dev/null
+++ b/app/src/main/assets/1.json
@@ -0,0 +1 @@
+{"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/edsf.json b/app/src/main/assets/edsf.json
new file mode 100644
index 0000000..0c8bf9a
--- /dev/null
+++ b/app/src/main/assets/edsf.json
@@ -0,0 +1,804 @@
+{
+  "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
diff --git a/app/src/main/assets/jiazaidonghua.json b/app/src/main/assets/jiazaidonghua.json
new file mode 100644
index 0000000..586d9b8
--- /dev/null
+++ b/app/src/main/assets/jiazaidonghua.json
@@ -0,0 +1,373 @@
+{
+  "v": "5.4.4",
+  "fr": 25,
+  "ip": 0,
+  "op": 24,
+  "w": 100,
+  "h": 50,
+  "nm": "合成 1",
+  "ddd": 0,
+  "assets": [],
+  "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": [19.5, 25, 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": [20, 20],
+          "ix": 2
+        },
+        "p": {
+          "a": 0,
+          "k": [0, 0],
+          "ix": 3
+        },
+        "nm": "椭圆路径 1",
+        "mn": "ADBE Vector Shape - Ellipse",
+        "hd": false
+      }, {
+        "ty": "fl",
+        "c": {
+          "a": 0,
+          "k": [0.117647058824, 0.117647058824, 0.117647058824, 1],
+          "ix": 4
+        },
+        "o": {
+          "a": 0,
+          "k": 100,
+          "ix": 5
+        },
+        "r": 1,
+        "bm": 0,
+        "nm": "填充 1",
+        "mn": "ADBE Vector Graphic - Fill",
+        "hd": false
+      }, {
+        "ty": "tr",
+        "p": {
+          "a": 0,
+          "k": [0, 0],
+          "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": 6,
+    "op": 256,
+    "st": 6,
+    "bm": 0
+  }, {
+    "ddd": 0,
+    "ind": 2,
+    "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": [50, 25, 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": [20, 20],
+          "ix": 2
+        },
+        "p": {
+          "a": 0,
+          "k": [0, 0],
+          "ix": 3
+        },
+        "nm": "椭圆路径 1",
+        "mn": "ADBE Vector Shape - Ellipse",
+        "hd": false
+      }, {
+        "ty": "fl",
+        "c": {
+          "a": 0,
+          "k": [0.117647058824, 0.117647058824, 0.117647058824, 1],
+          "ix": 4
+        },
+        "o": {
+          "a": 0,
+          "k": 100,
+          "ix": 5
+        },
+        "r": 1,
+        "bm": 0,
+        "nm": "填充 1",
+        "mn": "ADBE Vector Graphic - Fill",
+        "hd": false
+      }, {
+        "ty": "tr",
+        "p": {
+          "a": 0,
+          "k": [0, 0],
+          "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": 12,
+    "op": 262,
+    "st": 12,
+    "bm": 0
+  }, {
+    "ddd": 0,
+    "ind": 3,
+    "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": [80.5, 25, 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": [20, 20],
+          "ix": 2
+        },
+        "p": {
+          "a": 0,
+          "k": [0, 0],
+          "ix": 3
+        },
+        "nm": "椭圆路径 1",
+        "mn": "ADBE Vector Shape - Ellipse",
+        "hd": false
+      }, {
+        "ty": "fl",
+        "c": {
+          "a": 0,
+          "k": [0.117647058824, 0.117647058824, 0.117647058824, 1],
+          "ix": 4
+        },
+        "o": {
+          "a": 0,
+          "k": 100,
+          "ix": 5
+        },
+        "r": 1,
+        "bm": 0,
+        "nm": "填充 1",
+        "mn": "ADBE Vector Graphic - Fill",
+        "hd": false
+      }, {
+        "ty": "tr",
+        "p": {
+          "a": 0,
+          "k": [0, 0],
+          "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": 18,
+    "op": 268,
+    "st": 18,
+    "bm": 0
+  }],
+  "markers": []
+}
\ No newline at end of file
diff --git a/app/src/main/assets/ssssd.json b/app/src/main/assets/ssssd.json
new file mode 100644
index 0000000..3c1fcf8
--- /dev/null
+++ b/app/src/main/assets/ssssd.json
@@ -0,0 +1,804 @@
+{
+  "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/java/com/fenghoo/seven/base/BaseTreeActivity.java b/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java
index 009cfdb..6157d60 100644
--- a/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/base/BaseTreeActivity.java
@@ -15,6 +15,7 @@ import com.fenghoo.seven.R;
 import com.fenghoo.seven.dialog.LoadingDialogy;
 import com.fenghoo.seven.utils.StatusBarUtil;
 import com.fenghoo.seven.widget.TitleBar;
+import com.gyf.immersionbar.ImmersionBar;
 import com.hannesdorfmann.mosby3.mvp.MvpActivity;
 import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -41,13 +42,25 @@ public abstract class BaseTreeActivity<V extends MvpView, P extends MvpPresenter
         super.onCreate(savedInstanceState);
         setContentView(getLayoutId());
         mContext = this;
-        StatusBarUtil.transparencyBar(this); //设置状态栏全透明
-        StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
+//        StatusBarUtil.transparencyBar(this); //设置状态栏全透明
+//        StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
+
+        //初始化沉浸式
+        initImmersionBar();
         initView();
         initData();
         initEvent();
         initNormalBack();
     }
+    /**
+     * 初始化沉浸式
+     * Init immersion bar.
+     */
+    protected void initImmersionBar() {
+        //设置共同沉浸式样式
+        ImmersionBar.with(this).navigationBarColor(R.color.colorPrimary).init();
+    }
+
 
     /**
      * 获取布局文件ID
diff --git a/app/src/main/java/com/fenghoo/seven/dialog/LoadingDialogy.java b/app/src/main/java/com/fenghoo/seven/dialog/LoadingDialogy.java
index e88f1cc..7696787 100644
--- a/app/src/main/java/com/fenghoo/seven/dialog/LoadingDialogy.java
+++ b/app/src/main/java/com/fenghoo/seven/dialog/LoadingDialogy.java
@@ -37,7 +37,7 @@ public class LoadingDialogy extends Dialog {
     }
     //显示dialog的方法
     public static LoadingDialogy showDialog(Context context , String content){
-        dialog = new LoadingDialogy(context, R.style.loadingDialog ,content);//dialog样式
+        dialog = new LoadingDialogy(context, R.style.avatar_dialog_style ,content);//dialog样式
         dialog.setContentView(R.layout.dialog_loading);//dialog布局文件
         dialog.setCanceledOnTouchOutside(false);//点击外部不允许关闭dialog
         return dialog;
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/CodeLoginActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/CodeLoginActivity.java
index dd64347..d7fe25e 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/CodeLoginActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/CodeLoginActivity.java
@@ -25,6 +25,7 @@ import com.fenghoo.seven.main.my.entity.loginInfoBean;
 import com.fenghoo.seven.utils.ToastUtils;
 import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.fenghoo.seven.widget.TitleBar;
+import com.gyf.immersionbar.ImmersionBar;
 
 /**
  * LoginActivity
@@ -65,7 +66,6 @@ public class CodeLoginActivity extends BaseActivity implements  ISmsCodeDialogVi
     };
     private TitleBar title_bar;
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -74,8 +74,10 @@ public class CodeLoginActivity extends BaseActivity implements  ISmsCodeDialogVi
         mPhoneTv = (TextView) findViewById(R.id.phone);
         mPhoneTvtwo = (TextView) findViewById(R.id.phonetwo);
         title_bar = (TitleBar) findViewById(R.id.title_bar);
+        title_bar.hideline();
         initNormalBack();
         title_bar.setTitle("");
+        ImmersionBar.with(this).statusBarDarkFont(true).init();//设置状态栏颜色
         mPhone = getIntent().getStringExtra("phone");
         entertype = getIntent().getStringExtra("entertype");
 //        String template = "正在向%s发送短信验证码";
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/ForgetPasActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/ForgetPasActivity.java
index cf452cf..e003c4f 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/ForgetPasActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/ForgetPasActivity.java
@@ -9,6 +9,7 @@ import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseActivity;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.widget.TitleBar;
+import com.gyf.immersionbar.ImmersionBar;
 
 public class ForgetPasActivity extends BaseActivity implements View.OnClickListener {
     private TitleBar title_bar;
@@ -29,7 +30,9 @@ public class ForgetPasActivity extends BaseActivity implements View.OnClickListe
     }
 
     private void initView() {
+        ImmersionBar.with(this).statusBarDarkFont(true).init();//设置状态栏颜色
         title_bar = (TitleBar) findViewById(R.id.title_bar);
+        title_bar.hideline();
         initNormalBack();
         title_bar.setTitle("");
         mEtPhone = (EditText) findViewById(R.id.et_phone);
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
index 8917c49..b4a2696 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
@@ -1,9 +1,9 @@
 package com.fenghoo.seven.main.activity;
 
-import android.content.Intent;
 import android.os.CountDownTimer;
 import android.text.Html;
 import android.view.View;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
@@ -14,6 +14,9 @@ import com.fenghoo.seven.base.BaseTreeActivity;
 import com.fenghoo.seven.main.activity.mvp.contract.LoginPasswordContract;
 import com.fenghoo.seven.main.activity.mvp.presenterImpl.LoginPasswordPresenterImpl;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
+import com.fenghoo.seven.utils.PhonenNumUtil;
+import com.fenghoo.seven.utils.ToastUtils;
+import com.gyf.immersionbar.ImmersionBar;
 
 import androidx.annotation.NonNull;
 
@@ -47,6 +50,8 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
     private View view;
     private TextView login_tv_code;
     private TextView login_tv_forgetpas;
+    private TextView tv_phone_error;
+    private TextView tv_psw_error;
 
     @Override
     public int getLayoutId() {
@@ -55,8 +60,9 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
 
     @Override
     protected void initView() {
-        mEtPhone = (EditText) findViewById(R.id.et_phone);
-        et_pass = (EditText) findViewById(R.id.et_pass);
+        ImmersionBar.with(this).statusBarDarkFont(true).init();//设置状态栏颜色
+        mEtPhone = findViewById(R.id.et_phone);
+        et_pass = findViewById(R.id.et_pass);
         mBtnLogin = (Button) findViewById(R.id.btn_login);
         mBtnLogin.setOnClickListener(this);
         login_tv_pas = (TextView) findViewById(R.id.login_tv_pas);
@@ -66,10 +72,13 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
         login_tv_code.setOnClickListener(this);
         login_tv_forgetpas = (TextView) findViewById(R.id.login_tv_forgetpas);
         login_tv_forgetpas.setOnClickListener(this);
+        tv_phone_error = findViewById(R.id.tv_phone_error);
+        tv_psw_error = findViewById(R.id.tv_psw_error);
 
 
     }
 
+
     @Override
     protected void initData() {
         getPresenter().initData();
@@ -84,7 +93,17 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.btn_login://登录
-                getPresenter().login();
+
+                if(longintype.equals("0")){
+                    getPresenter().login();
+                }else {
+                    boolean mobile = PhonenNumUtil.isMobile(getMobile());
+                    if(!mobile){
+                        ToastUtils.showToast(mContext,"输入的手机号不正确！");
+                        return;
+                    }
+                    ShowAty.CodeLoginActivity(LoginPasswordActivity.this,getMobile(),"0");
+                }
                 break;
             case R.id.login_tv_code://验证码登录
                 if(longintype.equals("0")){
@@ -94,7 +113,7 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
                     passWordLogin();
                     longintype="0";
                 }
-                ShowAty.CodeLoginActivity(LoginPasswordActivity.this,"18133922183","0");
+
                 break;
             case R.id.login_tv_forgetpas://忘记密码
                 ShowAty.ForgetPasActivity(LoginPasswordActivity.this);
@@ -121,6 +140,7 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
 
     @Override
     public String getMobile() {
+
         return mEtPhone.getText().toString();
     }
 
@@ -139,6 +159,26 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
         et_pass.setText(passWord);
     }
 
+    @Override
+    public void showphoneerro() {
+      tv_phone_error.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void showpassworderro() {
+        tv_psw_error.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void showphoneright() {
+        tv_phone_error.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showpasswordright() {
+        tv_psw_error.setVisibility(View.GONE);
+    }
+
     @Override
     public boolean isSavePassword() {
         return false;
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 107c549..094ea84 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
@@ -7,9 +7,11 @@ import android.os.Message;
 import android.view.KeyEvent;
 import android.view.WindowManager;
 
+import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseActivity;
 import com.fenghoo.seven.utils.ToastUtils;
 import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
+import com.gyf.immersionbar.ImmersionBar;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -56,8 +58,10 @@ public class SplashActivity extends BaseActivity implements EasyPermissions.Perm
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //设置共同沉浸式样式
+        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/activity/mvp/contract/LoginPasswordContract.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginPasswordContract.java
index 87dd673..11c7183 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginPasswordContract.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/contract/LoginPasswordContract.java
@@ -43,6 +43,34 @@ public class LoginPasswordContract {
          */
         void setPassWord(String passWord);
 
+        /**
+         * @description  显示手机号错误
+         * @param
+         * @return
+         */
+        void showphoneerro();
+
+        /**
+         * @description  显示密码错误
+         * @param
+         * @return
+         */
+        void showpassworderro();
+
+        /**
+         * @description  显示手机号正确
+         * @param
+         * @return
+         */
+        void showphoneright();
+
+        /**
+         * @description  显示密码正确
+         * @param
+         * @return
+         */
+        void showpasswordright();
+
         /**
          * 是否记住密码
          *
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java
index ca14664..6925614 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/mvp/presenterImpl/LoginPasswordPresenterImpl.java
@@ -8,6 +8,9 @@ import com.fenghoo.seven.main.activity.mvp.contract.LoginPasswordContract;
 import com.fenghoo.seven.main.activity.mvp.model.LoginPasswordModelImpl;
 import com.fenghoo.seven.main.my.entity.loginInfoBean;
 import com.fenghoo.seven.network.ApiCallBack;
+import com.fenghoo.seven.utils.PhonenNumUtil;
+import com.fenghoo.seven.utils.StringUtils;
+import com.fenghoo.seven.utils.ToastUtils;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
 
@@ -46,12 +49,23 @@ public class LoginPasswordPresenterImpl extends MvpBasePresenter<LoginPasswordCo
         }
         //验证手机号码规范
         final String mobile = getView().getMobile();
-        if (TextUtils.isEmpty(mobile) || mobile.length() != 11) {
+        boolean mobilee = PhonenNumUtil.isMobile(mobile);
+        if(!mobilee){
             getView().toast("请输入正确的手机号码");
+            getView().showphoneerro();
             return;
+        }else {
+            getView().showphoneright();
         }
         //验证密码规范
         final String passWord = getView().getPassWord();
+        if(StringUtils.isEmpty(passWord)) {
+            getView().toast("请输入正确的密码");
+            getView().showpassworderro();
+            return;
+        }else {
+            getView().showpasswordright();
+        }
 
         getView().showProgressDialog("登录中...");
         mModel.login(mobile, passWord, new ApiCallBack<loginInfoBean>() {
@@ -60,14 +74,21 @@ public class LoginPasswordPresenterImpl extends MvpBasePresenter<LoginPasswordCo
                 if (getView() == null) {
                     return;
                 }
-                getView().dismissProgressDialog();
-                mModel.setLogin(true);
-                mModel.saveUserInfo(data);
-                Log.d("LoginPresenterImpl: ", data.toString());
-                //记住密码
+         //       getView().dismissProgressDialog();
+                if(data.getSuccess()==0){
+                    mModel.setLogin(true);
+                    mModel.saveUserInfo(data);
+                    Log.d("LoginPresenterImpl: ", data.toString());
+                    //记住密码
 //                boolean savePassword = getView().isSavePassword();
 //                mModel.savePassword(savePassword ? mobile : null, savePassword ? passWord : null);
-                getView().startActivity(MainActivity.class);
+           //         getView().startActivity(MainActivity.class);
+                }else {
+                    getView().toast(data.getMsg());
+                    getView().showphoneright();
+                    getView().showpasswordright();
+                }
+
             }
 
             @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 fb8f096..534a5d7 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
@@ -179,5 +179,4 @@ public class MyFragment
 
         }
     }
-
 }
diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/PersonalProfileActivity.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/PersonalProfileActivity.java
index 8d4934a..a316b3c 100644
--- a/app/src/main/java/com/fenghoo/seven/main/my/activity/PersonalProfileActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/my/activity/PersonalProfileActivity.java
@@ -14,6 +14,7 @@ import com.fenghoo.seven.utils.WidgetTools;
 import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.fenghoo.seven.widget.CircleImageView;
 import com.fenghoo.seven.wxapi.WXEntryActivity;
+import com.gyf.immersionbar.ImmersionBar;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
@@ -38,6 +39,7 @@ public class PersonalProfileActivity extends BaseTreeActivity<PersonalProfileCon
 
     @Override
     protected void initView() {
+        ImmersionBar.with(this).statusBarColor(R.color.colorPrimary).statusBarDarkFont(true).init();//设置状态栏颜色
         setTitleBar(R.id.title_bar, getString(R.string.text_PersonalProfile), true, false, null);
         tv_banding = (TextView) findViewById(R.id.tv_banding);
         my_ima_head = (CircleImageView) findViewById(R.id.my_ima_head);
diff --git a/app/src/main/java/com/fenghoo/seven/utils/PhonenNumUtil.java b/app/src/main/java/com/fenghoo/seven/utils/PhonenNumUtil.java
new file mode 100644
index 0000000..10c9944
--- /dev/null
+++ b/app/src/main/java/com/fenghoo/seven/utils/PhonenNumUtil.java
@@ -0,0 +1,63 @@
+package com.fenghoo.seven.utils;
+
+import android.text.TextUtils;
+
+/**
+ * Created by 蔡雅楠 on 2018/5/11.
+ */
+
+public class PhonenNumUtil {
+    
+    public static String phoneNum(String phoneNum){
+        String strPhoneNum = "";
+        if(!TextUtils.isEmpty(phoneNum) && phoneNum.length() > 7 ){
+            StringBuilder sb  =new StringBuilder();
+            for (int i = 0; i < phoneNum.length(); i++) {
+                char c = phoneNum.charAt(i);
+                if (i >= 3 && i <= 8) {
+                    sb.append('*');
+                } else {
+                    sb.append(c);
+                }
+            }
+            strPhoneNum = sb.toString();
+        }
+        return strPhoneNum;
+    }
+
+    public static String hidephonenum(String phoneNum){
+        String strPhoneNum = "";
+        if(!TextUtils.isEmpty(phoneNum)){
+            StringBuilder sb  =new StringBuilder();
+            for (int i = 0; i < phoneNum.length(); i++) {
+                char c = phoneNum.charAt(i);
+                if (i >= 3) {
+                    sb.append('*');
+                } else {
+                    sb.append(c);
+                }
+            }
+            strPhoneNum = sb.toString();
+        }
+        return strPhoneNum;
+    }
+
+    /**
+     * 验证手机格式
+     */
+    public static boolean isMobile(String number) {
+    /*
+    移动：134、135、136、137、138、139、150、151、152、157(TD)、158、159、178(新)、182、184、187、188
+    联通：130、131、132、152、155、156、185、186
+    电信：133、153、170、173、177、180、181、189、（1349卫通）
+    总结起来就是第一位必定为1，第二位必定为3或5或8，其他位置的可以为0-9
+    */
+        String num = "[1][123456789]\\d{9}";//"[1]"代表第1位为数字1，"[34578]"代表第二位可以为3、4、5、7、8中的一个，"\\d{9}"代表后面是可以是0～9的数字，有9位。
+        if (TextUtils.isEmpty(number)) {
+            return false;
+        } else {
+            //matches():字符串是否在给定的正则表达式匹配
+            return number.matches(num);
+        }
+    }
+}
diff --git a/app/src/main/java/com/fenghoo/seven/widget/TitleBar.java b/app/src/main/java/com/fenghoo/seven/widget/TitleBar.java
index d283be5..a59e77e 100644
--- a/app/src/main/java/com/fenghoo/seven/widget/TitleBar.java
+++ b/app/src/main/java/com/fenghoo/seven/widget/TitleBar.java
@@ -65,7 +65,14 @@ public class TitleBar extends RelativeLayout implements View.OnClickListener {
         super(context, attrs, defStyleAttr);
         initView(context);
     }
-
+    /**
+     * @description  隐藏横线
+     * @param
+     * @return
+     */
+    public void hideline(){
+        mVBottomLine.setVisibility(GONE);
+    }
     private void initView(Context context) {
         mRootView = inflate(context, R.layout.widget_title_bar, this);
 
diff --git a/app/src/main/res/drawable/color_cursor.xml b/app/src/main/res/drawable/color_cursor.xml
new file mode 100644
index 0000000..7947b1c
--- /dev/null
+++ b/app/src/main/res/drawable/color_cursor.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <size android:width="2dp" />
+    <solid android:color="#000000"  />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_dialog.xml b/app/src/main/res/drawable/shape_dialog.xml
new file mode 100644
index 0000000..9ef204b
--- /dev/null
+++ b/app/src/main/res/drawable/shape_dialog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ff848484" />
+    <corners android:topLeftRadius="13dp" android:topRightRadius="13dp" android:bottomLeftRadius="13dp" android:bottomRightRadius="13dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_forget_pas.xml b/app/src/main/res/layout/activity_forget_pas.xml
index c71227f..579b4e1 100644
--- a/app/src/main/res/layout/activity_forget_pas.xml
+++ b/app/src/main/res/layout/activity_forget_pas.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+
+<RelativeLayout android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorWhite"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -87,3 +95,11 @@
 
 
 </LinearLayout>
+
+    <ImageView
+        android:layout_width="220dp"
+        android:layout_height="220dp"
+        android:background="@mipmap/login_bj"
+        android:layout_alignParentRight="true"
+        />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_password_login.xml b/app/src/main/res/layout/activity_password_login.xml
index 4e993aa..abda13f 100644
--- a/app/src/main/res/layout/activity_password_login.xml
+++ b/app/src/main/res/layout/activity_password_login.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ndroid="http://schemas.android.com/apk/res-auto">
+
+    <ImageView
+        android:layout_width="220dp"
+        android:layout_height="220dp"
+        android:background="@mipmap/login_bj"
+        android:layout_alignParentRight="true"
+        />
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
+
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -39,35 +53,51 @@
             />
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
+            android:orientation="vertical"
             android:layout_marginTop="10.5dp"
             android:layout_marginLeft="32dp">
 
-
             <EditText
                 android:id="@+id/et_phone"
-                android:layout_width="0dp"
-                android:layout_weight="1"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
+                android:layout_gravity="center_horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
                 android:background="@null"
-                android:textSize="14sp"
-                android:hint="请输入手机号"
-                android:layout_gravity="bottom"
+                android:textCursorDrawable="@drawable/color_cursor"
                 android:inputType="number"
-                android:textColorHint="@color/colorContestBookBtnGray"/>
+                android:singleLine="true"
+                android:completionThreshold="1"
+                android:textSize="14sp"
+                android:textColorHint="@color/colorContestBookBtnGray"
+                android:dropDownHeight="wrap_content"
+                android:hint="请输入手机号"
+                android:text="" />
 
         </LinearLayout>
 
+
         <View
             android:layout_width="wrap_content"
             android:layout_height="0.5dp"
             android:layout_marginLeft="32dp"
             android:layout_marginRight="32dp"
-            android:layout_marginTop="@dimen/dimen_5"
-            android:background="@color/colorBlack"/>
+            android:background="#E8E8E8"/>
+
+        <TextView
+            android:id="@+id/tv_phone_error"
+            android:layout_width="wrap_content"
+            android:layout_height="19dp"
+            android:text="手机号输入有误"
+            android:visibility="gone"
+            android:textColor="#ffff6161"
+            android:layout_marginLeft="32dp"
+            android:layout_marginTop="4.5dp"
+            android:textSize="14sp"
+            />
 
         <TextView
             android:id="@+id/login_tv_pas"
@@ -90,17 +120,19 @@
 
             <EditText
                 android:id="@+id/et_pass"
-                android:layout_width="wrap_content"
-                android:layout_weight="1"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
+                android:layout_gravity="center_horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:textCursorDrawable="@drawable/color_cursor"
                 android:background="@null"
+                android:inputType="textPassword"
+                android:singleLine="true"
+                android:textColorHint="@color/colorContestBookBtnGray"
                 android:textSize="14sp"
-                android:hint="请输入验证码"
-
-                android:textColorHint="@color/colorContestBookBtnGray"/>
-
-
+                android:hint="请输入密码"
+                android:text="" />
 
         </RelativeLayout>
 
@@ -110,8 +142,18 @@
             android:layout_height="0.5dp"
             android:layout_marginLeft="32dp"
             android:layout_marginRight="32dp"
-            android:layout_marginTop="@dimen/dimen_5"
-            android:background="@color/colorBlack"/>
+            android:background="#E8E8E8"/>
+        <TextView
+            android:id="@+id/tv_psw_error"
+            android:layout_width="wrap_content"
+            android:layout_height="19dp"
+            android:text="密码输入有误"
+            android:visibility="gone"
+            android:textColor="#ffff6161"
+            android:layout_marginLeft="32dp"
+            android:layout_marginTop="4.5dp"
+            android:textSize="14sp"
+            />
 
         <Button
             android:id="@+id/btn_login"
@@ -155,3 +197,4 @@
             />
     </RelativeLayout>
 </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_loading.xml b/app/src/main/res/layout/dialog_loading.xml
index 136547e..347e064 100644
--- a/app/src/main/res/layout/dialog_loading.xml
+++ b/app/src/main/res/layout/dialog_loading.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:gravity="center"
-              android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center"
+    android:orientation="vertical">
 
 
     <LinearLayout
-        android:layout_width="150dp"
-        android:layout_height="150dp"
-        android:background="@drawable/drawable_loading_bg_white"
+        android:layout_width="124dp"
+        android:layout_height="124dp"
+        android:background="@drawable/shape_dialog"
         android:gravity="center"
         android:orientation="vertical">
 
@@ -17,15 +18,24 @@
             android:id="@+id/ivProgress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:indeterminateTint="@color/colorBlack"/>
 
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            app:lottie_autoPlay="true"
+            app:lottie_fileName="ssssd.json"
+            app:lottie_loop="true" />
+
         <TextView
             android:id="@+id/tv_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:text="加载中.."
-            android:textColor="@color/colorTextBlack333"
+            android:layout_marginTop="12dp"
+            android:text="正在加载..."
+            android:textColor="@color/colorWhite"
             android:textSize="16sp"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_smscode_input.xml b/app/src/main/res/layout/dialog_smscode_input.xml
index 4c3e4de..5121e2d 100644
--- a/app/src/main/res/layout/dialog_smscode_input.xml
+++ b/app/src/main/res/layout/dialog_smscode_input.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorWhite"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ver="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
@@ -92,4 +98,12 @@
             />
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+
+        <ImageView
+            android:layout_width="220dp"
+            android:layout_height="220dp"
+            android:background="@mipmap/login_bj"
+            android:layout_alignParentRight="true"
+            />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxhdpi/login_bj.png b/app/src/main/res/mipmap-xxhdpi/login_bj.png
new file mode 100644
index 0000000..c33afc1
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/login_bj.png differ
diff --git a/build.gradle b/build.gradle
index 6a4f7ce..72cb327 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,15 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
+
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.6"
     }
 }
 
@@ -17,6 +22,7 @@ allprojects {
         google()
         jcenter()
         maven { url "https://jitpack.io"}
+
     }
 }