Prechádzať zdrojové kódy

修改了聊天 删掉了 movie。mp3

曾 伟 5 rokov pred
rodič
commit
e785ce7f90

+ 0 - 4
shiku_im.xcodeproj/project.pbxproj

@@ -989,7 +989,6 @@
 		9D8C4EAD249CBFFA0036229A /* JXViplevel8.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D8C4EAC249CBFFA0036229A /* JXViplevel8.m */; };
 		9D8C4EB1249CC0F50036229A /* JXtopShowVIew.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D8C4EAF249CC0F40036229A /* JXtopShowVIew.xib */; };
 		9D8C4EB2249CC0F50036229A /* JXtopShowVIew.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D8C4EB0249CC0F50036229A /* JXtopShowVIew.m */; };
-		9D8C4ED1249CD6B20036229A /* movie.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9D8C4ED0249CD6B20036229A /* movie.mp3 */; };
 		9D93213E249863A7007E1D9D /* README.markdown in Resources */ = {isa = PBXBuildFile; fileRef = 9D932129249863A6007E1D9D /* README.markdown */; };
 		9D93213F249863A7007E1D9D /* DDXMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D93212D249863A6007E1D9D /* DDXMLElement.m */; };
 		9D932140249863A7007E1D9D /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D932131249863A6007E1D9D /* DDXMLElementAdditions.m */; };
@@ -3508,7 +3507,6 @@
 		9D8C4EAE249CC0F40036229A /* JXtopShowVIew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JXtopShowVIew.h; sourceTree = "<group>"; };
 		9D8C4EAF249CC0F40036229A /* JXtopShowVIew.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = JXtopShowVIew.xib; sourceTree = "<group>"; };
 		9D8C4EB0249CC0F50036229A /* JXtopShowVIew.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JXtopShowVIew.m; sourceTree = "<group>"; };
-		9D8C4ED0249CD6B20036229A /* movie.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = movie.mp3; sourceTree = "<group>"; };
 		9D932129249863A6007E1D9D /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.markdown; sourceTree = "<group>"; };
 		9D93212B249863A6007E1D9D /* DDXMLDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLDocument.h; sourceTree = "<group>"; };
 		9D93212C249863A6007E1D9D /* DDXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXML.h; sourceTree = "<group>"; };
@@ -9467,7 +9465,6 @@
 			children = (
 				9DF93709248E6A8F00F996A9 /* 即信Release.entitlements */,
 				9DB1222624629601003C25E1 /* 即信.entitlements */,
-				9D8C4ED0249CD6B20036229A /* movie.mp3 */,
 				9D52CB64245A832B00009803 /* ClassesNew */,
 				B1684D1224235F5200C54FB9 /* ApplyForWithdrawal */,
 				0F15FD24236A8513008A0E30 /* Socket */,
@@ -9868,7 +9865,6 @@
 				CC30175C1951BABF0059BADA /* f095.png in Resources */,
 				1850911B1D12ACA200C98E17 /* praise@2x.png in Resources */,
 				6350CC251F9D7FCE00D21B6F /* feeds_play_btn_u@2x.png in Resources */,
-				9D8C4ED1249CD6B20036229A /* movie.mp3 in Resources */,
 				B18B72B62418BFE200FA2BCE /* SVProgressHUD.bundle in Resources */,
 				CC30172B1951BABF0059BADA /* f070@2x.png in Resources */,
 				CC3016AA1951BABF0059BADA /* f006.png in Resources */,

+ 19 - 3
shiku_im/controller/JXChatViewController.mm

@@ -1292,7 +1292,12 @@
 
                         p = [[JXMessageObject sharedInstance] fetchAllMessageListWithUser:s];
                         
-                        
+                        if (p.count>100) {
+                            
+                            NSArray *topThree = [p subarrayWithRange:NSMakeRange(0, 100)];
+                            
+                            p=[topThree mutableCopy];
+                        }
                         [g_default setObject:@"messageHistory" forKey:@"messageHistory"];
                         [g_default synchronize];
                     }
@@ -1320,10 +1325,21 @@
                     }else{
 
                         p = [[JXMessageObject sharedInstance] fetchAllMessageListWithUser:s];
-                        
+
+                        if (p.count>100) {
+
+                             NSArray *topThree = [p subarrayWithRange:NSMakeRange(0, 100)];
+                            
+                            p=[topThree mutableCopy];
+                        }
                         
                         [g_default setObject:@"messageHistory" forKey:@"messageHistory"];
                         [g_default synchronize];
+                        if (p==nil||p.count==0) {
+                            
+                            [self refresh:nil];
+                            _isGetServerMsg=YES;
+                        }
                     }
                     
                    
@@ -3248,7 +3264,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
 }
 
 - (void)dealloc {
-    [g_default removeObjectForKey:@"messageHistory"];
+   // [g_default removeObjectForKey:@"messageHistory"];
     [g_notify removeObserver:self];
     [g_notify removeObserver:self name:kCellShowCardNotifaction object:nil];
     [g_notify removeObserver:self name:kCellLocationNotifaction object:nil];

BIN
shiku_im/movie.mp3


+ 2 - 2
shiku_im/shiku_im-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>3.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -67,7 +67,7 @@
 		<dict/>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20200715</string>
+	<string>20200716</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSApplicationQueriesSchemes</key>