#761 #770

1. 完善牌照房 PK 功能
2. 补充多语言
3. 修复部分跨房 PK 问题

YuMi.xcodeproj/project.pbxproj

@@ -679,7 +679,6 @@
 		E8098CB1282E86EF0090B9F0 /* XPMonentsContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB0282E86EF0090B9F0 /* XPMonentsContentView.m */; };
 		E8098CB4282E97550090B9F0 /* XPMineBlackListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */; };
 		E80A086227F2AC190027B30C /* RoomPKDetailInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */; };
-		E80A086527F318620027B30C /* XPRoomPKPlayingView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A086427F318620027B30C /* XPRoomPKPlayingView.m */; };
 		E80A63DC28B86B9700690914 /* MessageContentMonentsAutoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */; };
 		E80B0712280D0A6700A79F63 /* FansInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0711280D0A6700A79F63 /* FansInfoModel.m */; };
 		E80B0734280D740600A79F63 /* MessageContentGuildView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0733280D740600A79F63 /* MessageContentGuildView.m */; };
@@ -912,7 +911,6 @@
 		E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A6545283519CA00F55894 /* MonentsTopicModel.m */; };
 		E81A654928351B9500F55894 /* XPMonentsRecommendHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */; };
 		E81A654C28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */; };
-		E81AF32527F1D5B8003B9E43 /* XPRoomPKProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */; };
 		E81AF32827F1EE69003B9E43 /* XPRoomPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */; };
 		E81C1B1C27705F6B0020D1E4 /* XPArrangeMicPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1B27705F6B0020D1E4 /* XPArrangeMicPresenter.m */; };
 		E81C1B1F27705F7A0020D1E4 /* XPArrangeMicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1E27705F7A0020D1E4 /* XPArrangeMicViewController.m */; };
@@ -2890,8 +2888,6 @@
 		E8098CB6282E97AC0090B9F0 /* XPMineBlackListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListProtocol.h; sourceTree = "<group>"; };
 		E80A086027F2AC190027B30C /* RoomPKDetailInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKDetailInfoModel.h; sourceTree = "<group>"; };
 		E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKDetailInfoModel.m; sourceTree = "<group>"; };
-		E80A086327F318620027B30C /* XPRoomPKPlayingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPlayingView.h; sourceTree = "<group>"; };
-		E80A086427F318620027B30C /* XPRoomPKPlayingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPlayingView.m; sourceTree = "<group>"; };
 		E80A63DA28B86B9700690914 /* MessageContentMonentsAutoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentMonentsAutoView.h; sourceTree = "<group>"; };
 		E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentMonentsAutoView.m; sourceTree = "<group>"; };
 		E80B0710280D0A6700A79F63 /* FansInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FansInfoModel.h; sourceTree = "<group>"; };
@@ -3188,8 +3184,6 @@
 		E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsRecommendHeaderView.m; sourceTree = "<group>"; };
 		E81A654A28351D9900F55894 /* XPMonentsTopicCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicCollectionViewCell.h; sourceTree = "<group>"; };
 		E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicCollectionViewCell.m; sourceTree = "<group>"; };
-		E81AF32327F1D5B8003B9E43 /* XPRoomPKProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKProgressView.h; sourceTree = "<group>"; };
-		E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKProgressView.m; sourceTree = "<group>"; };
 		E81AF32627F1EE69003B9E43 /* XPRoomPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPanelUserView.h; sourceTree = "<group>"; };
 		E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPanelUserView.m; sourceTree = "<group>"; };
 		E81C1B1927705F4B0020D1E4 /* XPArrangeMicProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicProtocol.h; sourceTree = "<group>"; };
@@ -7094,10 +7088,6 @@
 				E801273F27E323C800BAC3F2 /* XPRoomPKViewController.m */,
 				E8664ED427E434D5000171BA /* XPRoomPKRecordViewController.h */,
 				E8664ED527E434D5000171BA /* XPRoomPKRecordViewController.m */,
