消息

shiku_im.xcodeproj/project.pbxproj

@@ -7846,33 +7846,33 @@
 		B1E0C7A124ADC58C0064BF98 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				B1E0C7A224ADC58C0064BF98 /* redpacket_12.png */,
+				B1E0C7AC24ADC58C0064BF98 /* redpacket_01.png */,
+				B1E0C7AF24ADC58C0064BF98 /* redpacket_02.png */,
+				B1E0C7AE24ADC58C0064BF98 /* redpacket_03.png */,
+				B1E0C7A924ADC58C0064BF98 /* redpacket_04.png */,
+				B1E0C7A624ADC58C0064BF98 /* redpacket_05.png */,
 				B1E0C7A324ADC58C0064BF98 /* redpacket_06.png */,
 				B1E0C7A424ADC58C0064BF98 /* redpacket_07.png */,
-				B1E0C7A524ADC58C0064BF98 /* redpacket_13.png */,
-				B1E0C7A624ADC58C0064BF98 /* redpacket_05.png */,
-				B1E0C7A724ADC58C0064BF98 /* redpacket_11.png */,
+				B1E0C7B924ADC58C0064BF98 /* redpacket_08.png */,
+				B1E0C7B824ADC58C0064BF98 /* redpacket_09.png */,
 				B1E0C7A824ADC58C0064BF98 /* redpacket_10.png */,
-				B1E0C7A924ADC58C0064BF98 /* redpacket_04.png */,
+				B1E0C7A724ADC58C0064BF98 /* redpacket_11.png */,
+				B1E0C7A224ADC58C0064BF98 /* redpacket_12.png */,
+				B1E0C7A524ADC58C0064BF98 /* redpacket_13.png */,
 				B1E0C7AA24ADC58C0064BF98 /* redpacket_14.png */,
 				B1E0C7AB24ADC58C0064BF98 /* redpacket_15.png */,
-				B1E0C7AC24ADC58C0064BF98 /* redpacket_01.png */,
-				B1E0C7AD24ADC58C0064BF98 /* redpacket_17.png */,
-				B1E0C7AE24ADC58C0064BF98 /* redpacket_03.png */,
-				B1E0C7AF24ADC58C0064BF98 /* redpacket_02.png */,
 				B1E0C7B024ADC58C0064BF98 /* redpacket_16.png */,
-				B1E0C7B124ADC58C0064BF98 /* redpacket_27.png */,
-				B1E0C7B224ADC58C0064BF98 /* redpacket_26.png */,
+				B1E0C7AD24ADC58C0064BF98 /* redpacket_17.png */,
 				B1E0C7B324ADC58C0064BF98 /* redpacket_18.png */,
-				B1E0C7B424ADC58C0064BF98 /* redpacket_24.png */,
-				B1E0C7B524ADC58C0064BF98 /* redpacket_25.png */,
 				B1E0C7B624ADC58C0064BF98 /* redpacket_19.png */,
-				B1E0C7B724ADC58C0064BF98 /* redpacket_21.png */,
-				B1E0C7B824ADC58C0064BF98 /* redpacket_09.png */,
-				B1E0C7B924ADC58C0064BF98 /* redpacket_08.png */,
 				B1E0C7BA24ADC58C0064BF98 /* redpacket_20.png */,
+				B1E0C7B724ADC58C0064BF98 /* redpacket_21.png */,
 				B1E0C7BB24ADC58C0064BF98 /* redpacket_22.png */,
 				B1E0C7BC24ADC58C0064BF98 /* redpacket_23.png */,
+				B1E0C7B424ADC58C0064BF98 /* redpacket_24.png */,
+				B1E0C7B524ADC58C0064BF98 /* redpacket_25.png */,
+				B1E0C7B224ADC58C0064BF98 /* redpacket_26.png */,
+				B1E0C7B124ADC58C0064BF98 /* redpacket_27.png */,
 			);
 			path = images;
 			sourceTree = "<group>";
@@ -11586,7 +11586,7 @@
 				INFOPLIST_FILE = share/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 3.0.6;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = app.jixincc.vip.share;
@@ -11638,7 +11638,7 @@
 				INFOPLIST_FILE = share/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 3.0.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = app.jixincc.vip.share;

shiku_im/ClassesNew/classes/messageVc/JXMsgViewController.m

