Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebView.m

@@ -82,6 +82,7 @@
     _userContentController = [[WKUserContentController alloc] init];
     _config = [[WKWebViewConfiguration alloc] init];
     _config.userContentController = _userContentController;
+    _config.defaultWebpagePreferences.preferredContentMode = WKContentModeMobile;
     
     _wkWebView = [[WKWebView alloc] initWithFrame:self.bounds configuration:_config];
     _wkWebView.navigationDelegate = self;
@@ -98,6 +99,7 @@
     
     //web背景透明
     self.wkWebView.backgroundColor = [UIColor clearColor];
+    self.wkWebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     self.wkWebView.opaque = NO;
     
     self.progresslayer = [[CALayer alloc]init];

FuSiLive/Assets.xcassets/FireFlyZone/3.7.0/icon_taskCenter_firefly.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "萤火@2x.png",
       "idiom" : "universal",
-      "filename" : "大萤火icon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "萤火@3x.png",
       "idiom" : "universal",
-      "filename" : "大萤火icon@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/FireFlyZone/fireFly_my_zone_fire.imageset/Contents.json

@@ -5,17 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "萤火@2x.png",
       "idiom" : "universal",
-      "filename" : "榜单-萤火icon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "萤火@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/FireFlyZone/fireFly_zone_fire.imageset/Contents.json

@@ -5,17 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "萤火@2x.png",
       "idiom" : "universal",
-      "filename" : "我的-个人空间-收获萤火icon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "萤火@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/FireFlyZone/fireFly_zone_fireCount_fire.imageset/Contents.json

@@ -5,17 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "萤火@2x.png",
       "idiom" : "universal",
-      "filename" : "我的-收获萤火榜-列表-萤火icon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "萤火@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/IMMessage/chat_im_single_live_record_fire_icon.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "萤火@2x.png",
       "idiom" : "universal",
-      "filename" : "chat_im_single_live_record_fire_icon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "萤火@3x.png",
       "idiom" : "universal",
-      "filename" : "消息-单播通话记录螢火icon-最小@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/Live/live_coin_bg_view.imageset/Contents.json

@@ -5,17 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "萤火@2x.png",
       "idiom" : "universal",
-      "filename" : "1_00018.png",
       "scale" : "2x"
     },
     {
+      "filename" : "萤火@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/Contents.json

 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_1.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_0.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_1@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_0@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_10.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_1.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_10@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_11.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_10.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_11@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_10@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_12.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_11.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_12@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_11@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_13.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_12.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_13@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_12@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_14.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_13.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_14@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_13@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_15.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_14.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_15@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_14@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_16.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_15.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_16@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_15@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_17.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_16.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_17@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_16@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_18.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_17.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_18@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_17@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_2.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_18.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_2@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_18@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_3.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_19.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_3@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_19@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_4.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_2.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_4@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_5.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_20.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_5@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_20@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_6.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_21.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_6@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_21@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_7.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_22.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_7@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_22@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_8.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_23.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_8@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_23@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_9.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_24.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "live_coin_bg_view_9@2x.png",
+      "filename" : "live_gift_effect_firstSend_animate_24@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

FuSiLive/Assets.xcassets/Live/live_coin_bg_view/live_coin_bg_view_0.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_25.imageset/Contents.json

@@ -5,8 +5,8 @@
       "scale" : "1x"
     },
     {
+      "filename" : "live_gift_effect_firstSend_animate_25@2x.png",
       "idiom" : "universal",
-      "filename" : "live_coin_bg_view_0@2x.png",
       "scale" : "2x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_26.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_gift_effect_firstSend_animate_26@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_27.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_gift_effect_firstSend_animate_27@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_28.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_gift_effect_firstSend_animate_28@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_29.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_gift_effect_firstSend_animate_29@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_3.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_gift_effect_firstSend_animate_3@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_30.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_gift_effect_firstSend_animate_30@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_31.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_gift_effect_firstSend_animate_31@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FuSiLive/Assets.xcassets/Live/live_gift_effect_firstSend_animate/live_gift_effect_firstSend_animate_32.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "live_gift_effect_firstSend_animate_32@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}