-				E81AF32327F1D5B8003B9E43 /* XPRoomPKProgressView.h */,
-				E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */,
-				E80A086327F318620027B30C /* XPRoomPKPlayingView.h */,
-				E80A086427F318620027B30C /* XPRoomPKPlayingView.m */,
 				E84843AD27F59E7E0050D365 /* XPRoomPKResultView.h */,
 				E84843AE27F59E7E0050D365 /* XPRoomPKResultView.m */,
 				545888312C1AFFB500897585 /* XPRoomPKPanelView.h */,
@@ -11724,7 +11714,6 @@
 				23E9EA942A84BE4800B792F2 /* XPGiftUserDataViewController.m in Sources */,
 				2331C16D2A5EB71000E1D940 /* XPNobleSettingNavView.m in Sources */,
 				E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */,
-				E80A086527F318620027B30C /* XPRoomPKPlayingView.m in Sources */,
 				2305F33B2AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.m in Sources */,
 				E8E70D9226F2F60C00F03460 /* XPMineItemModel.m in Sources */,
 				E818DD1F2A48974300F163F7 /* LoginAreaModel.m in Sources */,
@@ -12198,7 +12187,6 @@
 				E81060F42987C6B200B772F0 /* MessageOpenLiveModel.m in Sources */,
 				E8AEAEF027141C430017FCE0 /* XPRoomMenuContainerView.m in Sources */,
 				9B85F3532806AB9A006EDF51 /* XPAnchorPKResultView.m in Sources */,
-				E81AF32527F1D5B8003B9E43 /* XPRoomPKProgressView.m in Sources */,
 				E8DEC99527648FA50078CB70 /* ClientConfig.m in Sources */,
 				9B6E8577281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m in Sources */,
 				E85E7BC22A4EE82300B6D00A /* XPMineListCell.m in Sources */,

YuMi/Assets.xcassets/Language/ar/crossroom_pk_menu_icon_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/pk_top_charms_mark_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/pk_top_momey_mark_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_draw_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_draw_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_win_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/crossroom_pk_menu_icon_en.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/pk_top_charms_mark_en.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/pk_top_momey_mark_en.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_draw_en.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_fail_en.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_win_en.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_draw_en.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_fail_en.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_win_en.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/AcrossRoomPK/room_acroos_pk_focus_end_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/AcrossRoomPK/room_acroos_pk_focus_end_colse_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/AcrossRoomPK/room_across_pk_result_forceend_blue_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/AcrossRoomPK/room_across_pk_result_forceend_pk_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RoomPK/room_pk_result_avatar_bg_gray.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RoomPK/room_pk_result_avatar_bg_purple.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RoomPK/room_pk_result_avatar_bg_yellow.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RoomPK/room_pk_result_team_bg.imageset/Contents.json

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

YuMi/CustomUI/UIImageView/NetImageView.h

