From 5219165ac30824a7b75c5f356af1b27202a9165e Mon Sep 17 00:00:00 2001 From: chenshuanglin <1273934588@qq.com> Date: Fri, 17 Mar 2023 17:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E6=88=BF=E6=AC=A2=E8=BF=8ETA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents.json | 22 +++++++++ .../room_enter_greeting@2x.png | Bin 0 -> 1975 bytes .../room_enter_greeting@3x.png | Bin 0 -> 3869 bytes xplan-ios/Main/Room/Api/Api+Room.h | 6 +++ xplan-ios/Main/Room/Api/Api+Room.m | 8 +++ .../Tool/XPRoomMessageParser.m | 46 ++++++++++++++++++ 6 files changed, 82 insertions(+) create mode 100644 xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/room_enter_greeting@2x.png create mode 100644 xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/room_enter_greeting@3x.png diff --git a/xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/Contents.json b/xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/Contents.json new file mode 100644 index 00000000..332e07e2 --- /dev/null +++ b/xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_enter_greeting@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_enter_greeting@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/room_enter_greeting@2x.png b/xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/room_enter_greeting@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d3b6c4a1e78064c44eaae5e4807e20422212c5a9 GIT binary patch literal 1975 zcmV;o2T1sdP)#gR)nbi;wz|Df!Bgk7=oN!k7kTVnGIY-qm1x>)-L zt77H5vit*<#Ntm_5c9v3x!*7=X8ypm<}XZn;lKFjhl(f%lu{6iq7YK@VaSPW1TvZ^ zq(v$QNlhFQBA$SlCJ9jyNu3i;O~jaBdO#o@BUX4XbWioPW6N%&Z5h(CUJ7W6hE1v4 zd4b^}tPn~=P?NbLkR9U78-?yM4h(KO1ZreAj z?Y6Zb4C^Hh-4&jqOxI;*hS+6hW(qU8%$US3Gcz+YGt->;*QjfvWx1AAmwoYxvU7a& zc{+PETQMSmjXmj=o3r$%lva)6;$4bw3c5Yz;BDb9;QRW>D9=y__%nYCf#s6 zk}(tk8!Oq>hC+Ib#K*;h#=c>UQ5tNNEKV<(RVilTZ(SgIc#~+(U}xg6Q96)UvtLz3^qb;)v}aTg#^1h@@xeg2_@q8WJAy=S%rWbi z6BW%S+8z?Ntx@u4{(RyaB|M|X-ODltz(&ZfT+HGrs`w=Xh*pm!S~X5sX|iIxkls|q zL(ua_&Qr~bw9@ib{KiytfD*F=GI1SbC+(knTwQo%6W4$SfZ(;+IX3b42}8K3+0WS7iT)n&_w^>efqxZ)HbBL{InBIR@g8&hxjphfv|td# zBgM%1z7k=tLYI%p&yH-4T-BuXM5^&FK5~v%c}{bDYO0Kf{L`o9cy+Ni@eO_NseZS= z4a%w5j>VHJ@rd-S##Zr<%!w3}Ye}-E8I+Sb36f%xS|Z1beEfWEp|f)GM~g>l!T2JU zonI)&ckXx;kEr*xWARlAA>LK0!3RIOA@U(Uvk9&t-9WrX`-XfGe`b%ILq5c#%*1)7 zU&W)8TrioLLNuS5$4qMX9T`28p&@4FVC z-3SpcAAW8((eaIDejkX4mkD;>;BfIsHR}q@8`*0W9|{odE@6WB5`Gr(I;rLtsCbl< zxQ590_46YB0mQ#?Ek2o<)kVub?2%sVTL$_dg*raVPqcLjO3BDAgI&R&LwuS!slIs~ z_5g((FTu9NgLwa2h=0qFhpGk-P z;x+2S#BVnvLsAkZSMTESZD|X@+FT@yU96ao@s_`9w_<%?8 z+CJEn2dVnxs^XFRHQKS?TjEZ9&WP|Ey?+Z0G8Mll6MJPr_ScKQb6dtNUKF`WmRG2g ztjluJ+XEEDA2iD>l$Lma+L)(JF^Jb_M^%G~RZ2*FL0Nux5&!ft(S;L48?ts%B}T}>z2XhTumK;F4`8pa*XKg9*9Rd zss9SlB!l>(6ghuzlYgg`z4#UB`g`a~YCqn=h$`@;0;H8hJu!&Au)vD%e+8^TLBZ~is*R+|cj1diNoP$41 zNUheM#Rn*<#sTvW6W;xS;@`3K`_!t_0VcrWJ5Z}G|1pMB{s%Go*S|vuIvfB1002ov JPDHLkV1ja^-If3V literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/room_enter_greeting@3x.png b/xplan-ios/Assets.xcassets/Room/RedPacket/room_enter_greeting.imageset/room_enter_greeting@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..bd3b0f9a32e8deb0964fff57ad94c41b349bfe2a GIT binary patch literal 3869 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 f%sda%pDg$P@o&Y1S1H{i00000NkvXXu0mjfY2 0) { + /// 发动欢迎消息 + UserInfoModel * userInfo = [self.hostDelegate getUserInfo]; + XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; + extModel.defUser = userInfo.defUser; + extModel.erbanNo = userInfo.erbanNo; + extModel.carName = userInfo.carName; + extModel.inRoomNameplatePic = userInfo.nameplatePic; + extModel.inRoomNameplateWord = userInfo.nameplateWord; + extModel.charmUrl = userInfo.userLevelVo.charmUrl; + extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq; + extModel.experUrl = userInfo.userLevelVo.experUrl; + extModel.newUser = userInfo.newUser; + extModel.vipIcon = userInfo.userVipInfoVO.vipIcon; + extModel.androidBubbleUrl = userInfo.androidBubbleUrl; + extModel.iosBubbleUrl = userInfo.iosBubbleUrl; + extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; + + NIMMessage * message = [[NIMMessage alloc] init]; + message.text = msg; + NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[AccountInfoStorage instance].getUid]; + message.remoteExt = remoteExt; + NSString *sessionId = [NSString stringWithFormat:@"%ld", [self.hostDelegate getRoomInfo].roomId]; + //构造会话 + NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; + [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { + }]; + } + } + } uid:uid toUid:toUid]; + }]; + } messageInfo.content = attribute; return messageInfo; }