Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求

DevelopmentPods/FUSBDAlphaPlayer/FUSBDAlphaPlayer/Classes/BDAlphaPlayerMetalView.m

@@ -204,7 +204,11 @@
         self.mtkView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
         self.mtkView.backgroundColor = UIColor.clearColor;
         self.mtkView.device = MTLCreateSystemDefaultDevice();
-        self.mtkView.colorPixelFormat = MTLPixelFormatRGBA8Unorm;
+        if (@available(iOS 15.0, *)) {
+            self.mtkView.colorPixelFormat = MTLPixelFormatRGBA8Unorm;
+        } else {
+            self.mtkView.colorPixelFormat = MTLPixelFormatBGRA8Unorm;
+        }
         [self addSubview:self.mtkView];
         
         self.metalRenderer = [[BDAlphaPlayerMetalRenderer alloc] initWithMetalKitView:self.mtkView];

DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Live/icon_head_default.imageset/Contents.json

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

DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/common_push_notice_img.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "img_v3_02cc_270ad30c-82e4-4468-8cb2-b32354ce3a3g.png",
+      "filename" : "push_small.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/icon_head_default.imageset/Contents.json

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

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/com_no_data_empty.imageset/Contents.json

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

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/common_empty_default_300_300.imageset/Contents.json

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

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/fus_common_navi_title_logo.imageset/Contents.json

@@ -5,12 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ic_setting_logo.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "ic_setting_logo 1.png",
+      "filename" : "ic_setting_logo.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/home_list_default_cover.imageset/Contents.json

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

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/icon_boy_default.imageset/Contents.json

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

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/icon_head_default.imageset/Contents.json

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

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/BaoFang/BaoFang_banner_holder.imageset/Contents.json

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

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/BaoFang/BaoFang_icon_live_off.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "live有点 大.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/BaoFang/BaoFang_icon_live_on.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "live 无点大.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/BaoFang/BaoFang_recommended_title_bg_big.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "未标题-1(5).png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/BaoFang/BaoFang_recommended_title_bg_small.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "未标题-1(5).png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/BaoFang/BaoFang_warning_divide.imageset/Contents.json

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

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/BaoFang/baofang_bg_image.imageset/Contents.json

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

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/BaoFang/baofang_broadcast_bg_img.imageset/Contents.json

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

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/PK/PK_Anchor_List_Placeholder.imageset/Contents.json

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

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/PK/PK_Record_Placeholder.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "icon_default_gift.png",
+      "filename" : "icon_empty_view.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/PK/PK_Video_Connect_faiure.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "icon_default_gift.png",
+      "filename" : "icon_empty_view.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/live_official_prohibit_icon.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "禁播logo@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "禁播logo@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}