@@ -24,11 +24,14 @@ typedef NS_ENUM(NSInteger, NetImageState){
 
 @property (nonatomic, assign, readonly) NetImageState state;
 @property (nonatomic, copy) NSString* imageUrl;
+@property (nonatomic, assign) NSInteger backgroundLightType; // 0: non; 1: gold; 2: gray; 3: purple
 
 - (instancetype)initWithUrl:(NSString * _Nonnull)imageUrl;
 - (instancetype)initWithConfig:(NetImageConfig * _Nullable)config;
 - (instancetype)initWithUrl:(NSString * _Nonnull)imageUrl config:(NetImageConfig * _Nullable)config;
 
+- (UIImage *)lightImage:(NSInteger)type;
+
 - (void)loadImage:(LoadCompletion _Nullable)completion;
 - (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion _Nullable)completion;
 - (void)loadImageWithUrl:(NSString * _Nonnull)imageUrl completion:(LoadCompletion)completion fail:(LoadFail)fail;

YuMi/CustomUI/UIImageView/NetImageView.m

@@ -12,9 +12,9 @@
 @interface NetImageView()
 
 @property (nonatomic, assign, readwrite) NetImageState state;
-@property (nonatomic, copy) NSString * innerConfigedUrl;
-
+@property (nonatomic, copy) NSString * innerConfigUrl;
 @property (nonatomic, strong) NetImageConfig * config;
+@property (nonatomic, strong) UIImageView *lightImageView;
 
 @end
 
@@ -45,13 +45,50 @@
 
 - (void)initImageUrl:(NSString *)imageUrl {
     _imageUrl = imageUrl;
-    _innerConfigedUrl = [UIImageConstant configUrl:_imageUrl type:self.config.imageType radius:self.config.radius];
+    _innerConfigUrl = [UIImageConstant configUrl:_imageUrl type:self.config.imageType radius:self.config.radius];
+}
 
+- (void)setBackgroundLightType:(NSInteger)backgroundLightType {
+    _backgroundLightType = backgroundLightType;
+    if (!_lightImageView) {
+        _lightImageView = [[UIImageView alloc] init];
+        [self insertSubview:_lightImageView atIndex:0];
+        [_lightImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.edges.mas_equalTo(self);
+        }];
+    }
+    switch (_backgroundLightType) {
+        case 1:
+            _lightImageView.image = [UIImage imageNamed:@"room_pk_result_avatar_bg_yellow"];
+            break;
+        case 2:
+            _lightImageView.image = [UIImage imageNamed:@"room_pk_result_avatar_bg_gray"];
+            break;
+        case 3:
+            _lightImageView.image = [UIImage imageNamed:@"room_pk_result_avatar_bg_purple"];
+            break;
+        default:
+            _lightImageView.image = nil;
+            break;
+    }
+}
+
+- (UIImage *)lightImage:(NSInteger)type {
+    switch (type) {
+        case 1:
+            return [UIImage imageNamed:@"room_pk_result_avatar_bg_yellow"];
+        case 2:
+            return [UIImage imageNamed:@"room_pk_result_avatar_bg_gray"];
+        case 3:
+            return [UIImage imageNamed:@"room_pk_result_avatar_bg_purple"];
+        default:
+            return nil;
+    }
 }
 
 - (void)setImageUrl:(NSString *)imageUrl {
     [self initImageUrl:imageUrl];
-    UIImage * image = [[SDImageCache sharedImageCache] imageFromCacheForKey:_innerConfigedUrl];
+    UIImage * image = [[SDImageCache sharedImageCache] imageFromCacheForKey:_innerConfigUrl];
     if (image) {
         self.image = image;
         self.state = NetImageStateLoaded;
@@ -62,7 +99,7 @@
 
 - (void)loadImage:(LoadCompletion)completion {
     self.state = NetImageStateLoading;
-    [self sd_setImageWithURL:[NSURL URLWithString:_innerConfigedUrl] placeholderImage:self.config.placeHolder options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+    [self sd_setImageWithURL:[NSURL URLWithString:_innerConfigUrl] placeholderImage:self.config.placeHolder options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
         if (error) {
             self.state = NetImageStateUnload;
         } else {
@@ -75,7 +112,7 @@
 }
 - (void)loadImage:(LoadCompletion)completion fail:(LoadFail)fail{
     self.state = NetImageStateLoading;
-    [self sd_setImageWithURL:[NSURL URLWithString:_innerConfigedUrl] placeholderImage:self.config.placeHolder options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+    [self sd_setImageWithURL:[NSURL URLWithString:_innerConfigUrl] placeholderImage:self.config.placeHolder options:SDWebImageRetryFailed completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
         if (error) {
             self.state = NetImageStateUnload;
             if (fail){

YuMi/Modules/YMMine/Presenter/XPMinePresent.m

@@ -79,14 +79,14 @@
 - (void)getPersonItemList {
 	NSString * uid = [[AccountInfoStorage instance] getUid];
 	if (!uid.length){
-		[[self getView] onGetMineFuntionItemFail];
+		[[self getView] onGetMineFunctionsItemFail];
 		return;
 	}
 	[Api requestPersonalFunctionItem:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
 		NSArray *array = [XPMineFuntionItemModel modelsWithArray:data.data];
 		[[self getView] onGetMineFuntionItemSuccess:array ];
 	}fail:^(NSInteger code, NSString * _Nullable msg) {
-		[[self getView] onGetMineFuntionItemFail];
+		[[self getView] onGetMineFunctionsItemFail];
 	}] uid:uid];
 }
 ///获取VIP信息

YuMi/Modules/YMMine/Protocol/XPMineProtocol.h

@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///获取个人中心功能
 - (void)onGetMineFuntionItemSuccess:(NSArray<XPMineFuntionItemModel *> *)items ;
 ///获取个人中心功能失败
-- (void)onGetMineFuntionItemFail;
+- (void)onGetMineFunctionsItemFail;
 ///获取个人中心banner
 - (void)onGetPersonalBannerListSuccess:(NSArray<HomeBannerInfoModel *> *)items ;
 ///获取个人中心banner失败

YuMi/Modules/YMMine/View/XPMineViewController.m

@@ -125,8 +125,6 @@ UIKIT_EXTERN NSString *kRequestRicket;
     self.isRefreshRoomInfo = NO;
 	[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventusercenter_recharge_card_show];
 	[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventusercenter_noble_card_show];
-
-    
 }
 
 - (void)viewDidAppear:(BOOL)animated {
@@ -563,8 +561,8 @@ UIKIT_EXTERN NSString *kRequestRicket;
 #endif
     [self.tableView reloadData];
 }
-- (void)onGetMineFuntionItemFail{
-	
+- (void)onGetMineFunctionsItemFail{
+
 }
 ///获取小游戏列表
 - (void)onGetLittleGameListSuccess:(NSArray<LittleGameInfoModel *> *)items {

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m

@@ -23,18 +23,13 @@
 @property (nonatomic, strong) UIButton *closeBtn;
 ///标题
 @property (nonatomic, strong) UILabel *titleLabel;
-///红队背景
-@property (nonatomic, strong) UIImageView *redBgImageView;
 ///红队头像
 @property (nonatomic, strong) NetImageView *redHeadImageView;
 ///红队厅名
 @property (nonatomic, strong) UILabel *redRoomTitleLabel;
 ///红队礼物值
 @property (nonatomic, strong) UILabel *redValueLabel;
-///中间PKicon
-@property (nonatomic, strong) UIImageView *middleImageView;
-///蓝队背景
-@property (nonatomic, strong) UIImageView *blueBgImageView;
+
 ///蓝队赢icon
 @property (nonatomic, strong) UIImageView *blueWinIconView;
 ///蓝队头像
@@ -61,18 +56,13 @@
 	[self addSubview:self.closeBtn];
 	[self addSubview:self.titleLabel];
 	
-	[self addSubview:self.redBgImageView];
 	[self addSubview:self.redHeadImageView];
 	[self addSubview:self.redRoomTitleLabel];
 	[self addSubview:self.redValueLabel];
 	
-	[self addSubview:self.blueBgImageView];
 	[self addSubview:self.blueHeadImageView];
 	[self addSubview:self.blueRoomTitleLabel];
 	[self addSubview:self.blueValueLabel];
-
-	[self addSubview:self.middleImageView];
-
 }
 
 - (void)initConstrations {
@@ -81,63 +71,55 @@
 	}];
 	[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.centerX.mas_equalTo(self);
-		make.top.mas_equalTo(18);
+		make.top.mas_equalTo(26);
 		make.height.mas_equalTo(18);
 	}];
 	[self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.trailing.mas_equalTo(-17);
-		make.width.height.mas_equalTo(22);
-		make.centerY.mas_equalTo(self.titleLabel);
-	}];
-	[self.redBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(55);
-		make.leading.mas_equalTo(17);
-		make.width.mas_equalTo(133);
-		make.height.mas_equalTo(119);
+		make.trailing.mas_equalTo(-22);
+        make.top.mas_equalTo(22);
+		make.width.height.mas_equalTo(33);
 	}];
+
+    UIImageView *pkMark = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_vs_mark_big"]];
+    pkMark.contentMode = UIViewContentModeScaleAspectFit;
+    [self addSubview:pkMark];
+    [pkMark mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self);
+        make.bottom.mas_equalTo(self).offset(-40);
+        make.size.mas_equalTo(CGSizeMake(118, 94));
+    }];
+
 	[self.redHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(75);
-		make.leading.mas_equalTo(54);
-		make.width.height.mas_equalTo(52);
+		make.top.mas_equalTo(70);
+		make.leading.mas_equalTo(12.5);
+		make.width.height.mas_equalTo(68);
 	}];
 	[self.redRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.top.mas_equalTo(self.redHeadImageView.mas_bottom).mas_offset(8);
-		make.centerX.mas_equalTo(self.redHeadImageView);
-		make.height.mas_equalTo(12);
-		make.leading.mas_equalTo(self.redBgImageView.mas_leading).mas_offset(20);
+		make.left.mas_equalTo(self);
+        make.right.mas_equalTo(self.redHeadImageView.mas_right);
+		make.height.mas_equalTo(14);
 	}];
 	[self.redValueLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.centerX.mas_equalTo(self.redHeadImageView);
+		make.centerX.mas_equalTo(self.redRoomTitleLabel);
 		make.top.mas_equalTo(self.redRoomTitleLabel.mas_bottom).offset(6);
-		make.height.mas_equalTo(12);
-		make.leading.mas_equalTo(self.redBgImageView.mas_leading).mas_offset(20);
-	}];
-	[self.middleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(87);
-		make.centerX.mas_equalTo(self);
-		make.width.mas_equalTo(62);
-		make.height.mas_equalTo(43);
-	}];
-	[self.blueBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(61);
-		make.trailing.mas_equalTo(-17);
-		make.width.mas_equalTo(133);
-		make.height.mas_equalTo(119);
+		make.height.mas_equalTo(14);
 	}];
