pangyang 5 years ago
parent
commit
ffbe0f5e0a
23 changed files with 789 additions and 58 deletions
  1. 23 11
      ZhongJingLianMeng.xcodeproj/project.pbxproj
  2. 416 0
      ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  3. 5 5
      ZhongJingLianMeng/Info.plist
  4. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_1.png
  5. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_1@2x.png
  6. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_22.png
  7. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_22@2x.png
  8. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_23.png
  9. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_23@2x.png
  10. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_24.png
  11. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_24@2x.png
  12. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_37.png
  13. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_37@2x.png
  14. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_6.png
  15. BIN
      ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_6@2x.png
  16. 5 0
      ZhongJingLianMeng/ZhongJingLianMeng.entitlements
  17. 172 13
      ZhongJingLianMeng/main/activity(活动)/ActivityTableController.m
  18. 2 2
      ZhongJingLianMeng/main/activity(活动)/activityVController.m
  19. 3 2
      ZhongJingLianMeng/main/home(首页)/allianceNewsVController.m
  20. 14 1
      ZhongJingLianMeng/main/home(首页)/homePageViewController.m
  21. 2 0
      ZhongJingLianMeng/main/home(首页)/newsDetailVController.h
  22. 142 23
      ZhongJingLianMeng/main/home(首页)/newsDetailVController.m
  23. 5 1
      ZhongJingLianMeng/prefixHeader/AllUrl.h

+ 23 - 11
ZhongJingLianMeng.xcodeproj/project.pbxproj

