From 9f12705a8b1b2662cc408b7c2012200643381b50 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Wed, 10 Jan 2024 18:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E6=AD=A4commit=E7=BD=AE=E9=A1=B6=202.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi.xcodeproj/project.pbxproj | 4 ++-- .../Contents.json | 3 +-- .../pi_room_menu_bottom_send_bg.png | Bin 0 -> 3257 bytes .../room_menu_send_bg@2x.png | Bin 715 -> 0 bytes .../room_menu_send_bg@3x.png | Bin 1134 -> 0 bytes YuMi/CustomUI/ShareView/XPShareView.m | 12 +++++------- YuMi/Global/YUMIMacroUitls.h | 2 +- .../MenuContainerView/XPRoomMenuContainerView.m | 2 +- YuMi/Modules/YMRoom/View/XPRoomViewController.m | 5 +++-- YuMi/zh-Hans.lproj/Localizable.strings | 12 ++++++------ 10 files changed, 19 insertions(+), 21 deletions(-) rename YuMi/Assets.xcassets/yna/Menu/{room_menu_send_bg.imageset => pi_room_menu_bottom_send_bg.imageset}/Contents.json (74%) create mode 100644 YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png delete mode 100644 YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@3x.png diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 77de5594..d3df5db3 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -12217,7 +12217,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.7; + MARKETING_VERSION = 20.20.8; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -12253,7 +12253,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.7; + MARKETING_VERSION = 20.20.8; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json similarity index 74% rename from YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/Contents.json rename to YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json index c4a46974..72f73640 100644 --- a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/Contents.json +++ b/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json @@ -1,16 +1,15 @@ { "images" : [ { + "filename" : "pi_room_menu_bottom_send_bg.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "room_menu_send_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "room_menu_send_bg@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png b/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..e0a2831b278c4e6cd7374d2be0abace3b982a534 GIT binary patch literal 3257 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 literal 0 HcmV?d00001 diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@2x.png deleted file mode 100644 index 32dfa82e45b693e13980565a283cba060a575a30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 715 zcmV;+0yO=JP)IK70000dP)t-sM*j7k zu>Xp}{fyZEdHwZU=Jj#Y^#A|>f$slZ{{B|}^Ire|X8ZY_JsY3^000eiQchDE8X6iJ z8X5o^4HXCy7iQb;0006;NklI6$Q+ zgk7`90V-KSEF)EP9VrK(QsGvlamr6^QxiP-2Y7Yo=i4(wNl)3^$D-4`(cO)vxzhcr z)$&n^F0}uu`$+237tq6CKJ;GO_~}#O;@{4dR!ZP&3Z%(Ti=yMBK!4-MWJ>D%tZ1~c z^C1@>sx|(n!M7I3VE`0d@~iyB*A19o<--7*!ahG0!ohbNY+3;RLGhghavK26z<&`v zzGuRqqvEUMi^wRDhr##*)Kg%~;u#W+<;jaaLfH`3_Y53bSK4(uDO&fkGI_3Nc3lhqN z@G!t-a80Rz1{>fun4TTy_cLHeYaHKhu$KW7s&IZ0fzNft(N;k0Zx~JK0DQ!suo;#8 z^Rp)`0N*oV@h^PQ7k|PuK7Yah_kY9OeEuu0VAL*CCqKW zl&Vn;4sk!@2N)AJ!TT~w6S1RIK>TgGq)hXd*Wj9x(s6zt0|N9{3E?bL8}z;JoD^&O`EPk(&)@F`bXEWW002ovPDHLkV1gB=S&aYy diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_send_bg.imageset/room_menu_send_bg@3x.png deleted file mode 100644 index 7c290c645e8e84e60f131e1d02b564ea0b34accd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1134 zcmV-!1d;oRP)W+O(RL9G1>ysXo^w3cgqir;u%rq46dx7Fsy%r|f5 z{gE0`WjDW{H#KPJXiN2ngX4`(UT<_!OA*~Izl^9-%5!u7B1w{04W6Ne=UM&bxK_>c z20SM9mpRY#IazDR`aJzVo-<`8DjA+^QNcW1pdsafoOr0_R-WJ$5aHnreEZW#%a~csN7z2I373 zl_s8v*7}gFk4Hm8v4JO>f`=Y3FA))%Q=SicrKBMVPc86Rm2dN8y3!$U=p(tIsiJM3 z0z7+;h~Qx@4W6<7CkF$uJiLLR-b0>i!n3C<_2RJ$ls9=Y4IYVsoUc?U0uPqQH3IQG zd<4P*foG~UXCTKb)tzSso(XVd8zwNciosK8c72Av-iT0H@xaaC@nImIC#ra`UDk*= zlqMNGPh9cfbjc#3+|VkocyPL8hL#)Xe9be~O$pzK5}w|g=M*elMC1)5G4zv)2d7kBI$dzSDuSON@L_z~j1M)_gG2%!Y+5 zL`Srqz$ZN(uhbdpEkyh3?Yi)ks7D33;`t3jy)Nh*(OR#|v_Av!hNksQ#?XO!yQuee z$j~MF1#Cq0JuZcQfpdiRH5|~R{U&+VT+986KSw{#tia=2Ir^1U;fDia($Do-2I37A z8T;Ms^>$0cJV1-Bx!5!>0SU*Y+<9gV9zl{J9N#j}lVnmu%dgak%p*zOtn#cmH_dAa zT64mzxo4PXYqOJ4l6k+thCZ{*`@unN^>%Z^yl9JMm$`ACHf$%uHcwlL?ey$7OC@He z^Vr;md8s4Pd2FkN{AbOVyXX1$+?wOFRP#JPfTkf^bIkt^@KC_{zd856%r`+qbndM5 z%g6jr6s9$&)O+jyL{Rqio*S^0&;Q*mKaQx