+
+
 	[self.blueHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(81);
-		make.trailing.mas_equalTo(-54);
-		make.width.height.mas_equalTo(52);
+        make.top.mas_equalTo(70);
+		make.trailing.mas_equalTo(-12.5);
+		make.width.height.mas_equalTo(68);
 	}];
 	[self.blueRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.top.mas_equalTo(self.blueHeadImageView.mas_bottom).mas_offset(8);
-		make.centerX.mas_equalTo(self.blueHeadImageView);
-		make.height.mas_equalTo(12);
-		make.leading.mas_equalTo(self.blueBgImageView.mas_leading).mas_offset(16);
+		make.right.mas_equalTo(self);
+		make.height.mas_equalTo(14);
+        make.left.mas_equalTo(self.blueHeadImageView.mas_left);
 	}];
 	[self.blueValueLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.centerX.mas_equalTo(self.blueHeadImageView);
-		make.leading.mas_equalTo(self.blueBgImageView.mas_leading).mas_offset(16);
+		make.centerX.mas_equalTo(self.blueRoomTitleLabel);
 		make.top.mas_equalTo(self.blueRoomTitleLabel.mas_bottom).offset(6);
 		make.height.mas_equalTo(12);
 	}];
@@ -162,7 +144,7 @@
 - (UIImageView *)bgImageView {
 	if (!_bgImageView) {
 		_bgImageView = [[UIImageView alloc] init];
-		_bgImageView.image = [UIImage imageNamed:@"room_across_pk_result_forcednd_bg"];
+		_bgImageView.image = [UIImage imageNamed:@"room_acroos_pk_focus_end_bg"];
 	}
 	return _bgImageView;
 }
