Browse Source

更新了引导图,fix 分享取动态图

youke 3 years ago
parent
commit
59f86e88b3

BIN
.DS_Store


+ 4 - 4
ZhongJingLianMeng.xcodeproj/project.pbxproj

@@ -90,7 +90,6 @@
 		CC0DC6ED246D59A300CA40D8 /* 1.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0DC6EC246D59A300CA40D8 /* 1.png */; };
 		CC0DC6EF246D59AF00CA40D8 /* 2.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0DC6EE246D59AF00CA40D8 /* 2.png */; };
 		CC0DC6F1246D59B700CA40D8 /* 3.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0DC6F0246D59B700CA40D8 /* 3.png */; };
-		CC0DC6F3246D59BE00CA40D8 /* 4.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0DC6F2246D59BE00CA40D8 /* 4.png */; };
 		CC140BF221B911FC00AFE57C /* activityDetailVController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC140BF121B911FC00AFE57C /* activityDetailVController.m */; };
 		CC140BF321B9235600AFE57C /* BaseWebController.h in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962A821B8E9F0001FED0A /* BaseWebController.h */; };
 		CC140BF421B9236100AFE57C /* activityModel.h in Sources */ = {isa = PBXBuildFile; fileRef = CC265F1C21A262FD002EDBEC /* activityModel.h */; };
@@ -312,6 +311,7 @@
 		CCB3E977219D57D5002AD741 /* newNoImageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB3E976219D57D5002AD741 /* newNoImageCell.m */; };
 		CCB3E97A219D57E9002AD741 /* newImageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB3E979219D57E9002AD741 /* newImageCell.m */; };
 		CCB3E97E219D5A3E002AD741 /* newModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB3E97D219D5A3E002AD741 /* newModel.m */; };
+		CCB9D02025B03B1C00C33436 /* 4.png in Resources */ = {isa = PBXBuildFile; fileRef = CCB9D01F25B03B1C00C33436 /* 4.png */; };
 		CCF9554121B76C36006DE1B2 /* applyForDirectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = CCF9554021B76C36006DE1B2 /* applyForDirectorController.m */; };
 		CCF9555221B79CFA006DE1B2 /* UMCommonLog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9554621B79CFA006DE1B2 /* UMCommonLog.framework */; };
 		CCF9555321B79CFA006DE1B2 /* UMCommonLog.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CCF9554721B79CFA006DE1B2 /* UMCommonLog.bundle */; };
@@ -497,7 +497,6 @@
 		CC0DC6EC246D59A300CA40D8 /* 1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 1.png; sourceTree = "<group>"; };
 		CC0DC6EE246D59AF00CA40D8 /* 2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 2.png; sourceTree = "<group>"; };
 		CC0DC6F0246D59B700CA40D8 /* 3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 3.png; sourceTree = "<group>"; };
-		CC0DC6F2246D59BE00CA40D8 /* 4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 4.png; sourceTree = "<group>"; };
 		CC140BF021B911FC00AFE57C /* activityDetailVController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = activityDetailVController.h; sourceTree = "<group>"; };
 		CC140BF121B911FC00AFE57C /* activityDetailVController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = activityDetailVController.m; sourceTree = "<group>"; };
 		CC1C380721BA197100D81BCB /* eventActivityVController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = eventActivityVController.h; sourceTree = "<group>"; };
@@ -863,6 +862,7 @@
 		CCB3E979219D57E9002AD741 /* newImageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = newImageCell.m; sourceTree = "<group>"; };
 		CCB3E97C219D5A3E002AD741 /* newModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = newModel.h; sourceTree = "<group>"; };
 		CCB3E97D219D5A3E002AD741 /* newModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = newModel.m; sourceTree = "<group>"; };
+		CCB9D01F25B03B1C00C33436 /* 4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 4.png; sourceTree = "<group>"; };
 		CCF9553F21B76C36006DE1B2 /* applyForDirectorController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = applyForDirectorController.h; sourceTree = "<group>"; };
 		CCF9554021B76C36006DE1B2 /* applyForDirectorController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = applyForDirectorController.m; sourceTree = "<group>"; };
 		CCF9554621B79CFA006DE1B2 /* UMCommonLog.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UMCommonLog.framework; sourceTree = "<group>"; };
@@ -1434,7 +1434,7 @@
 				CC0DC6EC246D59A300CA40D8 /* 1.png */,
 				CC0DC6EE246D59AF00CA40D8 /* 2.png */,
 				CC0DC6F0246D59B700CA40D8 /* 3.png */,
-				CC0DC6F2246D59BE00CA40D8 /* 4.png */,
+				CCB9D01F25B03B1C00C33436 /* 4.png */,
 			);
 			path = image;
 			sourceTree = "<group>";
@@ -2197,7 +2197,6 @@
 				CC38C8FA256F70140008C616 /* WeiboSDK.bundle in Resources */,
 				CC5E3EDD24592F5900582382 /* UIBarButtonItemArrowRight.png in Resources */,
 				CC5E3EEA24592F5900582382 /* UIBarButtonItemArrowRight@2x.png in Resources */,
