From 0a402e4e92cf6d025512f78cddd3f40de6cb1812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Mon, 13 Jan 2020 09:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=80=E4=BA=9B=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/lottie/tab_game.json | 2 +- app/src/main/assets/lottie/tab_home.json | 2 +- .../rating/edit/RatingEditActivity.kt | 13 +++-- .../gamecenter/personal/PersonalFragment.java | 2 + .../video/detail/DetailPlayerView.kt | 2 +- .../res/drawable-hdpi/personal_card_bg.9.png | Bin 4085 -> 0 bytes .../drawable-xxhdpi/ic_video_detail_like.png | Bin 1800 -> 1961 bytes .../drawable-xxhdpi/ic_video_detail_liked.png | Bin 2591 -> 2624 bytes .../main/res/drawable/bg_personal_card.xml | 54 ++++++++++++++++++ app/src/main/res/layout/fragment_personal.xml | 2 +- .../res/layout/item_personal_fun_group.xml | 2 +- 11 files changed, 70 insertions(+), 9 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/personal_card_bg.9.png create mode 100644 app/src/main/res/drawable/bg_personal_card.xml diff --git a/app/src/main/assets/lottie/tab_game.json b/app/src/main/assets/lottie/tab_game.json index d5a7f0fd26..c461e22ee0 100644 --- a/app/src/main/assets/lottie/tab_game.json +++ b/app/src/main/assets/lottie/tab_game.json @@ -1 +1 @@ -{"v":"5.5.9","fr":30,"ip":0,"op":25,"w":66,"h":66,"nm":"tab_game","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"椭圆形 2","parent":4,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.498],"y":[0]},"t":5,"s":[0]},{"t":10,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[11.328,4.586,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.55,0.55,0.333],"y":[0,0,0]},"t":5,"s":[0,0,100]},{"t":10,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3,3],"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":[1,1,1,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":[300,300],"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":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"椭圆形备份 2","parent":4,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.629],"y":[0]},"t":2,"s":[0]},{"t":7,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[15.317,-7.67,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0]},"t":-4.5,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.507,0.507,0.333],"y":[0,0,0]},"t":2,"s":[0,0,100]},{"t":7,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[2,2],"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":[1,1,1,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":[300,300],"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":"椭圆形备份 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"椭圆形","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.631],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[21.839,33.222,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.54,0.54,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.52,0.52,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.552,0.552,0.333],"y":[0,0,0]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"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":1.5,"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":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"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":"椭圆形","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.667],"y":[1]},"o":{"x":[0.543],"y":[0]},"t":0,"s":[0]},{"t":8,"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":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"矩形","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.031,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[22,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":9,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-5.991,-4.197],"ix":5},"e":{"a":0,"k":[9.971,7.782],"ix":6},"t":1,"nm":"Gradient Fill 2","mn":"ADBE Vector Graphic - G-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":[300,300],"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":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.5.9","fr":30,"ip":0,"op":25,"w":66,"h":66,"nm":"tab_game","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"椭圆形 2","parent":4,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.498],"y":[0]},"t":5,"s":[0]},{"t":10,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[11.328,4.586,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.55,0.55,0.333],"y":[0,0,0]},"t":5,"s":[0,0,100]},{"t":10,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[3,3],"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":[1,1,1,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":[300,300],"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":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"椭圆形备份 2","parent":4,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.629],"y":[0]},"t":2,"s":[0]},{"t":7,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[15.317,-7.67,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0]},"t":-4.5,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.507,0.507,0.333],"y":[0,0,0]},"t":2,"s":[0,0,100]},{"t":7,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[2,2],"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":[1,1,1,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":[300,300],"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":"椭圆形备份 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"椭圆形","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.631],"y":[0]},"t":0,"s":[0]},{"t":6,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[21.839,33.222,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.54,0.54,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.52,0.52,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.552,0.552,0.333],"y":[0,0,0]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"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":1.5,"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":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"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":"椭圆形","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.667],"y":[1]},"o":{"x":[0.543],"y":[0]},"t":0,"s":[0]},{"t":8,"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":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"矩形","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.031,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[22,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":9,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-5.991,-4.197],"ix":5},"e":{"a":0,"k":[9.971,7.782],"ix":6},"t":1,"nm":"Gradient Fill 2","mn":"ADBE Vector Graphic - G-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":[300,300],"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":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/assets/lottie/tab_home.json b/app/src/main/assets/lottie/tab_home.json index 4d75f5d783..dffb090f89 100644 --- a/app/src/main/assets/lottie/tab_home.json +++ b/app/src/main/assets/lottie/tab_home.json @@ -1 +1 @@ -{"v":"5.5.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"tab_index","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"椭圆形备份","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.596],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,40.493,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.54,0.54,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.555,0.555,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.552,0.552,0.333],"y":[0,0,0]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.635],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","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":1.5,"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":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"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":"椭圆形备份","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-0.5,"op":59.5,"st":-0.5,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径备份","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,32.993,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[95,95,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.24,-1.21],[-1.93,-1.89],[-0.24,-0.57],[0,-0.06],[0,-2.63],[1.76,0],[0,0],[0,1.72],[0,2.63],[-0.24,0.61],[-0.03,0.02],[-1.93,1.89]],"o":[[1.92,1.89],[0.02,0.02],[0.24,0.57],[0,2.63],[0,1.72],[0,0],[-1.76,0],[0,-2.62],[0,-0.07],[0.25,-0.61],[1.92,-1.89],[1.24,-1.21]],"v":[[2.26,-9.09],[8.03,-3.42],[8.76,-2.38],[9,-1.02],[9,6.88],[5.82,10],[-5.82,10],[-9,6.88],[-9,-0.99],[-8.71,-2.38],[-8.01,-3.43],[-2.23,-9.09]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-4.902,-4.663],"ix":5},"e":{"a":0,"k":[8.159,8.646],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-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":[300,300],"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":"路径备份","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.5.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"tab_index","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"椭圆形备份","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.596],"y":[0]},"t":0,"s":[0]},{"t":6,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,40.493,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.54,0.54,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.555,0.555,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.552,0.552,0.333],"y":[0,0,0]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.635],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","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":1.5,"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":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"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":"椭圆形备份","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-0.5,"op":59.5,"st":-0.5,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径备份","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,32.993,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[95,95,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.24,-1.21],[-1.93,-1.89],[-0.24,-0.57],[0,-0.06],[0,-2.63],[1.76,0],[0,0],[0,1.72],[0,2.63],[-0.24,0.61],[-0.03,0.02],[-1.93,1.89]],"o":[[1.92,1.89],[0.02,0.02],[0.24,0.57],[0,2.63],[0,1.72],[0,0],[-1.76,0],[0,-2.62],[0,-0.07],[0.25,-0.61],[1.92,-1.89],[1.24,-1.21]],"v":[[2.26,-9.09],[8.03,-3.42],[8.76,-2.38],[9,-1.02],[9,6.88],[5.82,10],[-5.82,10],[-9,6.88],[-9,-0.99],[-8.71,-2.38],[-8.01,-3.43],[-2.23,-9.09]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-4.902,-4.663],"ix":5},"e":{"a":0,"k":[8.159,8.646],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-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":[300,300],"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":"路径备份","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt index f3025645f2..b3b6f3a10c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt @@ -8,9 +8,7 @@ import android.os.Build import android.os.Bundle import android.text.TextUtils import android.view.MenuItem -import android.webkit.WebSettings -import android.webkit.WebView -import android.webkit.WebViewClient +import android.webkit.* import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.gh.base.ToolBarActivity @@ -49,6 +47,7 @@ class RatingEditActivity : ToolBarActivity() { private lateinit var mViewModel: RatingEditViewModel private lateinit var mPlaceholder: String private var mLoadFinish = false + private var mLoadError = false override fun getLayoutId(): Int { return R.layout.activity_rating_edit @@ -149,6 +148,11 @@ class RatingEditActivity : ToolBarActivity() { } mLoadFinish = true } + + override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) { + super.onReceivedError(view, request, error) + mLoadError = true + } } mBinding.mWebView.addJavascriptObject(DefaultJsApi(this), null) mBinding.mWebView.loadUrl("https://resource.ghzs.com/page/comment_tag_editor/index.html?timestamp=" + System.currentTimeMillis()) @@ -341,7 +345,8 @@ class RatingEditActivity : ToolBarActivity() { finish() } }) - return true + if (!mLoadError) return true + return false } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index 0248e98239..17a6a805a4 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -29,6 +29,7 @@ import com.gh.common.util.LoginHelper; import com.gh.common.util.MtaHelper; import com.gh.common.util.PackageUtils; import com.gh.common.util.StringUtils; +import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.MessageActivity; @@ -178,6 +179,7 @@ public class PersonalFragment extends BaseFragment implements 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 VypMSJfa#Ap%{R!WaNW*5{{Tb?r*{AV diff --git a/app/src/main/res/drawable-xxhdpi/ic_video_detail_like.png b/app/src/main/res/drawable-xxhdpi/ic_video_detail_like.png index fc8762fd7bd489a09a13060181d9e9522ca03ce7..c7f7d23b10c68a9139ddab01ad60ce8d09bca7e1 100644 GIT binary patch delta 1854 zcmV-E2f_G=4yg~2fPV)QNklYjNuVT990L9Q{eMTI`_X4;2ilH4Mfahj zi_?=FL<+FW&>zTU0{7Y+gqr^l05u2oxk%QfOPO2q-=hp81klYW4or$wZ4ZCX$}r^o zHVv4W=s*>d-=7!q+pCNsgWn{y(~o1V^gi|uOFHy}l5RlDKQKxtGnC*1?GiBx)f>0)_FjI z*$v1Q=y0TModpz_$3XBcG+LYFfWK6Lb|n!0{l zS}UnNPI*TGOo`!nloU*f>4!96N<*0gB?g(zuaaOAv~Lsi-QYS?pq!m|5lv4+M9Cba z_Q;tTP+(pMyLrj*3wa$AN*PQEz?_2iqO@#34V{_>!_?1EIyQ-pEl0A7l$H&pp(oO6 zEVXukIe!^#Ls{8k8g6xgIu@tI??dT;oE;O;?dUcn$64BD8efPupq-w9Y@_@ZZo&4s z>Zt<-pxmTigDyuhZk>S=f0siWX_-7EtU?O_D-R8lD*V4jFWS$}*;{3VzPJZIY*fGSIll@L(i%piR# zlAGZ#&~gfY&DLquSwyBxIGt)g!f1R$=YcW;y@Y}$9}u{^p>W*+dBf4}V5JT`zCf_l z-`LORSZ3#-$p-}H0qE*r#=!A(w!<8Gos=xMhW`Tv)@kg|Zqob59Qm@!URtFh3*@yk zG=I)o=gOIJ<@s6^cl>8T+ zT`wIrK-=kjr`^cgSbfNCQ}un722c$jwjhg?_Pz;L1BQkV6HigMwM7yQ7#co`3R2?! z6UkCw)ihve_%QJlar*(|XP*gN1BQkV6Ms(;x3%$8g4ckd;iHHkP0Y3Nvjl38w7!*B zBC;Y^GmW!L!$&Qk6nB=;))io58M+1h2kC^eR6x#qmxpxejjDLqd zwiQ32HyIi*G<^7Uq}{TgI2_0;Zy#G@E35%S!-p-lq|!ciIF7R>TwgUbeoCeW3=JRk zfhN8Gk)r`$prP?o{A$3kt&uun&OCV&8a`~X zC6Q)5t7zyvG}5C%>*X%>HDGA?@PFt_TSZqnYEN~fyOLf1n2rLv7doydqG>L2j`Z>j z1dND?ZKi7ah)Kk}eE^+VCLpCBObL=&T65`Xvgl$q?=+~PRp+dV_&GRT9;Ld9J41|TD20_J$iJ>?nn zcFHFYRD#Fk>BDEH^z2L1;xda*Cl=?^i}66LC$qm2jWTI5w+r$Acbu~3l9l%?aZJAS z6g1yg2f_O79={V4raZ5&L#KN-C@0L5aqAeM8)HCu_6B-G0Trf7$hM*f!FKX4+ zQ&AS5{f&xuM6@cu5PPQ0E9u=4_0r1vl7=ouL(y0?7k!7?G5P)Gvu%BjorZ&3ko?ki zy?w<&q4FCWD07*qoM6N<$f&+zzRR910 delta 1692 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 delta 2488 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index be3b3a2b9c..e1737572b6 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -130,7 +130,7 @@ android:id="@+id/personal_home" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dp" + android:layout_marginRight="6dp" android:text="个人主页" android:textColor="@color/white" android:textSize="12sp" diff --git a/app/src/main/res/layout/item_personal_fun_group.xml b/app/src/main/res/layout/item_personal_fun_group.xml index ee298db164..eeeb97c51d 100644 --- a/app/src/main/res/layout/item_personal_fun_group.xml +++ b/app/src/main/res/layout/item_personal_fun_group.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/personal_card_bg" + android:background="@drawable/bg_personal_card" android:orientation="vertical" android:paddingLeft="18dp" android:paddingTop="16dp"