@@ -171,26 +153,18 @@
 	if (!_closeBtn) {
 		_closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
 		[_closeBtn addTarget:self action:@selector(onCloseBtnClick:) forControlEvents:UIControlEventTouchUpInside];
-		[_closeBtn setImage:[UIImage imageNamed:@"room_across_pk_invite_result_close"] forState:UIControlStateNormal];
+		[_closeBtn setImage:[UIImage imageNamed:@"room_acroos_pk_focus_end_colse_icon"] forState:UIControlStateNormal];
 	}
 	return _closeBtn;
 }
 
-- (UIImageView *)redBgImageView {
-	if (!_redBgImageView) {
-		_redBgImageView = [[UIImageView alloc] init];
-		_redBgImageView.image = [UIImage imageNamed:@"room_across_pk_result_forceend_red_bg"];
-	}
-	return _redBgImageView;
-}
-
 - (NetImageView *)redHeadImageView {
 	if (!_redHeadImageView) {
 		NetImageConfig * config = [[NetImageConfig alloc]init];
 		config.imageType = ImageTypeUserIcon;
 		config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
 		_redHeadImageView = [[NetImageView alloc] initWithConfig:config];
-		_redHeadImageView.layer.cornerRadius = 26;
+		_redHeadImageView.layer.cornerRadius = 34;
 		_redHeadImageView.layer.masksToBounds = YES;
 		_redHeadImageView.layer.borderWidth = 1;
 		_redHeadImageView.layer.borderColor = [UIColor whiteColor].CGColor;
@@ -217,29 +191,13 @@
 	return _redValueLabel;
 }
 
-- (UIImageView *)middleImageView {
-	if (!_middleImageView) {
-		_middleImageView = [[UIImageView alloc] init];
-		_middleImageView.image = [UIImage imageNamed:@"room_across_pk_result_forceend_pk_icon"];
-	}
-	return _middleImageView;
-}
-
-- (UIImageView *)blueBgImageView {
-	if (!_blueBgImageView) {
-		_blueBgImageView = [[UIImageView alloc] init];
-		_blueBgImageView.image = [UIImage imageNamed:@"room_across_pk_result_forceend_blue_bg"];
-	}
-	return _blueBgImageView;
-}
-
 - (NetImageView *)blueHeadImageView {
 	if (!_blueHeadImageView) {
 		NetImageConfig * config = [[NetImageConfig alloc]init];
 		config.imageType = ImageTypeUserIcon;
 		config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
 		_blueHeadImageView = [[NetImageView alloc] initWithConfig:config];
-		_blueHeadImageView.layer.cornerRadius = 26;
+		_blueHeadImageView.layer.cornerRadius = 34;
 		_blueHeadImageView.layer.masksToBounds = YES;
 		_blueHeadImageView.layer.borderWidth = 1;
 		_blueHeadImageView.layer.borderColor = [UIColor whiteColor].CGColor;

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///送礼物
 - (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view sendGiftToUser:(NSString *)uid;
 ///去房间
-- (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view onlookRoom:(NSString *)roomUid;
+- (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view onLookRoom:(NSString *)roomUid;
 
 @end
 

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m

@@ -308,7 +308,7 @@ static CGFloat MiniHeight = 130.5;
         make.leading.trailing.mas_equalTo(self);
     }];
 
-    UIImageView *charmTitleMark = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_top_charms_mark"]];
+    UIImageView *charmTitleMark = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"pk_top_charms_mark"]];
     charmTitleMark.contentMode = UIViewContentModeScaleAspectFill ;
     [self.userStackView addArrangedSubview:charmTitleMark];
     [charmTitleMark mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -326,8 +326,8 @@ static CGFloat MiniHeight = 130.5;
         make.width.mas_equalTo(self.blueCharmStackView);
     }];
 
-    UIImageView *moneyTitleMark = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_top_momey_mark"]];
-    moneyTitleMark.contentMode = UIViewContentModeScaleAspectFit;
+    UIImageView *moneyTitleMark = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"pk_top_momey_mark"]];
+    moneyTitleMark.contentMode = UIViewContentModeScaleAspectFill;
     [self.userStackView addArrangedSubview:moneyTitleMark];
     [moneyTitleMark mas_makeConstraints:^(MASConstraintMaker *make) {
         make.size.mas_equalTo(CGSizeMake(145, 16));
@@ -351,16 +351,17 @@ static CGFloat MiniHeight = 130.5;
     [self addSubview:self.ruleBgImageView];
     [self.ruleBgImageView addSubview:self.ruleTextView];
 
+    [self.ruleTextView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.ruleBgImageView).insets(UIEdgeInsetsMake(4, 4, 4, 4));
+    }];
     [self.ruleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.trailing.mas_equalTo(-8);
         make.top.mas_equalTo(30);
-        make.width.mas_equalTo(209);
-        make.height.mas_equalTo(175);
+        make.width.lessThanOrEqualTo(@210);
+        make.width.equalTo(self.ruleTextView.mas_width).offset(20).priorityLow();
+        make.height.equalTo(self.ruleTextView.mas_height).offset(20);
     }];
 