@@ -409,6 +409,7 @@
 		CC1CE9CC219BED3B004F8F79 /* 2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 2.png; sourceTree = "<group>"; };
 		CC1CE9CF219BED59004F8F79 /* 4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 4.png; sourceTree = "<group>"; };
 		CC1CE9D0219BED5A004F8F79 /* 3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 3.png; sourceTree = "<group>"; };
+		CC1D359121B6584300D3CD65 /* ZhongJingLianMeng.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ZhongJingLianMeng.entitlements; sourceTree = "<group>"; };
 		CC1D598921AF7F0000AA2574 /* bannerModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bannerModel.h; sourceTree = "<group>"; };
 		CC1D598A21AF7F0000AA2574 /* bannerModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bannerModel.m; sourceTree = "<group>"; };
 		CC265F1421A25376002EDBEC /* ActivityTableController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ActivityTableController.h; sourceTree = "<group>"; };
@@ -711,6 +712,7 @@
 		CC1CE926219BB579004F8F79 /* ZhongJingLianMeng */ = {
 			isa = PBXGroup;
 			children = (
+				CC1D359121B6584300D3CD65 /* ZhongJingLianMeng.entitlements */,
 				CC1CE95A219BCEBB004F8F79 /* AppDelegate */,
 				CC1CE959219BCE90004F8F79 /* main */,
 				CC1CE97D219BE646004F8F79 /* category */,
@@ -1206,7 +1208,15 @@
 				TargetAttributes = {
 					CC1CE923219BB579004F8F79 = {
 						CreatedOnToolsVersion = 9.2;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
+						SystemCapabilities = {
+							com.apple.BackgroundModes = {
+								enabled = 0;
+							};
+							com.apple.Push = {
+								enabled = 0;
+							};
+						};
 					};
 					CC1CE93B219BB579004F8F79 = {
 						CreatedOnToolsVersion = 9.2;
@@ -1624,9 +1634,10 @@
 			baseConfigurationReference = EBE3D243B8A22B20959F95A0 /* Pods-ZhongJingLianMeng.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer: zjlmhyb@126.com (HZQH354CT4)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 8SLCM67D6W;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = N4WTU4JYW2;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ZhongJingLianMeng/SDK/Alipay",
@@ -1712,10 +1723,10 @@
 					"-framework",
 					"\"UIKit\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.ZhongJingLianMeng.mobile;
+				PRODUCT_BUNDLE_IDENTIFIER = com.chinanet.zhongjinglianmeng;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "31b9a3df-a068-4640-aecd-b98aecf4232c";
+				PROVISIONING_PROFILE_SPECIFIER = firstProvision;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -1725,9 +1736,10 @@
 			baseConfigurationReference = 9C72715F3CD527BAF99561AD /* Pods-ZhongJingLianMeng.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer: zjlmhyb@126.com (HZQH354CT4)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 8SLCM67D6W;
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = N4WTU4JYW2;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ZhongJingLianMeng/SDK/Alipay",
@@ -1813,10 +1825,10 @@
 					"-framework",
 					"\"UIKit\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.ZhongJingLianMeng.mobile;
+				PRODUCT_BUNDLE_IDENTIFIER = com.chinanet.zhongjinglianmeng;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "31b9a3df-a068-4640-aecd-b98aecf4232c";
+				PROVISIONING_PROFILE_SPECIFIER = firstProvision;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

+ 416 - 0
ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,5 +13,421 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/allianceNewsVController.m"
+            timestampString = "565611252.22834"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "130"
+            endingLineNumber = "130"
+            landmarkName = "-loadDataList:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.228433"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "105"
+            endingLineNumber = "105"
+            landmarkName = "-loadStutasList:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.228884"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "102"
+            endingLineNumber = "102"
+            landmarkName = "-loadStutasList:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.229207"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "196"
+            endingLineNumber = "196"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.229498"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "109"
+            endingLineNumber = "109"
+            landmarkName = "-loadStutasList:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.229772"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "143"
+            endingLineNumber = "143"
+            landmarkName = "-loadStutasList:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.230051"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "154"
+            endingLineNumber = "154"
+            landmarkName = "-reloadTableView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.230346"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "203"
+            endingLineNumber = "203"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.23066"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "152"
+            endingLineNumber = "152"
+            landmarkName = "-reloadTableView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.230951"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "168"
+            endingLineNumber = "168"
+            landmarkName = "-numberOfSectionsInTableView:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565611252.231236"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "184"
+            endingLineNumber = "184"
+            landmarkName = "-tableView:heightForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
+            timestampString = "565611252.231672"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "41"
+            endingLineNumber = "41"
+            landmarkName = "-viewWillAppear:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
+            timestampString = "565611252.23186"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "50"
+            endingLineNumber = "50"
+            landmarkName = "-loadIsCollection:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
+            timestampString = "565611252.232007"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "89"
+            endingLineNumber = "89"
+            landmarkName = "-loadIsCollection:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[newsDetailVController loadIsCollection:]"
+                  moduleName = "ZhongJingLianMeng"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
+                  timestampString = "565611216.00418"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "89"
+                  endingLineNumber = "89"
+                  offsetFromSymbolStart = "1315">
+               </Location>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__42-[newsDetailVController loadIsCollection:]_block_invoke_2"
+                  moduleName = "ZhongJingLianMeng"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
+                  timestampString = "565611216.0070111"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "91"
+                  endingLineNumber = "91"
+                  offsetFromSymbolStart = "47">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
+            timestampString = "565611252.2320549"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "91"
+            endingLineNumber = "91"
+            landmarkName = "-loadIsCollection:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
+            timestampString = "565611252.232098"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "194"
+            endingLineNumber = "194"
+            landmarkName = "-collectionClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
+            timestampString = "565611252.232139"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "245"
+            endingLineNumber = "245"
+            landmarkName = "-collectionClick:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[newsDetailVController collectionClick:]"
+                  moduleName = "ZhongJingLianMeng"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
+                  timestampString = "565611216.021715"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "245"
+                  endingLineNumber = "245"
+                  offsetFromSymbolStart = "2301">
+               </Location>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__41-[newsDetailVController collectionClick:]_block_invoke_2"
+                  moduleName = "ZhongJingLianMeng"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
+                  timestampString = "565611216.024205"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "246"
+                  endingLineNumber = "246"
+                  offsetFromSymbolStart = "51">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
+            timestampString = "565611252.232181"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "248"
+            endingLineNumber = "248"
+            landmarkName = "-collectionClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
+            timestampString = "565611252.232246"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "254"
+            endingLineNumber = "254"
+            landmarkName = "-collectionClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/category/Common/tool/HttpRequestManger.m"
+            timestampString = "565611252.2323"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
+            landmarkName = "-sendPostHttpRequestWithUrl:params:bodyBlock:progress:success:failure:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/category/Common/tool/HttpRequestManger.m"
+            timestampString = "565611252.2323411"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "125"
+            endingLineNumber = "125"
+            landmarkName = "-sendPostHttpRequestWithUrl:params:bodyBlock:progress:success:failure:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/category/Common/tool/HttpRequestManger.m"
+            timestampString = "565611252.232389"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "134"
+            endingLineNumber = "134"
+            landmarkName = "-sendPostHttpRequestWithUrl:params:bodyBlock:progress:success:failure:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 5 - 5
ZhongJingLianMeng/Info.plist

@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>zh_CN</string>
 	<key>CFBundleDisplayName</key>
@@ -27,6 +22,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_1.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_1@2x.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_22.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_22@2x.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_23.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_23@2x.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_24.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_24@2x.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_37.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_37@2x.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_6.png


BIN
ZhongJingLianMeng/SDK/ShareSDK/Support/Optional/ShareSDKUI.bundle/Icon/sns_icon_6@2x.png


+ 5 - 0
ZhongJingLianMeng/ZhongJingLianMeng.entitlements

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

+ 172 - 13
ZhongJingLianMeng/main/activity(活动)/ActivityTableController.m

@@ -9,51 +9,179 @@
 #import "ActivityTableController.h"
 #import "newImageCell.h"
 #import "activityCell.h"
+#import "newModel.h"
+#import "newsDetailVController.h"
 @interface ActivityTableController ()<UITableViewDelegate,UITableViewDataSource>{
-    
-    
+        int _page;
+ 
 }
 @property(nonatomic, strong) UILabel *titleLab;
 @property(nonatomic,strong)UITableView *tableView;
+@property(nonatomic,strong)NSMutableArray *listArray;
+@property(nonatomic,strong)NSMutableArray *dataArray;
+@property(nonatomic,strong)HttpRequestManger *sessionManager;
+
+@property(nonatomic,strong)UIImageView *iconImgView;
+@property(nonatomic,strong)UILabel *jieKuanLb;
+@property(nonatomic,strong)UIView *backgroundView;
 @end
 
 @implementation ActivityTableController
+- (HttpRequestManger*) sessionManager{
+    if (!_sessionManager) {
+        _sessionManager = [[HttpRequestManger alloc]init];
+    }
+    return _sessionManager;
+}
+-(NSMutableArray *)listArray{
+    if (!_listArray) {
+        _listArray = [NSMutableArray array];
+    }
+    return _listArray;
+}
+-(NSMutableArray *)dataArray{
+    if (!_dataArray) {
+        _dataArray = [NSMutableArray array];
+    }
+    return _dataArray;
+}
+-(void)viewWillAppear:(BOOL)animated{
+    
+    [super viewWillAppear:YES];
 
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
 //    [self.navigationView setNavigationBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
     self.view.backgroundColor = [UIColor whiteColor];
-    
+     _page = 1;
     _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0, kGScreenWidth, kGScreenHeight-NaviHeight -54 ) style:UITableViewStylePlain];
-    _tableView.delegate = self;
-    _tableView.dataSource = self;
-    
     _tableView.backgroundColor = [UIColor colorWithHexValue:0xFFFFFF];
     self.view.backgroundColor = [UIColor colorWithHexValue:0xFFFFFF];//cell不对齐
     [self.view addSubview:_tableView];
+    _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+
     if (@available(iOS 11.0, *)) {
         _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     }else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
+    _dataArray = [NSMutableArray array];
+    [self loadStutasList:self.typeString];
+    _tableView.delegate = self;
+    _tableView.dataSource = self;
+    
+    _tableView.mj_header=[MJRefreshNormalHeader headerWithRefreshingBlock:^{
+        
+        [self.dataArray removeAllObjects];
+        _page = 1;
+        [self loadStutasList:_typeString];
+        
+    }];
+    // 设置自动切换透明度(在导航栏下面自动隐藏)
+    _tableView.mj_header.automaticallyChangeAlpha = YES;
     
+    // 上拉加载
+    _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+        
+        _page++;
+        [self loadStutasList:_typeString];
+    }];
     
     // Do any additional setup after loading the view.
 }
+
+-(void)loadStutasList:(NSString *)typeStr{
+    
+    
+    NSMutableDictionary *parme = [NSMutableDictionary dictionary];
+    parme[@"type"] = typeStr;
+    parme[@"pageNum"] = [NSString stringWithFormat:@"%d",_page];
+    parme[@"pageSize"] = @10;
+    [ProgressHUD show];
+    kWeakSelf(self);
+    [self.sessionManager sendPostHttpRequestWithUrl:activityList params:parme bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        [ProgressHUD hide];
+        NSLog(@"%@",response);
+        
+        NSArray *arr = [NSArray arrayWithArray:response[@"activityList"]];
+        
+        if (arr.count !=0 ) {
+            
+            _listArray = [newModel mj_objectArrayWithKeyValuesArray:arr];
+            [_dataArray addObjectsFromArray:_listArray];
+            
+        }else if([arr count] ==0 && _page !=1){
+            
+            _listArray = [NSMutableArray arrayWithArray:arr];
+            
+        }else{
+            
+            _backgroundView = [[UIView alloc]initWithFrame:CGRectMake(0,NaviHeight +44, kGScreenWidth, kGScreenHeight)];
+            [self.view addSubview:_backgroundView];
+            _iconImgView = [[UIImageView alloc] init];
+            _iconImgView.image = [UIImage imageNamed:@"searchEmptyImg"];
+            _iconImgView.contentMode = UIViewContentModeScaleAspectFit;
+            [_backgroundView addSubview:_iconImgView];
+            [_iconImgView mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.size.mas_equalTo(CGSizeMake(167, 90));
+                make.centerY.mas_equalTo(self.view.mas_centerY).with.offset(IS_IPHONE_4_OR_LESS?-60:-140);
+                make.centerX.mas_equalTo(self.view.mas_centerX).with.offset(0);
+            }];
+            _jieKuanLb = [[UILabel alloc] init];
+            _jieKuanLb.text = @"亲,暂无数据";
+            _jieKuanLb.font = [UIFont systemFontOfSize:18];
+            _jieKuanLb.textAlignment = NSTextAlignmentCenter;
+            [_backgroundView addSubview:_jieKuanLb];
+            [_jieKuanLb mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.size.mas_equalTo(CGSizeMake(kGScreenWidth, 24));
+                make.top.mas_equalTo(_iconImgView.mas_bottom).with.offset(30);
+                make.centerX.mas_equalTo(self.view.mas_centerX).with.offset(0);
+            }];
+        }
+        
+        [weakself reloadTableView];
+        
+    } failure:^(NSError *error) {
+        [ProgressHUD hide];
+        NSLog(@"%@",error);
+    }];
+}
+-(void)reloadTableView{
+    [_tableView reloadData];
+    [_tableView.mj_header endRefreshing];
+    [_tableView.mj_footer endRefreshing];
+    if (self.dataArray.count%10!=0||self.listArray.count%10!=0) {
+        [_tableView.mj_footer endRefreshingWithNoMoreData];
+    }
+}
+
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    return 10;
+    
+    if ([_typeString isEqualToString:@"1"]) {
+        
+        return _dataArray.count;
+    }else{
+        return 1;
+    }
+    
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    
-    return 1;
+    if ([_typeString isEqualToString:@"1"]) {
+        
+        return 1;
+    }else{
+        
+        return _dataArray.count;
+    }
+
     
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if ([_typeString isEqualToString:@"0"]) {
+    if ([_typeString isEqualToString:@"1"]) {
     
         return 260;
     }else{
@@ -65,7 +193,7 @@
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if ([_typeString isEqualToString:@"0"]) {
+    if ([_typeString isEqualToString:@"1"]) {
         
         activityCell *cell = [activityCell cellWith:nil tableView:tableView];
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
@@ -73,7 +201,10 @@
         return cell;
        
     }else{
-        newImageCell *cell = [newImageCell cellWith:nil tableView:tableView];
+        
+        newModel *model = _dataArray[indexPath.row];
+        
+        newImageCell *cell = [newImageCell cellWith:model tableView:tableView];
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         return cell;
@@ -97,6 +228,34 @@
 -(UIView*)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
     return nil;
 }
+
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    if ([_typeString isEqualToString:@"1"]) {
+        
+    }else{
+        
+        newModel *model = self.dataArray[indexPath.row];
+        newsDetailVController *newsDetail = [[newsDetailVController alloc]init];
+        newsDetail.newsId = model.news_Id;
+        newsDetail.titleStr = model.title;
+        newsDetail.shareTitle = model.title;
+        newsDetail.typeStr = @"1";
+        newsDetail.index =@"0";
+        newsDetail.urlStr = [NSString stringWithFormat:@"%@/reviewDetail?id=%@",baseH5,model.news_Id];
+        newsDetail.shareUrl = [NSString stringWithFormat:@"%@/reviewDetail?id=%@",baseH5,model.news_Id];
+        [self.navigationController pushViewController:newsDetail animated:YES];
+    }
+   
+}
+
+
+- (void)dealloc {
+    if (_sessionManager) {
+        [_sessionManager cancelAllTask];
+    }
+    DebugLog(@"%@没有造成循环引用", [self class]);
+}
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

+ 2 - 2
ZhongJingLianMeng/main/activity(活动)/activityVController.m

@@ -62,11 +62,11 @@
     switch (index %2) {
         case 0:
             vc = temps;
-            temps.typeString = @"0";
+            temps.typeString = @"1";
             break;
         case 1:
             vc = temps;
-            temps.typeString = @"1";
+            temps.typeString = @"2";
             break;
         default:
             break;

+ 3 - 2
ZhongJingLianMeng/main/home(首页)/allianceNewsVController.m

@@ -86,7 +86,7 @@
     _tab.delegate = self;
     _tab.dataSource = self;
     _tab.backgroundColor = KRGB_COLOR(247, 249,251);
-    
+    _tab.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.view addSubview:_tab];
     if (@available(iOS 11.0, *)) {
         _tab.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -127,7 +127,7 @@
         
         NSArray *arr = [NSArray arrayWithArray:response[@"informationList"]];
         
-        if (!IsArrEmpty(arr)) {
+        if (arr.count !=0 ) {
             
               _listArray = [newModel mj_objectArrayWithKeyValuesArray:arr];
               [_dataArray addObjectsFromArray:_listArray];
@@ -215,6 +215,7 @@
     newsDetail.newsId = model.news_Id;
     newsDetail.titleStr = model.title;
     newsDetail.shareTitle = model.title;
+    newsDetail.typeStr = @"0";
     newsDetail.index =@"0";
     newsDetail.urlStr = [NSString stringWithFormat:@"%@/newsInfo?id=%@&move=ios",baseH5,model.news_Id];
     newsDetail.shareUrl = [NSString stringWithFormat:@"%@/newsInfo?id=%@",baseH5,model.news_Id];

+ 14 - 1
ZhongJingLianMeng/main/home(首页)/homePageViewController.m

@@ -55,6 +55,7 @@
     }else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
+    _tab.separatorStyle = UITableViewCellSeparatorStyleNone;
     _headView =[[homeHeaderView alloc]initWithFrame:CGRectMake(0, 0, kGScreenWidth, 400)];
     _headView.delegate = self;
     _tab.tableHeaderView= _headView;
@@ -158,6 +159,18 @@
     }
 }
 
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    newModel *model = self.dataArr[indexPath.row];
+    newsDetailVController *newsDetail = [[newsDetailVController alloc]init];
+    newsDetail.newsId = model.news_Id;
+    newsDetail.titleStr = model.title;
+    newsDetail.shareTitle = model.title;
+    newsDetail.index =@"0";
+    newsDetail.urlStr = [NSString stringWithFormat:@"%@/newsInfo?id=%@&move=ios",baseH5,model.news_Id];
+    newsDetail.shareUrl = [NSString stringWithFormat:@"%@/newsInfo?id=%@",baseH5,model.news_Id];
+    [self.navigationController pushViewController:newsDetail animated:YES];
+}
+
 -(void)selectedImageView:(NSInteger)number{
     
     bannerModel *model = self.bannerArr[number];
@@ -170,7 +183,7 @@
 
     webVC.index = @"1";
     
-    webVC.newsId  = model.img_Id;
+//    webVC.newsId  = model.img_Id;
     
     webVC.urlStr = [NSString stringWithFormat:@"%@",model.banner_url];
     

+ 2 - 0
ZhongJingLianMeng/main/home(首页)/newsDetailVController.h

@@ -22,5 +22,7 @@
 
 @property(nonatomic,strong)NSString *index;
 
+@property(nonatomic,strong)NSString *typeStr;
+
 
 @end

+ 142 - 23
ZhongJingLianMeng/main/home(首页)/newsDetailVController.m

@@ -40,37 +40,70 @@
     
     if ([_index isEqualToString:@"0"]) {
         
-         [self loadIsCollection];
+        [self loadIsCollection:self.typeStr];
     }
    
     
 }
--(void)loadIsCollection{
-    kWeakSelf(self);
-    NSMutableDictionary *parma = [NSMutableDictionary dictionary];
-    
-    parma[@"id"] = weakself.newsId;
+-(void)loadIsCollection:(NSString *)typeString{
     
-    self.sessionManager = [[HttpRequestManger alloc]init];
-    
-    [self.sessionManager sendPostHttpRequestWithUrl:isCollection params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+    if ([typeString isEqualToString:@"0"]) {
+        
+        kWeakSelf(self);
+        
+        NSMutableDictionary *parma = [NSMutableDictionary dictionary];
+        
+        parma[@"id"] = weakself.newsId;
         
-        weakself.collectionStaus = response[@"informationDetail"][@"is_collect"];
+        self.sessionManager = [[HttpRequestManger alloc]init];
         
-        if ([weakself.collectionStaus isEqualToString:@"1"]) {
+        [self.sessionManager sendPostHttpRequestWithUrl:isCollection params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
             
-            [weakself.collectionBtn setImage:[UIImage imageNamed:@"collection"] forState:UIControlStateNormal];
+            weakself.collectionStaus = response[@"informationDetail"][@"is_collect"];
             
-        }else{
+            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) {
             
-            [weakself.collectionBtn setImage:[UIImage imageNamed:@"NoCollection"] forState:UIControlStateNormal];
+            NSLog(@"%@",error);
+        }];
+        
+        
+    }else{
+        
+        kWeakSelf(self);
+        
+        NSMutableDictionary *parma = [NSMutableDictionary dictionary];
+        
+        parma[@"id"] = weakself.newsId;
+        parma[@"type"] = @"2";
+        self.sessionManager = [[HttpRequestManger alloc]init];
+        
+        [self.sessionManager sendPostHttpRequestWithUrl:isActivityCollection params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
             
-        }
-    } failure:^(NSError *error) {
-       
-        NSLog(@"%@",error);
-    }];
-    
+            weakself.collectionStaus = response[@"activityDetail"][@"is_collect"];
+            
+            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)viewDidLoad {
     [super viewDidLoad];
@@ -167,8 +200,16 @@
             NSMutableDictionary *parma = [NSMutableDictionary dictionary];
             
             parma[@"id"] = weakself.newsId;
-            parma[@"collectType"] = @"0";
             
+            if ([_typeStr isEqualToString:@"1"]) {
+                
+                 parma[@"collectType"] = @"2";
+                
+            }else{
+                
+                 parma[@"collectType"] = @"0";
+                
+            }
             self.sessionManager = [[HttpRequestManger alloc]init];
             
             [self.sessionManager sendPostHttpRequestWithUrl:cancelCollection params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
@@ -190,8 +231,14 @@
             NSMutableDictionary *parma = [NSMutableDictionary dictionary];
             
             parma[@"id"] = weakself.newsId;
-            
-            parma[@"type"] = @"0";
+            if ([_typeStr isEqualToString:@"1"]) {
+                 parma[@"type"] = @"2";
+            }else{
+                
+                 parma[@"type"] = @"0";
+            }
+                
+           
             
             self.sessionManager = [[HttpRequestManger alloc]init];
             
@@ -270,6 +317,78 @@
     [cache setMemoryCapacity:0];
 }
 
+-(void)shareClick:(UIButton *)sender{
+    
+    NSArray *arr =@[[UIImage imageNamed:@"1.jpeg"]];
+    
+    if (IsStrEmpty(_shareTitle)) {
+        
+        _shareTitle = @"";
+    }
+    
+    if (arr) {
+        
+        NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
+        [shareParams SSDKSetupShareParamsByText:@"中经联盟资讯"
+                                         images:arr
+                                            url:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_shareUrl]]
+                                          title:_shareTitle
+                                           type:SSDKContentTypeAuto];
+        //        [shareParams SSDKEnableUseClientShare];
+        
+//        [SSUIShareActionSheetStyle setShareActionSheetStyle:(ShareActionSheetStyle)ShareActionSheetStyleSimple];
+
+        [ShareSDK showShareActionSheet:nil //要显示菜单的视图, iPad版中此参数作为弹出菜单的参照视图,只有传这个才可以弹出我们的分享菜单,可以传分享的按钮对象或者自己创建小的view 对象,iPhone可以传nil不会影响
+                                 items:@[@(SSDKPlatformSubTypeWechatSession),@(SSDKPlatformSubTypeWechatTimeline)]
+                           shareParams:shareParams
+                   onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
+                       
+                       switch (platformType) {
+                           case SSDKPlatformSubTypeWechatSession:
+                               
+                               break;
+                           case SSDKPlatformSubTypeWechatTimeline:
+                               
+                               break;
+                           default:
+                               break;
+                       }
+                       
+                       switch (state) {
+                           case SSDKResponseStateSuccess:
+                               //                           {
+                               //                               UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"分享成功"
+                               //                                                                                   message:nil
+                               //                                                                                  delegate:nil
+                               //                                                                         cancelButtonTitle:@"确定"
+                               //                                                                         otherButtonTitles:nil];
+                               //                               [alertView show];
+                               break;
+                               //                           }
+                           case SSDKResponseStateFail:
+                               //                           {
+                               //                               UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"分享失败"
+                               //                                                                               message:nil
+                               //                                                                              delegate:nil
+                               //                                                                     cancelButtonTitle:@"OK"
+                               //                                                                     otherButtonTitles:nil, nil];
+                               //                               [alert show];
+                               //
+                               //
+                               //                               NSLog(@"%@",error);
+                               break;
+                               //                           }
+                           default:
+                               break;
+                       }
+                   }
+         ];
+    }
+    
+    
+    
+    
+}
 
 - (void)dealloc {
     if (_sessionManager) {

+ 5 - 1
ZhongJingLianMeng/prefixHeader/AllUrl.h

@@ -26,7 +26,7 @@
 
 //H5基网址链接
 
-#define baseH5 @"http://192.168.1.116:8090"
+#define baseH5 @"http://192.168.1.84:8090"
 
 #define upload_form_upload @"/upload/formUpload"
 
@@ -52,4 +52,8 @@
 
 #define collectionNews @"/member/auth/collect"
 
+#define activityList @"/activity/selectActivityList"
+
+#define isActivityCollection @"/activity/selectActivityDetail"
+
 #endif /* AllUrl_h */