@@ -3021,6 +3021,7 @@
     if ([aDownload.action isEqualToString:act_tigaseGetLastChatList]) {
         [self.header endRefreshing];
         [self getAllChatList];
+        //[self getFriend];
 //        [g_xmpp.roomPool createAll];
     }
         if ([aDownload.action isEqualToString:act_getGroupOneType]) {

shiku_im/Register&Login/inputPhoneVC.m

@@ -956,7 +956,7 @@
     if(_seconds<=0){
         but.selected = NO;
         but.userInteractionEnabled = YES;
-        but.backgroundColor = g_theme.themeColor;
+        but.backgroundColor = [UIColor whiteColor];
         [_send setTitle:Localized(@"JX_SendAngin") forState:UIControlStateNormal];
         if (_timer) {
             _timer = nil;

shiku_im/controller/JXChatViewController.mm

@@ -833,7 +833,7 @@
                 // 发网络请求
               //  [g_server getRroomActivity:_activityModel.id ToView:self];
                //[g_server getRroomActivity:_activityModel.id ToView:self];
-                _isShowRedPackage=0;
+                //_isShowRedPackage=0;
                 long time = (long)[[NSDate date] timeIntervalSince1970];
                 time = time *1000 + g_server.timeDifference;
                 NSString *salt = [NSString stringWithFormat:@"%ld",time];
@@ -2299,10 +2299,13 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
 - (void)notice2ndClick {
     
     
-    JXLabelObject *obj = [JXLabelObject sharedInstance];
-    NSString *selectItem = [obj fetchGroupAnnouncementSelectItemFromLocal];
+    JXLabelObject *obj = [JXLabelObject sharedInstance]; 
+    
+    NSString *selectItemqq = [obj fetchAllGroupAnnouncementFromLocal];
+     
+    
     
-    if (selectItem.length==0) {
+    if (selectItemqq.length==0) {
          
         [g_App showAlert:@"请等待开奖"];
         
@@ -9469,6 +9472,9 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     
     if ([model.roomJid isEqualToString:_roomJid]) {
 
+        NSLog(@"---红包红包---%@",@"--------");
+              
+              
         [self hideKeyboard:NO];
          [self showAdAlertViewImageRedPackage:@"ad_treasureBox.png" linkUrl:nil audio:nil duration:3 content:model showCancelButton:YES type:(DYAdModelTypeGiftOpen) success:NO];
         
@@ -9507,7 +9513,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         return;
     }
     /**/
-    if ([model.roomJid isEqualToString:_roomJid]) {
+//    if ([model.roomJid isEqualToString:_roomJid]) {
         if (model.type == 1) {
             JXLabelObject *obj = [JXLabelObject sharedInstance];
             obj.roomJid = self.roomJid;
@@ -9576,7 +9582,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         if(model.type == 3) {
           //  [self showAdAlertViewImageString:@"ad_treasureBox.png" linkUrl:nil audio:nil duration:0 content:@"恭喜您获得一个宝箱!" showCancelButton:YES type:(DYAdModelTypeGiftOpen) success:NO];
         }
-    }
+//    }
 }
 
 // 群头衔开关控制

shiku_im/model/JXMessageObject.h

@@ -223,6 +223,9 @@ typedef enum {
 @property (nonatomic,strong) NSString*  messageId;//消息标识号，字符串,UUID <message>里
 @property (nonatomic,strong) NSString*  fromId;//发送ID <message>里
 @property (nonatomic,strong) NSString*  toId;//目标ID <message>里
+
+@property (nonatomic,strong) NSString*  msgtype;//目标ID <message>里
+
 //以下字段用于通讯，Body里：
 @property (nonatomic,strong) NSNumber*  type;//消息类型 <body>里
 @property (nonatomic,strong) NSString*  fromUserId;//源

shiku_im/shiku_im-Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>即信</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIcons</key>
@@ -67,7 +67,7 @@
 		<dict/>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20200718</string>
+	<string>20200720</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSApplicationQueriesSchemes</key>

shiku_im/shiku_im-Prefix.pch

@@ -13,10 +13,10 @@
 
 #define APIKEY @"a891a7a6-03af-475c-8ae1-7fb4b230e958"
 
-#define APIURL @"47.57.16.13"
+//#define APIURL @"47.57.16.13"
  
 
-//#define APIURL @"qdzcie.com"
+#define APIURL @"qdzcie.com"
 
 
 //#define APIURL @"https://app.ddz98.vip"