-    [self.ruleTextView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.mas_equalTo(self.ruleBgImageView);
-    }];
 }
 
 - (void)initSubViews {
@@ -519,8 +520,8 @@ static CGFloat MiniHeight = 130.5;
 }
 
 - (void)onlookButtonAction:(UIButton *)sender {
-	if (self.delegate && [self.delegate respondsToSelector:@selector(XPAcrossRoomPKPanelView:onlookRoom:)]) {
-		[self.delegate XPAcrossRoomPKPanelView:self onlookRoom:self.pkPanelInfo.aUid];
+	if (self.delegate && [self.delegate respondsToSelector:@selector(XPAcrossRoomPKPanelView:onLookRoomonLookRoom:)]) {
+		[self.delegate XPAcrossRoomPKPanelView:self onLookRoom:self.pkPanelInfo.aUid];
 	}
 }
 
@@ -748,6 +749,7 @@ static CGFloat MiniHeight = 130.5;
 		_ruleTextView.backgroundColor = [UIColor clearColor];
 		_ruleTextView.textColor = [UIColor whiteColor];
 		_ruleTextView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium];
+        _ruleTextView.scrollEnabled = NO;
 		_ruleTextView.text = YMLocalizedString(@"XPAcrossRoomPKPanelView1");
 	}
 	return _ruleTextView;

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m

@@ -64,7 +64,7 @@
 - (instancetype)initWithFrame:(CGRect)frame {
 	if (self = [super initWithFrame:frame]) {
 		[self initView];
-		[self initConstrations];
+		[self layoutViews];
 	}
 	return self;
 }
@@ -94,7 +94,7 @@
 	[self addSubview:self.charmValue];
 }
 
-- (void)initConstrations {
+- (void)layoutViews {
 	[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.edges.mas_equalTo(self);
 	}];
@@ -191,11 +191,11 @@
 
 - (void)setData:(AcrossRoomPKPanelModel *)data {
 	if (data.winUid == data.cUid) {//赢
-        self.topStateImageView.image = [UIImage imageNamed:@"room_across_pk_result_top_win"];
+        self.topStateImageView.image = [UIImage getLanguageImage:@"room_across_pk_result_top_win"];
 	} else if (data.winUid == data.aUid) {//输
-        self.topStateImageView.image = [UIImage imageNamed:@"room_across_pk_result_top_fail"];
+        self.topStateImageView.image = [UIImage getLanguageImage:@"room_across_pk_result_top_fail"];
 	} else {//平局
-        self.topStateImageView.image = [UIImage imageNamed:@"room_across_pk_result_top_draw"];
+        self.topStateImageView.image = [UIImage getLanguageImage:@"room_across_pk_result_top_draw"];
 	}
 	self.redHeadImageView.imageUrl = data.cAvatar;
 	self.blueHeadImageView.imageUrl = data.aAvatar;

YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m

@@ -69,7 +69,7 @@
 //平台ID
 @property (nonatomic, strong) UILabel *idLabel;
 ///取消选择房间
-@property (nonatomic, strong) UIButton *cancelButon;
+@property (nonatomic, strong) UIButton *cancelButton;
 ///选中的PK房间
 @property (nonatomic, strong) AcrossRoomPKInfoModel *selectRoomInfo;
 ///PK的时长
@@ -142,7 +142,7 @@
 	[self.selectRoomContentView addSubview:self.avatarImageView];
 	[self.selectRoomContentView addSubview:self.roomTitleLabel];
 	[self.selectRoomContentView addSubview:self.idLabel];
-	[self.selectRoomContentView addSubview:self.cancelButon];
+	[self.selectRoomContentView addSubview:self.cancelButton];
 }
 
 - (void)initSubViewConstraints {
@@ -226,14 +226,14 @@
 	[self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3);
 		make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6);
-		make.trailing.mas_lessThanOrEqualTo(self.cancelButon.mas_leading);
+		make.trailing.mas_lessThanOrEqualTo(self.cancelButton.mas_leading);
 	}];
 	[self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.top.mas_equalTo(self.avatarImageView.mas_centerY).mas_offset(3);
 		make.leading.trailing.mas_equalTo(self.roomTitleLabel);
 	}];
 	
