修复bug

YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_msg_inValid_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/RedPacket/pi_red_packet_msg_valid_bg.imageset/Contents.json

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

YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m

@@ -110,7 +110,7 @@
         self.titleLabel.text = YMLocalizedString(@"MessageContentRedPacketView0");
         self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView1");
         self.subLabel.hidden = YES;
-        self.bgImageView.image = [UIImage imageNamed:@"redPacket_msg_inValid_bg"];
+        self.bgImageView.image = [UIImage imageNamed:@"pi_red_packet_msg_inValid_bg"];
         self.bgImageView.userInteractionEnabled = NO;
     } else {
         NSArray *redPacketHistory = [[NSUserDefaults standardUserDefaults] objectForKey:kRedPacketHistory];
@@ -118,14 +118,14 @@
             if ([redPacketHistory containsObject:info.redEnvelopeId]) {
                 self.subLabel.hidden = YES;
                 self.titleLabel.text = YMLocalizedString(@"MessageContentRedPacketView2");
-                self.bgImageView.image = [UIImage imageNamed:@"redPacket_msg_inValid_bg"];
+                self.bgImageView.image = [UIImage imageNamed:@"pi_red_packet_msg_inValid_bg"];
                 self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView3");
                 self.bgImageView.userInteractionEnabled = NO;
             } else {
                 self.titleLabel.text = info.sendUserNick;
                 self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView4");
                 self.subLabel.hidden = NO;
-                self.bgImageView.image = [UIImage imageNamed:@"redPacket_msg_valid_bg"];
+                self.bgImageView.image = [UIImage imageNamed:@"pi_red_packet_msg_valid_bg"];
                 self.bgImageView.userInteractionEnabled = YES;
                 [self.titleLabel mas_updateConstraints:^(MASConstraintMaker *make) {
                     make.top.mas_equalTo(self.redPacketImageView).mas_offset(5);
@@ -147,7 +147,7 @@
         }
     }];
     dispatch_after(1.0, dispatch_get_main_queue(), ^{
-        [XPRoomViewController openRoom:self.messageInfo.roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC];
+        [XPRoomViewController openRoom:self.messageInfo.roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC redEnvelopeId:self.messageInfo.redEnvelopeId];
     });
 }
 

YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.m

@@ -15,8 +15,9 @@
 	if (self = [super initWithMessage:message]) {
 		self.messageType = SessionMessageType_Custom;
 		NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
-		AttachmentModel * attach = obj.attachment;
+		AttachmentModel * attach = (AttachmentModel *)obj.attachment;
 		XPReceiveRedPacketModel * info = [XPReceiveRedPacketModel modelWithJSON:attach.data];
+        info.redEnvelopeId = attach.data[@"redEnvelopeId"];
 		self.redInfo = info;
 		self.contentSize = CGSizeMake(260, 95);
 		self.height = (95 + CONTENT_PADDING_V_TOTAL);