-				CC0DC6F3246D59BE00CA40D8 /* 4.png in Resources */,
 				CC38C904256F70140008C616 /* ShareSDK.bundle in Resources */,
 				CC5E3ED724592F5900582382 /* ImageError@2x.png in Resources */,
 				CC1CE9A9219BE66C004F8F79 /* EasyNavButton.bundle in Resources */,
@@ -2215,6 +2214,7 @@
 				CC5E3EED24592F5900582382 /* ImageSelectedOn@3x.png in Resources */,
 				CC5E3EE324592F5900582382 /* ImageSelectedOff@2x.png in Resources */,
 				CC38C905256F70140008C616 /* ShareSDKUI.bundle in Resources */,
+				CCB9D02025B03B1C00C33436 /* 4.png in Resources */,
 				CC5E3EE124592F5900582382 /* ImageSelectedOn.png in Resources */,
 				9C21630F219D3AD000FAFE94 /* BirthdaySelectionView.xib in Resources */,
 				CC5E3ED024592F5900582382 /* UIBarButtonItemGrid@3x.png in Resources */,

BIN
ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/UserInterfaceState.xcuserstate


+ 14 - 30
ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,8 +26,8 @@
             timestampString = "604913689.634392"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "196"
-            endingLineNumber = "196"
+            startingLineNumber = "200"
+            endingLineNumber = "200"
             landmarkName = "-collectionClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -43,8 +43,8 @@
             timestampString = "604913689.634468"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "247"
-            endingLineNumber = "247"
+            startingLineNumber = "251"
+            endingLineNumber = "251"
             landmarkName = "-collectionClick:"
             landmarkType = "7">
             <Locations>
@@ -59,8 +59,8 @@
                   urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "247"
-                  endingLineNumber = "247"
+                  startingLineNumber = "251"
+                  endingLineNumber = "251"
                   offsetFromSymbolStart = "1892">
                </Location>
                <Location
@@ -74,8 +74,8 @@
                   urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "248"
-                  endingLineNumber = "248"
+                  startingLineNumber = "252"
+                  endingLineNumber = "252"
                   offsetFromSymbolStart = "72">
                </Location>
             </Locations>
@@ -92,8 +92,8 @@
             timestampString = "604913689.6345249"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "250"
-            endingLineNumber = "250"
+            startingLineNumber = "254"
+            endingLineNumber = "254"
             landmarkName = "-collectionClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1183,24 +1183,8 @@
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "85"
-            endingLineNumber = "85"
-            landmarkName = "-loadIsCollection:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "11F0ED7C-5D42-42F6-AA96-52F9DA92059E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "63"
-            endingLineNumber = "63"
+            startingLineNumber = "89"
+            endingLineNumber = "89"
             landmarkName = "-loadIsCollection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1343,8 +1327,8 @@
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "186"
-            endingLineNumber = "186"
+            startingLineNumber = "190"
+            endingLineNumber = "190"
             landmarkName = "-viewDidLoad"
             landmarkType = "7">
          </BreakpointContent>

BIN
ZhongJingLianMeng/.DS_Store


BIN
ZhongJingLianMeng/image/4.png


+ 21 - 17
ZhongJingLianMeng/main/home(首页)/newsDetailVController.m

@@ -47,6 +47,26 @@
         [self loadIsCollection:self.typeStr];
     }
 }
+static void extracted(newsDetailVController *object, NSMutableDictionary *parma, newsDetailVController *const __weak weakself) {
+    [object.sessionManager sendPostHttpRequestWithUrl:isCollection params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        
+        weakself.collectionStaus = response[@"isCollected"];
+        
+        if ([weakself.collectionStaus isEqualToString:@"1"]) {
+            
+            [weakself.collectionBtn setImage:[UIImage imageNamed:@"collection"] forState:UIControlStateNormal];
+            
+        }else{
+            
+            [weakself.collectionBtn setImage:[UIImage imageNamed:@"NoCollection"] forState:UIControlStateNormal];
+            
+        }
+    } failure:^(NSError *error) {
+        
+        NSLog(@"%@",error);
+    }];
+}
+
 -(void)loadIsCollection:(NSString *)typeString{
     
     if ([typeString isEqualToString:@"0"]) {
@@ -59,23 +79,7 @@
         parma[@"type"] = @"0";
         self.sessionManager = [[HttpRequestManger alloc]init];
         
-        [self.sessionManager sendPostHttpRequestWithUrl:isCollection params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
-            
-            weakself.collectionStaus = response[@"isCollected"];
-            
-            if ([weakself.collectionStaus isEqualToString:@"1"]) {
-                
-                [weakself.collectionBtn setImage:[UIImage imageNamed:@"collection"] forState:UIControlStateNormal];
-                
-            }else{
-                
-                [weakself.collectionBtn setImage:[UIImage imageNamed:@"NoCollection"] forState:UIControlStateNormal];
-                
-            }
-        } failure:^(NSError *error) {
-            
-            NSLog(@"%@",error);
-        }];
+        extracted(self, parma, weakself);
         
         
     }else{