-	[self.cancelButon mas_makeConstraints:^(MASConstraintMaker *make) {
+	[self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.centerY.mas_equalTo(self.avatarImageView);
 		make.trailing.mas_equalTo(self.selectRoomContentView).offset(-12);
 		make.height.width.mas_equalTo(22);
@@ -241,7 +241,7 @@
 }
 
 - (void)updateDoneButtonState {
-	if (self.selectRoomInfo && self.pkDuration >= 5 && self.pkDuration <= 180) {
+	if (self.selectRoomInfo && self.pkDuration >= 0 && self.pkDuration <= 180) {
 		self.doneButton.enabled = YES;
 	} else {
 		self.doneButton.enabled = NO;
@@ -294,7 +294,7 @@
 		if (count > 180) {
 			[self showErrorToast:YMLocalizedString(@"XPAcrossRoomPKViewController2")];
 		} 
-        else if(count < 5) {
+        else if(count < -5) {
 			[self showErrorToast:YMLocalizedString(@"XPAcrossRoomPKViewController3")];
 		}
 		self.pkDuration = textField.text.integerValue;
@@ -630,13 +630,13 @@
 	return _idLabel;
 }
 
-- (UIButton *)cancelButon {
-	if (!_cancelButon) {
-		_cancelButon = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_cancelButon setImage:[UIImage imageNamed:@"room_across_delete_pk_room"] forState:UIControlStateNormal];
-		[_cancelButon addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+- (UIButton *)cancelButton {
+	if (!_cancelButton) {
+		_cancelButton = [UIButton buttonWithType:UIButtonTypeCustom];
+		[_cancelButton setImage:[UIImage imageNamed:@"room_across_delete_pk_room"] forState:UIControlStateNormal];
+		[_cancelButton addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside];
 	}
-	return _cancelButon;
+	return _cancelButton;
 }
 
 - (UIView *)contentView {

YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m

@@ -229,7 +229,7 @@
 }
 
 - (void)updateDoneButtonState {
-    if (self.selectRoomInfo && self.pkDuration >= 5 && self.pkDuration <= 30) {
+    if (self.selectRoomInfo && self.pkDuration >= 0 && self.pkDuration <= 30) {
         self.doneButton.enabled = YES;
     } else {
         self.doneButton.enabled = NO;
@@ -286,7 +286,7 @@
             [self showErrorToast:YMLocalizedString(@"XPAnchorPKViewController2")];
             textField.text = @"30";
         }
-        else if(count < 5) {
+        else if(count < -5) {
             [self showErrorToast:YMLocalizedString(@"XPAnchorPKViewController3")];
         }
         self.pkDuration = textField.text.integerValue;