最新

ZhongJingLianMeng.xcodeproj/project.pbxproj

@@ -88,6 +88,7 @@
 		9C59629E21B4CEB1001FED0A /* OSSImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C59629D21B4CEB1001FED0A /* OSSImageUploader.m */; };
 		9C5962A121B52685001FED0A /* UserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962A021B52685001FED0A /* UserInfoModel.m */; };
 		9C5962A421B536BA001FED0A /* MemberDemandModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962A321B536BA001FED0A /* MemberDemandModel.m */; };
+		CC140BF221B911FC00AFE57C /* activityDetailVController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC140BF121B911FC00AFE57C /* activityDetailVController.m */; };
 		CC1CE929219BB579004F8F79 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CC1CE928219BB579004F8F79 /* AppDelegate.m */; };
 		CC1CE92C219BB579004F8F79 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC1CE92B219BB579004F8F79 /* ViewController.m */; };
 		CC1CE92F219BB579004F8F79 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CC1CE92D219BB579004F8F79 /* Main.storyboard */; };
@@ -171,6 +172,17 @@
 		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 */; };
+		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 */; };
+		CCF9555421B79CFA006DE1B2 /* UMPush.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9554A21B79CFA006DE1B2 /* UMPush.framework */; };
+		CCF9555521B79CFA006DE1B2 /* UMCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9554E21B79CFA006DE1B2 /* UMCommon.framework */; };
+		CCF9555621B79CFA006DE1B2 /* UMAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9555121B79CFA006DE1B2 /* UMAnalytics.framework */; };
+		CCF9555821B79D45006DE1B2 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9555721B79D45006DE1B2 /* UserNotifications.framework */; };
+		CCF9555A21B79D5C006DE1B2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9555921B79D5C006DE1B2 /* SystemConfiguration.framework */; };
+		CCF9555C21B79D71006DE1B2 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9555B21B79D71006DE1B2 /* libsqlite3.tbd */; };
+		CCF9555E21B79D80006DE1B2 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9555D21B79D80006DE1B2 /* libz.tbd */; };
+		CCF9556021B79D8E006DE1B2 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCF9555F21B79D8D006DE1B2 /* CoreTelephony.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -328,6 +340,8 @@
 		9C5962A321B536BA001FED0A /* MemberDemandModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MemberDemandModel.m; sourceTree = "<group>"; };
 		9C72715F3CD527BAF99561AD /* Pods-ZhongJingLianMeng.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZhongJingLianMeng.release.xcconfig"; path = "Pods/Target Support Files/Pods-ZhongJingLianMeng/Pods-ZhongJingLianMeng.release.xcconfig"; sourceTree = "<group>"; };
 		B49C007A967360A581DE648D /* libPods-ZhongJingLianMeng.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ZhongJingLianMeng.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		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>"; };
 		CC1CE924219BB579004F8F79 /* ZhongJingLianMeng.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ZhongJingLianMeng.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CC1CE927219BB579004F8F79 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		CC1CE928219BB579004F8F79 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -474,6 +488,18 @@
 		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>"; };
+		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>"; };
+		CCF9554721B79CFA006DE1B2 /* UMCommonLog.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = UMCommonLog.bundle; sourceTree = "<group>"; };
+		CCF9554A21B79CFA006DE1B2 /* UMPush.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UMPush.framework; sourceTree = "<group>"; };
+		CCF9554E21B79CFA006DE1B2 /* UMCommon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UMCommon.framework; sourceTree = "<group>"; };
+		CCF9555121B79CFA006DE1B2 /* UMAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UMAnalytics.framework; sourceTree = "<group>"; };
+		CCF9555721B79D45006DE1B2 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
+		CCF9555921B79D5C006DE1B2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		CCF9555B21B79D71006DE1B2 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
+		CCF9555D21B79D80006DE1B2 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		CCF9555F21B79D8D006DE1B2 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
 		EBE3D243B8A22B20959F95A0 /* Pods-ZhongJingLianMeng.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZhongJingLianMeng.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ZhongJingLianMeng/Pods-ZhongJingLianMeng.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -482,19 +508,28 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CCF9556021B79D8E006DE1B2 /* CoreTelephony.framework in Frameworks */,
+				CCF9555E21B79D80006DE1B2 /* libz.tbd in Frameworks */,
+				CCF9555C21B79D71006DE1B2 /* libsqlite3.tbd in Frameworks */,
+				CCF9555A21B79D5C006DE1B2 /* SystemConfiguration.framework in Frameworks */,
+				CCF9555821B79D45006DE1B2 /* UserNotifications.framework in Frameworks */,
 				CCB3E8D0219C034F002AD741 /* MOBFoundation.framework in Frameworks */,
 				252DFBEA8C9F2293CC1F3F50 /* libPods-ZhongJingLianMeng.a in Frameworks */,
 				CCB3E8C6219C034F002AD741 /* TencentOpenAPI.framework in Frameworks */,
 				CCB3E8C7219C034F002AD741 /* ShareSDKConnector.framework in Frameworks */,
 				CCB3E8D1219C034F002AD741 /* libWeChatSDK.a in Frameworks */,
+				CCF9555421B79CFA006DE1B2 /* UMPush.framework in Frameworks */,
 				CCB3E8C5219C034F002AD741 /* libWeiboSDK.a in Frameworks */,
+				CCF9555221B79CFA006DE1B2 /* UMCommonLog.framework in Frameworks */,
 				CCB3E8CE219C034F002AD741 /* SinaWeiboConnector.framework in Frameworks */,
+				CCF9555521B79CFA006DE1B2 /* UMCommon.framework in Frameworks */,
 				CCB3E8CF219C034F002AD741 /* ShareSDK.framework in Frameworks */,
 				CCB3E8CD219C034F002AD741 /* WechatConnector.framework in Frameworks */,
 				CCB3E8CB219C034F002AD741 /* ShareSDKUI.framework in Frameworks */,
 				CCB3E8C3219C034F002AD741 /* AlipaySDK.framework in Frameworks */,
 				CCB3E8CC219C034F002AD741 /* QQConnector.framework in Frameworks */,
 				CCB3E8CA219C034F002AD741 /* ShareSDKExtension.framework in Frameworks */,
+				CCF9555621B79CFA006DE1B2 /* UMAnalytics.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -527,6 +562,11 @@
 		394A9C7654CC8921BC4FD47A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				CCF9555F21B79D8D006DE1B2 /* CoreTelephony.framework */,
+				CCF9555D21B79D80006DE1B2 /* libz.tbd */,
+				CCF9555B21B79D71006DE1B2 /* libsqlite3.tbd */,
+				CCF9555921B79D5C006DE1B2 /* SystemConfiguration.framework */,
+				CCF9555721B79D45006DE1B2 /* UserNotifications.framework */,
 				B49C007A967360A581DE648D /* libPods-ZhongJingLianMeng.a */,
 			);
 			name = Frameworks;
@@ -727,6 +767,7 @@
 				CC1CE959219BCE90004F8F79 /* main */,
 				CC1CE97D219BE646004F8F79 /* category */,
 				CCB3E8A1219C034E002AD741 /* SDK */,
+				CCF9554221B79CBF006DE1B2 /* other */,
 				CC1CE9CA219BED2B004F8F79 /* image */,
 				CC1CE97A219BD387004F8F79 /* prefixHeader */,
 				CC1CE92A219BB579004F8F79 /* ViewController.h */,
@@ -800,6 +841,8 @@
 				CC1CE966219BCF51004F8F79 /* homePageViewController.m */,
 				CC2ADE94219E66520088958B /* joinAllianceVController.h */,
 				CC2ADE95219E66520088958B /* joinAllianceVController.m */,
+				CCF9553F21B76C36006DE1B2 /* applyForDirectorController.h */,
+				CCF9554021B76C36006DE1B2 /* applyForDirectorController.m */,
 				CC89C1D0219E9DAA001AAFA9 /* allianceNewsVController.h */,
 				CC89C1D1219E9DAA001AAFA9 /* allianceNewsVController.m */,
 				CC274DD621B4FF9000F3800F /* newsDetailVController.h */,
@@ -832,6 +875,8 @@
 				CC1CE963219BCF41004F8F79 /* activityVController.m */,
 				CC265F1421A25376002EDBEC /* ActivityTableController.h */,
 				CC265F1521A25376002EDBEC /* ActivityTableController.m */,
+				CC140BF021B911FC00AFE57C /* activityDetailVController.h */,
+				CC140BF121B911FC00AFE57C /* activityDetailVController.m */,
 			);
 			path = "activity(活动)";
 			sourceTree = "<group>";
@@ -1149,6 +1194,98 @@
 			path = model;
 			sourceTree = "<group>";
 		};
+		CCF9554221B79CBF006DE1B2 /* other */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554321B79CFA006DE1B2 /* Youmeng */,
+			);
+			path = other;
+			sourceTree = "<group>";
+		};
+		CCF9554321B79CFA006DE1B2 /* Youmeng */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554421B79CFA006DE1B2 /* umcommonlog */,
+				CCF9554821B79CFA006DE1B2 /* push */,
+				CCF9554B21B79CFA006DE1B2 /* common */,
+				CCF9554F21B79CFA006DE1B2 /* analytics */,
+			);
+			path = Youmeng;
+			sourceTree = "<group>";
+		};
+		CCF9554421B79CFA006DE1B2 /* umcommonlog */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554521B79CFA006DE1B2 /* umcommonlog_ios_1.0.0 */,
+			);
+			path = umcommonlog;
+			sourceTree = "<group>";
+		};
+		CCF9554521B79CFA006DE1B2 /* umcommonlog_ios_1.0.0 */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554621B79CFA006DE1B2 /* UMCommonLog.framework */,
+				CCF9554721B79CFA006DE1B2 /* UMCommonLog.bundle */,
+			);
+			path = umcommonlog_ios_1.0.0;
+			sourceTree = "<group>";
+		};
+		CCF9554821B79CFA006DE1B2 /* push */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554921B79CFA006DE1B2 /* push_ios_3.2.1 */,
+			);
+			path = push;
+			sourceTree = "<group>";
+		};
+		CCF9554921B79CFA006DE1B2 /* push_ios_3.2.1 */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554A21B79CFA006DE1B2 /* UMPush.framework */,
+			);
+			path = push_ios_3.2.1;
+			sourceTree = "<group>";
+		};
+		CCF9554B21B79CFA006DE1B2 /* common */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554C21B79CFA006DE1B2 /* common_ios_1.5.0 */,
+			);
+			path = common;
+			sourceTree = "<group>";
+		};
+		CCF9554C21B79CFA006DE1B2 /* common_ios_1.5.0 */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554D21B79CFA006DE1B2 /* normal */,
+			);
+			path = common_ios_1.5.0;
+			sourceTree = "<group>";
+		};
+		CCF9554D21B79CFA006DE1B2 /* normal */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9554E21B79CFA006DE1B2 /* UMCommon.framework */,
+			);
+			path = normal;
+			sourceTree = "<group>";
+		};
+		CCF9554F21B79CFA006DE1B2 /* analytics */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9555021B79CFA006DE1B2 /* analytics_ios_5.5.0 */,
+			);
+			path = analytics;
+			sourceTree = "<group>";
+		};
+		CCF9555021B79CFA006DE1B2 /* analytics_ios_5.5.0 */ = {
+			isa = PBXGroup;
+			children = (
+				CCF9555121B79CFA006DE1B2 /* UMAnalytics.framework */,
+			);
+			path = analytics_ios_5.5.0;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -1221,10 +1358,10 @@
 						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
-								enabled = 0;
+								enabled = 1;
 							};
 							com.apple.Push = {
-								enabled = 0;
+								enabled = 1;
 							};
 						};
 					};
@@ -1279,6 +1416,7 @@
 				CC1CE9D1219BED5A004F8F79 /* 4.png in Resources */,
 				CC1CE934219BB579004F8F79 /* LaunchScreen.storyboard in Resources */,
 				9C21631F219D570E00FAFE94 /* logInViewController.xib in Resources */,
+				CCF9555321B79CFA006DE1B2 /* UMCommonLog.bundle in Resources */,
 				CCB3E8C9219C034F002AD741 /* ShareSDKUI.bundle in Resources */,
 				9C21638921A2830600FAFE94 /* FindProjectController.xib in Resources */,
 				CCB3E8C8219C034F002AD741 /* ShareSDK.bundle in Resources */,
@@ -1376,6 +1514,7 @@
 				9C216370219ED15900FAFE94 /* MemberDemandController.h in Sources */,
 				9C216369219ED11F00FAFE94 /* JoinOrActivityCell.h in Sources */,
 				9C21636A219ED11F00FAFE94 /* JoinOrActivityCell.xib in Sources */,
+				CCF9554121B76C36006DE1B2 /* applyForDirectorController.m in Sources */,
 				9C21637E21A24E6F00FAFE94 /* VipBenefitsController.m in Sources */,
 				9C21636B219ED11F00FAFE94 /* MyJoinViewController.h in Sources */,
 				9C216363219ED09F00FAFE94 /* OrderAirportPayCancelView.xib in Sources */,
@@ -1481,6 +1620,7 @@
 				CC2ADE96219E66520088958B /* joinAllianceVController.m in Sources */,
 				9C21632C219D6CB300FAFE94 /* OrderListEmptyView.m in Sources */,
 				9C21639021A28DE100FAFE94 /* FindJobController.m in Sources */,
+				CC140BF221B911FC00AFE57C /* activityDetailVController.m in Sources */,
 				CC2ADE9B219E690A0088958B /* OrderAirportPayCancelView.m in Sources */,
 				CC1CE9C3219BE7A5004F8F79 /* NSString+Extension.m in Sources */,
 			);
@@ -1646,6 +1786,7 @@
 			baseConfigurationReference = EBE3D243B8A22B20959F95A0 /* Pods-ZhongJingLianMeng.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = ZhongJingLianMeng/ZhongJingLianMeng.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer: zjlmhyb@126.com (HZQH354CT4)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -1666,6 +1807,10 @@
 					"$(PROJECT_DIR)/SDK/ShareSDK/Support/PlatformConnector",
 					"$(PROJECT_DIR)/SDK/ShareSDK",
 					"$(PROJECT_DIR)/SDK/Required",
+					"$(PROJECT_DIR)/ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0",
+					"$(PROJECT_DIR)/ZhongJingLianMeng/other/Youmeng/push/push_ios_3.2.1",
+					"$(PROJECT_DIR)/ZhongJingLianMeng/other/Youmeng/common/common_ios_1.5.0/normal",
+					"$(PROJECT_DIR)/ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ZhongJingLianMeng/PrefixHeader.pch;
@@ -1748,6 +1893,7 @@
 			baseConfigurationReference = 9C72715F3CD527BAF99561AD /* Pods-ZhongJingLianMeng.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = ZhongJingLianMeng/ZhongJingLianMeng.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer: zjlmhyb@126.com (HZQH354CT4)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -1768,6 +1914,10 @@
 					"$(PROJECT_DIR)/SDK/ShareSDK/Support/PlatformConnector",
 					"$(PROJECT_DIR)/SDK/ShareSDK",
 					"$(PROJECT_DIR)/SDK/Required",
+					"$(PROJECT_DIR)/ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0",
+					"$(PROJECT_DIR)/ZhongJingLianMeng/other/Youmeng/push/push_ios_3.2.1",
+					"$(PROJECT_DIR)/ZhongJingLianMeng/other/Youmeng/common/common_ios_1.5.0/normal",
+					"$(PROJECT_DIR)/ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ZhongJingLianMeng/PrefixHeader.pch;

ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -20,7 +20,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(首页)/allianceNewsVController.m"
-            timestampString = "565611252.22834"
+            timestampString = "565686165.563911"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "130"
@@ -36,11 +36,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(活动)/ActivityTableController.m"
-            timestampString = "565611252.228433"
+            timestampString = "565781179.0173351"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "105"
-            endingLineNumber = "105"
+            startingLineNumber = "107"
+            endingLineNumber = "107"
             landmarkName = "-loadStutasList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -52,11 +52,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.228884"
+            timestampString = "565781179.0174429"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "102"
-            endingLineNumber = "102"
+            startingLineNumber = "104"
+            endingLineNumber = "104"
             landmarkName = "-loadStutasList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -68,11 +68,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.229207"
+            timestampString = "565781179.017501"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "196"
-            endingLineNumber = "196"
+            startingLineNumber = "198"
+            endingLineNumber = "198"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -84,11 +84,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.229498"
+            timestampString = "565781179.017548"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "109"
-            endingLineNumber = "109"
+            startingLineNumber = "111"
+            endingLineNumber = "111"
             landmarkName = "-loadStutasList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -100,11 +100,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.229772"
+            timestampString = "565781179.017594"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "143"
-            endingLineNumber = "143"
+            startingLineNumber = "145"
+            endingLineNumber = "145"
             landmarkName = "-loadStutasList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -116,11 +116,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.230051"
+            timestampString = "565781179.017637"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "154"
-            endingLineNumber = "154"
+            startingLineNumber = "156"
+            endingLineNumber = "156"
             landmarkName = "-reloadTableView"
             landmarkType = "7">
          </BreakpointContent>
@@ -132,11 +132,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.230346"
+            timestampString = "565781179.01768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "203"
-            endingLineNumber = "203"
+            startingLineNumber = "210"
+            endingLineNumber = "210"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -148,11 +148,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.23066"
+            timestampString = "565781179.017728"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "152"
-            endingLineNumber = "152"
+            startingLineNumber = "154"
+            endingLineNumber = "154"
             landmarkName = "-reloadTableView"
             landmarkType = "7">
          </BreakpointContent>
@@ -164,11 +164,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.230951"
+            timestampString = "565781179.017774"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "168"
-            endingLineNumber = "168"
+            startingLineNumber = "170"
+            endingLineNumber = "170"
             landmarkName = "-numberOfSectionsInTableView:"
             landmarkType = "7">
          </BreakpointContent>
@@ -180,11 +180,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
-            timestampString = "565611252.231236"
+            timestampString = "565781179.01783"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "184"
-            endingLineNumber = "184"
+            startingLineNumber = "186"
+            endingLineNumber = "186"
             landmarkName = "-tableView:heightForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -196,27 +196,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
-            timestampString = "565611252.231672"
+            timestampString = "565781179.017885"
             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"
+            startingLineNumber = "51"
+            endingLineNumber = "51"
             landmarkName = "-loadIsCollection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -228,11 +212,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
-            timestampString = "565611252.232007"
+            timestampString = "565781179.017944"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "89"
-            endingLineNumber = "89"
+            startingLineNumber = "90"
+            endingLineNumber = "90"
             landmarkName = "-loadIsCollection:"
             landmarkType = "7">
             <Locations>
@@ -244,11 +228,11 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
-                  timestampString = "565611216.00418"
+                  timestampString = "565781179.243668"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "89"
-                  endingLineNumber = "89"
+                  startingLineNumber = "90"
+                  endingLineNumber = "90"
                   offsetFromSymbolStart = "1315">
                </Location>
                <Location
@@ -259,11 +243,11 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
-                  timestampString = "565611216.0070111"
+                  timestampString = "565781179.247279"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "91"
-                  endingLineNumber = "91"
+                  startingLineNumber = "92"
+                  endingLineNumber = "92"
                   offsetFromSymbolStart = "47">
                </Location>
             </Locations>
@@ -276,11 +260,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
-            timestampString = "565611252.2320549"
+            timestampString = "565781179.017988"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "91"
-            endingLineNumber = "91"
+            startingLineNumber = "92"
+            endingLineNumber = "92"
             landmarkName = "-loadIsCollection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -292,11 +276,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
-            timestampString = "565611252.232098"
+            timestampString = "565781179.018031"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "194"
-            endingLineNumber = "194"
+            startingLineNumber = "195"
+            endingLineNumber = "195"
             landmarkName = "-collectionClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -308,11 +292,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
-            timestampString = "565611252.232139"
+            timestampString = "565781179.018072"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "245"
-            endingLineNumber = "245"
+            startingLineNumber = "246"
+            endingLineNumber = "246"
             landmarkName = "-collectionClick:"
             landmarkType = "7">
             <Locations>
@@ -324,11 +308,11 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
-                  timestampString = "565611216.021715"
+                  timestampString = "565781179.263875"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "245"
-                  endingLineNumber = "245"
+                  startingLineNumber = "246"
+                  endingLineNumber = "246"
                   offsetFromSymbolStart = "2301">
                </Location>
                <Location
@@ -339,11 +323,11 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
-                  timestampString = "565611216.024205"
+                  timestampString = "565781179.267018"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "246"
-                  endingLineNumber = "246"
+                  startingLineNumber = "247"
+                  endingLineNumber = "247"
                   offsetFromSymbolStart = "51">
                </Location>
             </Locations>
@@ -356,11 +340,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
-            timestampString = "565611252.232181"
+            timestampString = "565781179.018113"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "248"
-            endingLineNumber = "248"
+            startingLineNumber = "249"
+            endingLineNumber = "249"
             landmarkName = "-collectionClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -372,11 +356,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/newsDetailVController.m"
-            timestampString = "565611252.232246"
+            timestampString = "565781179.0181561"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "254"
-            endingLineNumber = "254"
+            startingLineNumber = "255"
+            endingLineNumber = "255"
             landmarkName = "-collectionClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -403,13 +387,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "ZhongJingLianMeng/category/Common/tool/HttpRequestManger.m"
-            timestampString = "565611252.2323411"
+            filePath = "ZhongJingLianMeng/AppDelegate/AppDelegate.m"
+            timestampString = "565781179.0182379"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "125"
-            endingLineNumber = "125"
-            landmarkName = "-sendPostHttpRequestWithUrl:params:bodyBlock:progress:success:failure:"
+            startingLineNumber = "156"
+            endingLineNumber = "156"
+            landmarkName = "-jumpToApageWithUserInfo:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -419,13 +403,45 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "ZhongJingLianMeng/category/Common/tool/HttpRequestManger.m"
-            timestampString = "565611252.232389"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "565781179.018277"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "134"
-            endingLineNumber = "134"
-            landmarkName = "-sendPostHttpRequestWithUrl:params:bodyBlock:progress:success:failure:"
+            startingLineNumber = "256"
+            endingLineNumber = "256"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/activityDetailVController.m"
+            timestampString = "565781179.018324"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "189"
+            endingLineNumber = "189"
+            landmarkName = "-collectionClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/activityDetailVController.m"
+            timestampString = "565781179.018689"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "227"
+            endingLineNumber = "227"
+            landmarkName = "-collectionClick:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

ZhongJingLianMeng/AppDelegate/AppDelegate.m

@@ -7,7 +7,9 @@
 //
 
 #import "AppDelegate.h"
-
+#import "HWTabBarViewController.h"
+#import "newsDetailVController.h"
+#import "homePageViewController.h"
 @interface AppDelegate ()
 
 @end
@@ -24,8 +26,6 @@
     NSString *phoneNumber = [userDefaults objectForKey:@"phoneNumber"];
     [DKGlobal sharedInstance].phone = phoneNumber;
     
-    self.launchOptionsDic = launchOptions;
-    
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     
     // 2.设置根控制器
@@ -34,13 +34,185 @@
     // 3.显示窗口
     [self.window makeKeyAndVisible];
     
+    [UMConfigure initWithAppkey:UMeng_APPKEY channel:@"App Store"];
+    [UMConfigure setLogEnabled:YES];//设置打开日志
+    //初始化推送
+    // Push功能配置
+    UMessageRegisterEntity * entity = [[UMessageRegisterEntity alloc] init];
+    entity.types = UMessageAuthorizationOptionBadge|UMessageAuthorizationOptionAlert|UMessageAuthorizationOptionSound;
+    //如果你期望使用交互式(只有iOS 8.0及以上有)的通知，请参考下面注释部分的初始化代码
+    if (([[[UIDevice currentDevice] systemVersion]intValue]>=8)&&([[[UIDevice currentDevice] systemVersion]intValue]<10)) {
+        UIMutableUserNotificationAction *action1 = [[UIMutableUserNotificationAction alloc] init];
+        action1.identifier = @"action1_identifier";
+        action1.title=@"打开应用";
+        action1.activationMode = UIUserNotificationActivationModeForeground;//当点击的时候启动程序
+        UIMutableUserNotificationAction *action2 = [[UIMutableUserNotificationAction alloc] init];  //第二按钮
+        action2.identifier = @"action2_identifier";
+        action2.title=@"忽略";
+        action2.activationMode = UIUserNotificationActivationModeBackground;//当点击的时候不启动程序，在后台处理
+        action2.authenticationRequired = YES;//需要解锁才能处理，如果action.activationMode = UIUserNotificationActivationModeForeground;则这个属性被忽略；
+        action2.destructive = YES;
+        UIMutableUserNotificationCategory *actionCategory1 = [[UIMutableUserNotificationCategory alloc] init];
+        actionCategory1.identifier = @"category1";//这组动作的唯一标示
+        [actionCategory1 setActions:@[action1,action2] forContext:(UIUserNotificationActionContextDefault)];
+        NSSet *categories = [NSSet setWithObjects:actionCategory1, nil];
+        entity.categories=categories;
+    }
+    //如果要在iOS10显示交互式的通知，必须注意实现以下代码
+    if ([[[UIDevice currentDevice] systemVersion]intValue]>=10) {
+        UNNotificationAction *action1_ios10 = [UNNotificationAction actionWithIdentifier:@"action1_identifier" title:@"打开应用" options:UNNotificationActionOptionForeground];
+        UNNotificationAction *action2_ios10 = [UNNotificationAction actionWithIdentifier:@"action2_identifier" title:@"忽略" options:UNNotificationActionOptionForeground];
+        //UNNotificationCategoryOptionNone
+        //UNNotificationCategoryOptionCustomDismissAction  清除通知被触发会走通知的代理方法
+        //UNNotificationCategoryOptionAllowInCarPlay       适用于行车模式
+        UNNotificationCategory *category1_ios10 = [UNNotificationCategory categoryWithIdentifier:@"category1" actions:@[action1_ios10,action2_ios10]   intentIdentifiers:@[] options:UNNotificationCategoryOptionCustomDismissAction];
+        NSSet *categories = [NSSet setWithObjects:category1_ios10, nil];
+        entity.categories=categories;
+    }
+    [UNUserNotificationCenter currentNotificationCenter].delegate=self;
+    [UMessage registerForRemoteNotificationsWithLaunchOptions:launchOptions Entity:entity completionHandler:^(BOOL granted, NSError * _Nullable error) {
+        if (granted) {
+            [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+                [application registerForRemoteNotifications];
+            }];
+        }else{
+        }
+    }];
     
     
+      self.launchOptionsDic = launchOptions;
     
     // Override point for customization after application launch.
     return YES;
 }
 
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken{
+    NSLog(@"%@",[[[[deviceToken description ] stringByReplacingOccurrencesOfString: @"<" withString:@"" ]
+                  stringByReplacingOccurrencesOfString: @">" withString:@""]
+                 stringByReplacingOccurrencesOfString: @"" withString:@""
+                 ]);
+    [UMessage registerDeviceToken: deviceToken];
+}
+- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSDictionary *)userInfo
+{
+    
+    
+}
+
+// 收到友盟的消息推送
+-(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
+    if (application.applicationState == UIApplicationStateActive) {
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:[[[userInfo objectForKey:@"aps"] objectForKey:@"alert"] objectForKey:@"title"] message:[[[userInfo objectForKey:@"aps"] objectForKey:@"alert"] objectForKey:@"body"]
+                                                       delegate:nil cancelButtonTitle:@"确定" otherButtonTitles:nil];
+        [alert show];
+        return;
+    }
+    //如果是在后台挂起，用户点击进入是UIApplicationStateInactive这个状态
+    else if (application.applicationState == UIApplicationStateInactive){
+        //......
+    }
+    // 这个是友盟自带的前台弹出框
+    [UMessage setAutoAlert:NO];
+    if([[[UIDevice currentDevice] systemVersion]intValue] < 10){
+        [UMessage didReceiveRemoteNotification:userInfo];
+        completionHandler(UIBackgroundFetchResultNewData);
+    }
+}
+//iOS10新增：处理前台收到通知的代理方法
+-(void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler{
+    NSDictionary * userInfo = notification.request.content.userInfo;
+    if([notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
+        //应用处于前台时的远程推送接受
+        //关闭U-Push自带的弹出框
+        [UMessage setAutoAlert:NO];
+        //必须加这句代码
+        [UMessage didReceiveRemoteNotification:userInfo];
+    }else{
+        //应用处于前台时的本地推送接受
+    }
+    //当应用处于前台时提示设置，需要哪个可以设置哪一个
+    completionHandler(UNNotificationPresentationOptionSound|UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionAlert);
+}
+
+//iOS10新增：处理后台点击通知的代理方法
+-(void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)())completionHandler{
+    NSDictionary * userInfo = response.notification.request.content.userInfo;
+    if([response.notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
+#ifdef UM_Swift
+        [UMessageSwiftInterface didReceiveRemoteNotificationWithUserInfo:userInfo];
+#else
+        [self jumpToApageWithUserInfo:userInfo];
+        
+        //应用处于后台时的远程推送接受
+        //必须加这句代码
+        [UMessage didReceiveRemoteNotification:userInfo];
+#endif
+    }else{
+        //应用处于后台时的本地推送接受
+    }
+}
+-(void)jumpToApageWithUserInfo:(NSDictionary *)dic{
+    
+    NSLog(@"%@",dic);
+    HWTabBarViewController *TabVC  =(HWTabBarViewController *)[UIApplication sharedApplication].keyWindow.rootViewController;
+    
+    if ([dic[@"status"] isEqualToString:@"1"]) {
+        
+        NSString *typeString = dic[@"jumpType"];
+
+        if ([typeString isEqualToString:@"1"] ||[typeString isEqualToString:@"2"]) {
+            
+            newsDetailVController *newsDetail = [[newsDetailVController alloc]init];
+            
+            newsDetail.typeStr = @"0";
+            
+            newsDetail.titleStr = dic[@"title"];
+            
+            newsDetail.shareTitle = dic[@"title"];
+            
+            newsDetail.index =@"0";
+            
+            newsDetail.urlStr = [NSString stringWithFormat:@"%@/newsInfo?id=%@&move=ios",baseH5,dic[@"Id"]];
+            
+            newsDetail.shareUrl = [NSString stringWithFormat:@"%@/newsInfo?id=%@",baseH5,dic[@"Id"]];
+            
+            newsDetail.newsId = dic[@"Id"];
+            
+            newsDetail.hidesBottomBarWhenPushed = YES;
+            
+            [TabVC.viewControllers[TabVC.selectedIndex] pushViewController:newsDetail animated:YES];
+            
+            newsDetail.hidesBottomBarWhenPushed = YES;
+            
+            
+        }else if ([typeString isEqualToString:@"4"]){
+            
+            newsDetailVController *newsDetail = [[newsDetailVController alloc]init];
+            newsDetail.newsId = dic[@"Id"];
+            newsDetail.titleStr = dic[@"title"];
+            newsDetail.shareTitle = dic[@"title"];
+            newsDetail.typeStr = @"2";
+            newsDetail.index =@"0";
+            newsDetail.urlStr = dic[@"baseUrl"];
+            newsDetail.shareUrl = dic[@"baseUrl"];
+            
+            newsDetail.hidesBottomBarWhenPushed = YES;
+            
+            [TabVC.viewControllers[TabVC.selectedIndex] pushViewController:newsDetail animated:YES];
+            
+            newsDetail.hidesBottomBarWhenPushed = YES;
+            
+        }
+        
+    }else{
+        UIViewController *vc = self.window.rootViewController;
+        UITabBarController *tvc;
+        tvc = (UITabBarController *)vc;
+        tvc.selectedIndex = 0;
+    }
+    
+}
+
 
 - (void)applicationWillResignActive:(UIApplication *)application {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.

ZhongJingLianMeng/Assets.xcassets/首页/again_icon.imageset/Contents.json

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

ZhongJingLianMeng/Assets.xcassets/首页/collectionIng.imageset/Contents.json

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

ZhongJingLianMeng/Assets.xcassets/首页/collectionNo.imageset/Contents.json

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

ZhongJingLianMeng/Assets.xcassets/首页/end_icon.imageset/Contents.json

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

ZhongJingLianMeng/Info.plist

@@ -27,6 +27,10 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

ZhongJingLianMeng/ZhongJingLianMeng.entitlements

@@ -1,5 +1,8 @@
 <?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/>
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
 </plist>

ZhongJingLianMeng/main/activity(活动)/ActivityTableController.m

@@ -11,6 +11,8 @@
 #import "activityCell.h"
 #import "newModel.h"
 #import "newsDetailVController.h"
+#import "activityDetailVController.h"
+#import "activityModel.h"
 @interface ActivityTableController ()<UITableViewDelegate,UITableViewDataSource>{
         int _page;
  
@@ -108,7 +110,7 @@
         
         if (arr.count !=0 ) {
             
-            _listArray = [newModel mj_objectArrayWithKeyValuesArray:arr];
+            _listArray = [activityModel mj_objectArrayWithKeyValuesArray:arr];
             [_dataArray addObjectsFromArray:_listArray];
             
         }else if([arr count] ==0 && _page !=1){
@@ -195,9 +197,14 @@
 {
     if ([_typeString isEqualToString:@"1"]) {
         
-        activityCell *cell = [activityCell cellWith:nil tableView:tableView];
+        activityModel *model = _dataArray[indexPath.section];
+        
+        activityCell *cell = [activityCell cellWith:model tableView:tableView];
+        
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
+        
         return cell;
        
     }else{
@@ -233,6 +240,16 @@
     
     if ([_typeString isEqualToString:@"1"]) {
         
+        activityModel *model = self.dataArray[indexPath.section];
+        activityDetailVController *activityDetail = [[activityDetailVController alloc]init];
+        activityDetail.newsId = model.news_Id;
+        activityDetail.titleStr = model.title;
+        activityDetail.shareTitle = model.title;
+        activityDetail.index =@"0";
+        activityDetail.urlStr = [NSString stringWithFormat:@"%@/applyDetail?id=%@&move=ios",baseH5,model.news_Id];
+        activityDetail.shareUrl = [NSString stringWithFormat:@"%@/applyDetail?id=%@",baseH5,model.news_Id];
+        [self.navigationController pushViewController:activityDetail animated:YES];
+ 
     }else{
         
         newModel *model = self.dataArray[indexPath.row];
@@ -240,7 +257,7 @@
         newsDetail.newsId = model.news_Id;
         newsDetail.titleStr = model.title;
         newsDetail.shareTitle = model.title;
-        newsDetail.typeStr = @"1";
+        newsDetail.typeStr = @"2";
         newsDetail.index =@"0";
         newsDetail.urlStr = [NSString stringWithFormat:@"%@/reviewDetail?id=%@",baseH5,model.news_Id];
         newsDetail.shareUrl = [NSString stringWithFormat:@"%@/reviewDetail?id=%@",baseH5,model.news_Id];

ZhongJingLianMeng/main/activity(活动)/activityDetailVController.h

@@ -0,0 +1,27 @@
+//
+//  activityDetailVController.h
+//  ZhongJingLianMeng
+//
+//  Created by youke on 2018/12/6.
+//  Copyright © 2018 youke. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface activityDetailVController : UIViewController
+
+@property(nonatomic,strong)NSString *urlStr;
+
+@property(nonatomic,strong)NSString *newsId;
+
+@property(nonatomic,strong)NSString *titleStr;
+
+@property(nonatomic,strong)NSString *shareTitle;
+
+@property(nonatomic,strong)NSString *shareUrl;
+
+@property(nonatomic,strong)NSString *index;
+
+@property(nonatomic,strong)NSString *typeStr;
+
+@end

ZhongJingLianMeng/main/activity(活动)/activityDetailVController.m

@@ -0,0 +1,388 @@
+//
+//  activityDetailVController.m
+//  ZhongJingLianMeng
+//
+//  Created by youke on 2018/12/6.
+//  Copyright © 2018 youke. All rights reserved.
+//
+
+#import "activityDetailVController.h"
+#import "UIAlertController+LY.h"
+#import <JavaScriptCore/JavaScriptCore.h>
+
+#import <ShareSDK/ShareSDK.h>
+#import <ShareSDKUI/ShareSDK+SSUI.h>
+#import "ZLCWebView.h"
+#import<ShareSDKUI/SSUIShareActionSheetStyle.h>//设置简单分享菜单样式
+#import "logInViewController.h"
+@interface activityDetailVController ()<ZLCWebViewDelegate>
+@property (nonatomic, strong) ZLCWebView *webView;
+@property(nonatomic,strong) JSContext *jsContext;
+@property(nonatomic,strong)UIButton *collectionBtn;
+@property(nonatomic,strong)UIButton *sendBtn;
+@property (strong, nonatomic) HttpRequestManger *sessionManager;
+@property(nonatomic,strong)NSString *collectionStaus;
+
+@end
+
+@implementation activityDetailVController
+- (HttpRequestManger*) sessionManager{
+    if (!_sessionManager) {
+        _sessionManager = [[HttpRequestManger alloc]init];
+    }
+    return _sessionManager;
+}
+-(void)viewWillAppear:(BOOL)animated{
+    
+    [super viewWillAppear:YES];
+
+    [self loadIsCollection];
+    
+}
+
+-(void)loadIsCollection{
+    
+    kWeakSelf(self);
+    
+    NSMutableDictionary *parma = [NSMutableDictionary dictionary];
+    
+    parma[@"id"] = weakself.newsId;
+    parma[@"type"] = @"1";
+    self.sessionManager = [[HttpRequestManger alloc]init];
+    
+    [self.sessionManager sendPostHttpRequestWithUrl:isActivityCollection params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        
+        weakself.collectionStaus = response[@"activityDetail"][@"is_collect"];
+        
+        if ([weakself.collectionStaus isEqualToString:@"1"]) {
+            
+            [weakself.collectionBtn setImage:[UIImage imageNamed:@"collectionIng"] forState:UIControlStateNormal];
+
+            [_collectionBtn setTitle:@"取消收藏" forState:UIControlStateNormal];
+
+        }else{
+            
+            [weakself.collectionBtn setImage:[UIImage imageNamed:@"collectionNo"] forState:UIControlStateNormal];
+            
+            [_collectionBtn setTitle:@"收藏" forState:UIControlStateNormal];
+
+        }
+    } failure:^(NSError *error) {
+        
+        NSLog(@"%@",error);
+    }];
+    
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self.navigationView removeAllLeftButton];
+    
+    self.navigationView.titleLabel.text = self.titleStr;
+    
+    self.navigationView.titleLabel.textColor = [UIColor whiteColor];
+    
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    kWeakSelf(self);
+    [self.navigationView setNavigationBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
+    
+    [self.navigationView addLeftButtonWithImage:[UIImage imageNamed:@"back_white"] clickCallBack:^(UIView *view) {
+        
+        [weakself.navigationController popViewControllerAnimated:YES];
+        
+    }];
+    [self.navigationView addRightButtonWithImage:[UIImage imageNamed:@"share"] clickCallBack:^(UIView *view) {
+        
+        [weakself showShareView];
+        
+    }];
+    
+    UIView *bottomView = [[UIView alloc]initWithFrame:CGRectMake(0, kGScreenHeight -50, kGScreenWidth, 50)];
+    
+    bottomView.backgroundColor = [UIColor whiteColor];
+    
+    [self.view addSubview:bottomView];
+    
+    UIView *btnView = [[UIView alloc]init];
+    btnView.backgroundColor = [UIColor whiteColor];
+    [bottomView addSubview:btnView];
+    [btnView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.size.mas_equalTo(CGSizeMake(kGScreenWidth -264, 50));
+        
+        make.left.equalTo(bottomView.mas_left).offset(0);
+        
+        make.top.equalTo(bottomView.mas_top).offset(0);
+    }];
+    
+    
+    _collectionBtn  =[UIButton buttonWithType:UIButtonTypeCustom];
+    
+    [_collectionBtn setImage:[UIImage imageNamed:@"collectionNo"] forState:UIControlStateNormal];
+    
+    [_collectionBtn setTitle:@"收藏" forState:UIControlStateNormal];
+    
+    _collectionBtn.titleLabel.size = CGSizeMake(30, 15);
+    
+    _collectionBtn.titleLabel.font = TextFont(12);
+    
+    [_collectionBtn setTitleColor:[UIColor colorWithHexValue:0x333333] forState:UIControlStateNormal];
+    
+    [_collectionBtn setImageEdgeInsets:UIEdgeInsetsMake(-10, 10, 0, 0)];
+    
+    [_collectionBtn setTitleEdgeInsets:UIEdgeInsetsMake(_collectionBtn.currentImage.size.height + 10, -_collectionBtn.currentImage.size.width, 0, 0)];
+    
+    [_collectionBtn addTarget:self action:@selector(collectionClick:) forControlEvents:UIControlEventTouchUpInside];
+    
+    [btnView addSubview:_collectionBtn];
+    
+    [_collectionBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.size.mas_equalTo(CGSizeMake(50, 50));
+        
+        make.centerX.mas_equalTo(btnView.mas_centerX).offset(0);
+        
+        make.centerY.mas_equalTo(btnView.mas_centerY).offset(0);
+        
+    }];
+    
+    _sendBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    
+    [_sendBtn setTitle:@"活动报名" forState:UIControlStateNormal];
+    
+    _sendBtn.titleLabel.size = CGSizeMake(30, 15);
+    
+    _sendBtn.titleLabel.font = TextFont(15);
+    
+    [_sendBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    _sendBtn.backgroundColor = [UIColor colorWithHexValue:0x3C915C];
+    [_sendBtn addTarget:self action:@selector(OrderToClick:) forControlEvents:UIControlEventTouchUpInside];
+    [bottomView addSubview:_sendBtn];
+    [_sendBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(CGSizeMake(264, 50));
+        make.left.equalTo(btnView.mas_right).offset(0);
+        make.top.equalTo(bottomView.mas_top).offset(0);
+    }];
+    self.webView = [[ZLCWebView alloc] initWithFrame:CGRectMake(0,kIs_iPhoneX?35:20, kGScreenWidth,kIs_iPhoneX?kGScreenHeight -35 -70: kGScreenHeight-20 -70)];
+    if (@available(iOS 11.0, *)) {
+        
+        self.webView.wkWebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    }else {
+        
+        self.automaticallyAdjustsScrollViewInsets = NO;
+        
+    }
+    self.webView.delegate = self;
+    
+    [self.view addSubview:self.webView];
+    
+    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.urlStr]]];
+    
+    self.webView.wkWebView.scrollView.backgroundColor = [UIColor whiteColor];
+    self.webView.wkWebView.scrollView.showsVerticalScrollIndicator = NO;
+    //    self.webView.wkWebView.scrollView.showsHorizontalScrollIndicator = NO;
+    _webView.wkWebView.scrollView.bounces = NO;
+    // Do any additional setup after loading the view.
+}
+-(void)collectionClick:(UIButton *)sender{
+    
+    if (!IsStrEmpty([DKGlobal sharedInstance].token)) {
+        
+        kWeakSelf(self);
+        
+        if (![weakself.collectionStaus isEqualToString:@"0"]) {
+            
+            NSMutableDictionary *parma = [NSMutableDictionary dictionary];
+            
+            parma[@"id"] = weakself.newsId;
+            
+            parma[@"collectType"] = @"1";
+            
+            self.sessionManager = [[HttpRequestManger alloc]init];
+            
+            [self.sessionManager sendPostHttpRequestWithUrl:cancelCollection params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+                
+                [MBProgressHUD showSuccess:@"取消收藏"];
+                
+                weakself.collectionStaus = @"0";
+                
+                [weakself.collectionBtn setImage:[UIImage imageNamed:@"collectionNo"] forState:UIControlStateNormal];
+                
+                [_collectionBtn setTitle:@"收藏" forState:UIControlStateNormal];
+            } failure:^(NSError *error) {
+                
+                NSLog(@"%@",error);
+            }];
+        }else{
+            kWeakSelf(self);
+            NSMutableDictionary *parma = [NSMutableDictionary dictionary];
+            
+            parma[@"id"] = weakself.newsId;
+           
+            parma[@"type"] = @"1";
+         
+            self.sessionManager = [[HttpRequestManger alloc]init];
+            
+            [self.sessionManager sendPostHttpRequestWithUrl:collectionNews params:parma bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+                [MBProgressHUD showSuccess:@"收藏成功"];
+                
+                weakself.collectionStaus = @"1";
+                
+                [weakself.collectionBtn setImage:[UIImage imageNamed:@"collectionIng"] forState:UIControlStateNormal];
+                
+                [_collectionBtn setTitle:@"取消收藏" forState:UIControlStateNormal];
+
+                
+            } failure:^(NSError *error) {
+                NSLog(@"%@",error);
+            }];
+        }
+    }else{
+        [MBProgressHUD showError:@"请先登录"];
+        logInViewController *loginVC = [[logInViewController alloc]init];
+        [self.navigationController pushViewController:loginVC animated:YES];
+
+    }
+    
+}
+
+- (void)zlcwebViewDidStartLoad:(ZLCWebView *)webview
+{
+    [SVProgressHUD show];
+    NSLog(@"页面开始加载");
+}
+
+- (void)zlcwebView:(ZLCWebView *)webview shouldStartLoadWithURL:(NSURL *)URL
+
+{
+    
+    NSLog(@"截取到URL：%@",URL);
+}
+
+- (void)zlcwebView:(ZLCWebView *)webview didFinishLoadingURL:(NSURL *)URL
+{
+    [SVProgressHUD dismiss];
+    
+    NSLog(@"页面加载完成%@",URL);
+}
+
+- (void)zlcwebView:(ZLCWebView *)webview didFailToLoadURL:(NSURL *)URL error:(NSError *)error
+{
+    
+    [SVProgressHUD dismiss];
+    NSLog(@"加载出现错误");
+}
+
+//}
+-(void)viewWillDisappear:(BOOL)animated{
+    
+    [super viewWillDisappear:YES];
+    
+    _webView = nil;
+    
+    [self cleanCacheAndCookie];
+    
+}
+/**清除缓存和cookie*/
+- (void)cleanCacheAndCookie{
+    //清除cookies
+    NSHTTPCookie *cookie;
+    NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+    for (cookie in [storage cookies]){
+        [storage deleteCookie:cookie];
+    }
+    //清除UIWebView的缓存
+    [[NSURLCache sharedURLCache] removeAllCachedResponses];
+    NSURLCache * cache = [NSURLCache sharedURLCache];
+    [cache removeAllCachedResponses];
+    [cache setDiskCapacity:0];
+    [cache setMemoryCapacity:0];
+}
+-(void)showShareView{
+    
+    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];
+        
+        
+        [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)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

ZhongJingLianMeng/main/activity(活动)/cell/activityCell.h

@@ -15,7 +15,7 @@
 
 @property (nonatomic, strong)UIImageView *ImageNew;
 
-@property(nonatomic ,strong) UILabel *statusLb;
+@property(nonatomic ,strong) UIImageView *statusImage;
 
 + (activityCell *)cellWith:(activityModel*)model
                  tableView:(UITableView *)tableView;

ZhongJingLianMeng/main/activity(活动)/cell/activityCell.m

@@ -72,6 +72,20 @@
         make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 30, 172));
     }];
     
+    
+    _statusImage = [[UIImageView alloc]init];
+    
+    _statusImage.image = [UIImage imageNamed:@"end_icon"];
+    
+    [_ImageNew addSubview:_statusImage];
+    
+    [_statusImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(_ImageNew.mas_right);
+        make.top.equalTo(_ImageNew.mas_top).offset(18);
+        make.size.mas_equalTo(CGSizeMake(60, 25));
+    }];
+    
+    
     _titleLb= [[UILabel alloc]init];
     
     _titleLb.textAlignment = NSTextAlignmentLeft;
@@ -107,11 +121,7 @@
         make.right.equalTo(backGroundView.mas_right).offset(-15);
         make.bottom.equalTo(backGroundView.mas_bottom).offset(-10);
     }];
-    
-    
-    
-    
-    
+
 }
 
 + (activityCell *)cellWith:(activityModel*)model
@@ -131,7 +141,19 @@
 
 -(void)fillData:(activityModel*)model{
     
+    _titleLb.text = model.title;
+    
+    _timeLb.text = model.createTime;
     
+    [_ImageNew sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.img_path]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    
+    if ([model.status isEqualToString:@"0"]) {
+        
+        _statusImage.image =[UIImage imageNamed:@"again_icon"];
+    }else{
+        _statusImage.image =[UIImage imageNamed:@"end_icon"];
+
+    }
     
 }
 

ZhongJingLianMeng/main/activity(活动)/model/activityModel.h

@@ -9,5 +9,9 @@
 #import <Foundation/Foundation.h>
 
 @interface activityModel : NSObject
-
+@property (nonatomic, copy) NSString *img_path;
+@property (nonatomic, copy) NSString *news_Id;
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *createTime;
+@property (nonatomic, copy) NSString *status;
 @end

ZhongJingLianMeng/main/activity(活动)/model/activityModel.m

@@ -9,5 +9,14 @@
 #import "activityModel.h"
 
 @implementation activityModel
++ (NSDictionary *)mj_replacedKeyFromPropertyName
+{
+    return @{
+             @"news_Id" : @"id"
+             };
+}
 
+MJExtensionCodingImplementation
+// 容错处理
+- (void)setValue:(id)value forUndefinedKey:(NSString *)key {}
 @end

ZhongJingLianMeng/main/home(首页)/VipBenefitsController.h

@@ -7,7 +7,8 @@
 //
 
 #import <UIKit/UIKit.h>
-
+@class UserInfoModel;
 @interface VipBenefitsController : UIViewController
-
+@property(nonatomic,strong)NSString *VipStatus;
+@property (nonatomic, strong) UserInfoModel *UserInfoModel;
 @end

ZhongJingLianMeng/main/home(首页)/VipBenefitsController.m

@@ -8,7 +8,9 @@
 
 #import "VipBenefitsController.h"
 #import "OrderAirportPayCancelView.h"
-
+#import "UserInfoModel.h"
+#import "joinAllianceVController.h"
+#import "applyForDirectorController.h"
 @interface VipBenefitsController ()
 @property (weak, nonatomic) IBOutlet UIView *TopBgView;
 @property (weak, nonatomic) IBOutlet UIButton *commitBtn;
@@ -31,10 +33,16 @@
         [_cancelView.leftBtn setTitle:@"暂不加入" forState:UIControlStateNormal];
         [_cancelView.rightBtn setTitle:@"加入联盟" forState:UIControlStateNormal];
         _cancelView.leftBtnCallback = ^{
-            [weakSelf.navigationController popViewControllerAnimated:YES];
+            
+            [weakSelf.cancelView removeFromSuperview];
         };
         _cancelView.rightBtnCallback = ^{
-            [weakSelf.cancelView removeFromSuperview];
+            
+            joinAllianceVController *joinVC = [[joinAllianceVController alloc]init];
+            
+            joinVC.phone = weakSelf.UserInfoModel.phone;
+            
+            [weakSelf.navigationController pushViewController:joinVC animated:YES];
         };
     }
     return _cancelView;
@@ -52,6 +60,15 @@
     }];
     [self.navigationView setTitle:@"会员权益"];
     self.navigationView.titleLabel.textColor=[UIColor whiteColor];
+    
+    if ([_VipStatus isEqualToString:@"1"]||[self.UserInfoModel.level isEqualToString:@"3"]) {
+        
+        _commitBtn.hidden = YES;
+    }else{
+        
+        _commitBtn.hidden = NO;
+    }
+    
 }
 
 - (void)didReceiveMemoryWarning {
@@ -60,6 +77,53 @@
 }
 - (IBAction)commitBtn:(id)sender {
     [ToastView showToast:@"根据情况判断跳转~"];
+    
+    if ([self.UserInfoModel.level isEqualToString:@"0"]) {
+        //游客身份
+        if ( [self.UserInfoModel.auditStatus isEqualToString:@""]) {
+            
+            UIWindow *window = [[[UIApplication sharedApplication] delegate] window];
+            
+            [window addSubview: self.cancelView];
+            
+        }else if ([self.UserInfoModel.auditStatus isEqualToString:@"0"]){
+            
+            [ToastView showToast:@"您的申请正在审核中，请等待审核"];
+        }
+    }else if ([self.UserInfoModel.level isEqualToString:@"1"]){
+        //普通会员
+        if ([self.UserInfoModel.category isEqualToString:@"0"] ||[self.UserInfoModel.category isEqualToString:@"1"]) {
+            //普通会员：类别 0 开发商 1 非开发商
+            
+            if ([self.UserInfoModel.auditStatus isEqualToString:@"0"]) {
+                //申请理事审核中
+                [ToastView showToast:@"您的申请正在审核中，请等待审核"];
+                
+            }else if ([self.UserInfoModel.auditStatus isEqualToString:@""]){
+                //申请理事
+                applyForDirectorController *applyFor = [[applyForDirectorController alloc]init];
+                applyFor.name = self.UserInfoModel.name;
+                applyFor.company = self.UserInfoModel.company;
+                applyFor.job = self.UserInfoModel.position;
+                applyFor.phone = self.UserInfoModel.phone;
+                applyFor.peopleType = self.UserInfoModel.type;
+                applyFor.catetoryType = self.UserInfoModel.category;
+                applyFor.memberType = self.UserInfoModel.level;
+                [self.navigationController pushViewController:applyFor animated:YES];
+
+            }
+            
+        }else{
+            
+            //普通会员。类别：2 秘书处人员 3 专家学者 4 连锁品牌商家。待定
+            
+        }
+    }else if ([self.UserInfoModel.level isEqualToString:@"2"]){
+        //企业会员
+        [ToastView showToast:@"您已经是企业级会员，即享受常务理事的权益"];
+        
+    }
+    
 }
 
 

ZhongJingLianMeng/main/home(首页)/applyForDirectorController.h

@@ -0,0 +1,22 @@
+//
+//  applyForDirectorController.h
+//  ZhongJingLianMeng
+//
+//  Created by youke on 2018/12/5.
+//  Copyright © 2018 youke. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface applyForDirectorController : UIViewController
+
+@property(nonatomic ,strong)NSString *name;
+@property(nonatomic ,strong)NSString *company;
+@property(nonatomic ,strong)NSString *job;
+@property(nonatomic ,strong)NSString *phone;
+@property(nonatomic ,strong)NSString *peopleType;
+@property(nonatomic ,strong)NSString *catetoryType;
+@property(nonatomic ,strong)NSString *memberType;
+
+
+@end

ZhongJingLianMeng/main/home(首页)/applyForDirectorController.m

@@ -0,0 +1,333 @@
+//
+//  applyForDirectorController.m
+//  ZhongJingLianMeng
+//
+//  Created by youke on 2018/12/5.
+//  Copyright © 2018 youke. All rights reserved.
+//
+
+#import "applyForDirectorController.h"
+#import "OrderAirportPayCancelView.h"
+@interface applyForDirectorController ()<UITableViewDelegate,UITableViewDataSource>
+@property(nonatomic,strong)UILabel *titleLab;
+
+@property(nonatomic,strong)NSArray *arr1;
+@property(nonatomic,strong)UITableView *tab;
+@property(nonatomic,strong)UILabel *nameLab;
+@property(nonatomic,strong)UILabel *companyLab;
+@property(nonatomic,strong)UILabel *jobLab;
+
+@property(nonatomic,strong)UILabel *phoneLab;
+@property(nonatomic,strong)UILabel *jiGouLab;
+@property(nonatomic,strong)UILabel *typeLab;
+
+@property(nonatomic,strong)UILabel *jiBieLab;
+
+@property(nonatomic,strong)UILabel *huiFeiLab;
+
+@property(nonatomic,strong)UILabel *levelLab;
+
+@property(nonatomic,strong)UIButton *sendBtn;
+
+@property(nonatomic,strong)UIButton *commitBtn;
+@property (strong, nonatomic) OrderAirportPayCancelView *cancelView;
+
+@end
+
+@implementation applyForDirectorController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self.navigationView removeAllLeftButton];
+    self.view.backgroundColor = [UIColor colorWithHexValue:0xF7F8FA];
+    _titleLab = [[UILabel alloc]init];
+    
+    _titleLab.frame = CGRectMake(0,0, kGScreenWidth-60, 30);
+    
+    _titleLab.textColor = [UIColor whiteColor];
+    
+    _titleLab.text = @"申请理事";
+    
+    [self.navigationView setNavigationBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
+    
+    [self.navigationView addTitleView:_titleLab];
+    
+    kWeakSelf(self);
+    [self.navigationView addLeftButtonWithImage:[UIImage imageNamed:@"whiteBack"] clickCallBack:^(UIView *view) {
+        
+        UIWindow *window = [[[UIApplication sharedApplication] delegate] window];
+        
+        [window addSubview: weakself.cancelView];
+    }];
+    
+    _commitBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 80, 44)];
+    [_commitBtn setTitle:@"会费标准" forState:UIControlStateNormal];
+    [_commitBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    _commitBtn.titleLabel.font = [UIFont systemFontOfSize:15];
+    _commitBtn.hidden = NO;
+    [_commitBtn addTarget:self action:@selector(commitBtnClick:) forControlEvents:UIControlEventTouchUpInside];
+    [self.navigationView addRightView:_commitBtn clickCallback:nil];
+    
+    _tab = [[UITableView alloc]initWithFrame:CGRectMake(0, NaviHeight, kGScreenWidth, kGScreenHeight -NaviHeight -50) style:UITableViewStylePlain];
+    _tab.delegate = self;
+    _tab.dataSource = self;
+    _tab.backgroundColor = KRGB_COLOR(247, 249,251);
+    
+    [self.view addSubview:_tab];
+    if (@available(iOS 11.0, *)) {
+        _tab.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    }else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    
+    _arr1 = @[@"*真实姓名",@"*所在公司",@"*职位",@"*手机号",@"分支机构",@"类型",@"类别",@"申请级别",@"会员"];
+    
+    UIView *bottomView = [[UIView alloc]initWithFrame:CGRectMake(0, kGScreenHeight -50, kGScreenWidth, 50)];
+    bottomView.backgroundColor = [UIColor colorWithHexValue:0x3C915C];
+    [self.view addSubview:bottomView];
+    _sendBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    _sendBtn.frame = CGRectMake(0, 0, kGScreenWidth-30, 50);
+    [_sendBtn setTitle:@"提交申请" forState:UIControlStateNormal];
+    _sendBtn.backgroundColor = [UIColor colorWithHexValue:0x3C915C];
+    [_sendBtn setTintColor:[UIColor whiteColor]];
+    [_sendBtn addTarget:self action:@selector(buttonEvent:) forControlEvents:UIControlEventTouchUpInside];
+    [bottomView addSubview:_sendBtn];
+
+    // Do any additional setup after loading the view.
+}
+
+-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    
+    return 1;
+}
+
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    
+    return _arr1.count;
+}
+
+-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
+    
+    return 0.0001;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
+    
+    return 0.0001;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    return 45;
+}
+
+-(UIView*)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
+    return nil;
+}
+
+-(UIView*)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    
+    return nil;
+}
+
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    
+    UITableViewCell *cell =[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                                                  reuseIdentifier:@"cell12"];
+    if (cell ==nil) {
+        cell =
+        [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                               reuseIdentifier:@"cell12"];
+    }
+    
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    tableView.separatorColor = [UIColor colorWithHexValue:0xEAEAEA];
+    //    tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
+    tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    
+    
+    UILabel *titleLa = [[UILabel alloc]initWithFrame:CGRectMake(15, 8, 70, 30)];
+    titleLa.textColor = [UIColor blackColor];
+    titleLa.font = TextFont(15);
+    [cell addSubview:titleLa];
+    titleLa.text = _arr1[indexPath.row];
+    titleLa.textAlignment = NSTextAlignmentLeft;
+    
+    UIView *lineView =[[UIView alloc]init];
+    lineView.backgroundColor = [[UIColor colorWithHexValue:0xEAEAEA]colorWithAlphaComponent:0.6];
+    [cell addSubview:lineView];
+    [lineView mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.bottom.equalTo(cell.mas_bottom);
+        make.left.equalTo(cell.mas_left).offset(10);
+        make.size.mas_equalTo(CGSizeMake(kGScreenWidth-20, 1));
+    }];
+    
+    if (indexPath.row == 0) {
+        _nameLab = [[UILabel alloc]init];
+        _nameLab.textAlignment = NSTextAlignmentLeft;
+        _nameLab.font = TextFont(14);
+        _nameLab.text = _name;
+        _nameLab.textColor = [UIColor blackColor];
+        [cell addSubview:_nameLab];
+        [_nameLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+        }];
+    }else if (indexPath.row ==1){
+        
+        _companyLab = [[UILabel alloc]init];
+        _companyLab.textAlignment = NSTextAlignmentLeft;
+        _companyLab.font = TextFont(14);
+        _companyLab.text = _company;
+        _companyLab.textColor = [UIColor blackColor];
+        [cell addSubview:_companyLab];
+        [_companyLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+        }];
+        
+    }else if (indexPath.row ==2){
+        
+        _jobLab = [[UILabel alloc]init];
+        _jobLab.textAlignment = NSTextAlignmentLeft;
+        _jobLab.font = TextFont(14);
+        _jobLab.text = _job;
+        _jobLab.textColor = [UIColor blackColor];
+        [cell addSubview:_jobLab];
+        [_jobLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+        }];
+        
+    }else if (indexPath.row == 3){
+        
+        _phoneLab = [[UILabel alloc]init];
+        _phoneLab.textAlignment = NSTextAlignmentLeft;
+        _phoneLab.font = TextFont(14);
+        _phoneLab.text = _phone;
+        _phoneLab.textColor = [UIColor blackColor];
+        [cell addSubview:_phoneLab];
+        [_phoneLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+            
+        }];
+        
+    }else if (indexPath.row == 4){
+        
+        _jiGouLab = [[UILabel alloc]init];
+        _jiGouLab.textAlignment = NSTextAlignmentLeft;
+        _jiGouLab.font = TextFont(14);
+        _jiGouLab.text = @"请选择机构";
+        _jiGouLab.textColor = [UIColor colorWithHexValue:0x898989];
+        [cell addSubview:_jiGouLab];
+        [_jiGouLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+            
+        }];
+        
+        UIImageView *xingImage = [[UIImageView alloc]init];
+        xingImage.image = [UIImage imageNamed:@"xiajiantou"];
+        [cell addSubview:xingImage];
+        [xingImage mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.right.equalTo(cell.mas_right).offset(-15);
+            make.top.equalTo(cell.mas_top).offset(20);
+            make.size.mas_equalTo(CGSizeMake(13, 8));
+            
+        }];
+        
+    }else if (indexPath.row == 5){
+        
+        _typeLab = [[UILabel alloc]init];
+        _typeLab.textAlignment = NSTextAlignmentLeft;
+        _typeLab.font = TextFont(14);
+        _typeLab.text = _peopleType;
+        _typeLab.textColor = [UIColor colorWithHexValue:0x898989];
+        [cell addSubview:_typeLab];
+        [_typeLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+            
+        }];
+       
+    }else if (indexPath.row == 6){
+        
+        _jiBieLab = [[UILabel alloc]init];
+        _jiBieLab.textAlignment = NSTextAlignmentLeft;
+        _jiBieLab.font = TextFont(14);
+        _jiBieLab.text = _catetoryType;
+        _jiBieLab.textColor = [UIColor colorWithHexValue:0x898989];
+        [cell addSubview:_jiBieLab];
+        [_jiBieLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+            
+        }];
+      
+    }else if(indexPath.row == 7){
+        
+        _levelLab = [[UILabel alloc]init];
+        _levelLab.textAlignment = NSTextAlignmentLeft;
+        _levelLab.font = TextFont(14);
+        _levelLab.text = [NSString stringWithFormat:@"常务理事(%@)",_memberType];
+        _levelLab.textColor = [UIColor colorWithHexValue:0x898989];
+        [cell addSubview:_levelLab];
+        [_levelLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+            
+        }];
+        
+        
+        
+    }else{
+        _huiFeiLab = [[UILabel alloc]init];
+        _huiFeiLab.textAlignment = NSTextAlignmentLeft;
+        _huiFeiLab.font = TextFont(14);
+        _huiFeiLab.text = @"10000元/年";
+        _huiFeiLab.textColor = [UIColor blackColor];
+        [cell addSubview:_huiFeiLab];
+        [_huiFeiLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+            make.left.equalTo(titleLa.mas_right).offset(18);
+            make.top.equalTo(cell.mas_top).offset(8);
+            
+        }];
+    }
+    return cell;
+}
+
+
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

ZhongJingLianMeng/main/home(首页)/homePageViewController.m

@@ -20,6 +20,8 @@
 #import "logInViewController.h"
 #import "newsDetailVController.h"
 #import "UserInfoModel.h"
+#import "OrderAirportPayCancelView.h"
+#import "applyForDirectorController.h"
 @interface homePageViewController ()<UITableViewDelegate,UITableViewDataSource,HeadViewDelegate>
 
 @property(nonatomic,strong)UITableView *tab;
@@ -33,6 +35,16 @@
 @property(nonatomic,strong)NSMutableArray *dataArr;
 @property (strong, nonatomic)  UserInfoModel*userInfoModel;
 
+@property (strong, nonatomic) OrderAirportPayCancelView *cancelView;
+
+@property(nonatomic ,strong)NSString *name;
+@property(nonatomic ,strong)NSString *company;
+@property(nonatomic ,strong)NSString *job;
+@property(nonatomic ,strong)NSString *phone;
+@property(nonatomic ,strong)NSString *peopleType;
+@property(nonatomic ,strong)NSString *catetoryType;
+@property(nonatomic ,strong)NSString *memberType;
+
 @end
 
 @implementation homePageViewController
@@ -182,6 +194,7 @@
     webVC.titleStr = model.title;
     
     webVC.shareTitle = model.title;
+    
 
     webVC.index = @"1";
     
@@ -196,9 +209,13 @@
 
 -(void)selectedButton:(NSInteger)number{
     if (number == 0) {
-//         [ToastView showToast:@"加入联盟"];
-        joinAllianceVController *joinVC = [[joinAllianceVController alloc]init];
-        [self.navigationController pushViewController:joinVC animated:YES];
+        if (![DKGlobal sharedInstance].token ) {
+            logInViewController *control = [[logInViewController alloc] init];
+            [self.navigationController pushViewController:control animated:YES];
+        }else{
+            [self isPersionStatus];
+        }
+       
     }else if (number == 1){
 //         [ToastView showToast:@"联盟公告"];
         allianceNewsVController *allianceNewsVC =[[allianceNewsVController alloc]init];
@@ -222,9 +239,13 @@
         [self.navigationController pushViewController:allianceNewsVC animated:YES];
         
     }else if (number == 5){
-//         [ToastView showToast:@"会员权益"];
-        VipBenefitsController *control = [[VipBenefitsController alloc] init];
-        [self.navigationController pushViewController:control animated:YES];
+        if (![DKGlobal sharedInstance].token ) {
+            logInViewController *control = [[logInViewController alloc] init];
+            [self.navigationController pushViewController:control animated:YES];
+        }else{
+             [self VipLevelBystr:@"3"];
+        }
+
     }else if (number == 6){
 //         [ToastView showToast:@"会员需求"];
         if (![DKGlobal sharedInstance].token) {
@@ -238,6 +259,126 @@
     }
 }
 
+-(void)isPersionStatus{
+    
+    kWeakSelf(self);
+    
+    [ProgressHUD show];
+    
+    _sessionManager  =[[HttpRequestManger alloc]init];
+    
+    [_sessionManager sendPostHttpRequestWithUrl:getMemberInfo params:nil bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        
+        [ProgressHUD hide];
+        
+        NSLog(@"%@",response);
+        
+        NSDictionary *dic = [response objectForKeySafely:@"memberInfo"];
+        
+        weakself.userInfoModel = [UserInfoModel mj_objectWithKeyValues:dic];
+        
+        if ([weakself.userInfoModel.level isEqualToString:@"0"]) {
+            //游客身份
+            if ( [weakself.userInfoModel.auditStatus isEqualToString:@""]) {
+                
+                [ToastView showToast:@"您还不是会员，请加入联盟"];
+                
+                joinAllianceVController *joinVC = [[joinAllianceVController alloc]init];
+                
+                joinVC.phone = weakself.userInfoModel.phone;
+                
+                [self.navigationController pushViewController:joinVC animated:YES];
+                
+            }else if ([weakself.userInfoModel.auditStatus isEqualToString:@"0"]){
+                
+                 [ToastView showToast:@"您的申请正在审核中，请等待审核"];
+            }
+        }else if ([weakself.userInfoModel.level isEqualToString:@"1"]){
+            //普通会员
+            if ([weakself.userInfoModel.category isEqualToString:@"0"] ||[weakself.userInfoModel.category isEqualToString:@"1"]) {
+                //普通会员：类别 0 开发商 1 非开发商
+                
+                if ([weakself.userInfoModel.auditStatus isEqualToString:@"0"]) {
+                    //申请理事审核中
+                    [ToastView showToast:@"您的申请正在审核中，请等待审核"];
+                    
+                }else if ([weakself.userInfoModel.auditStatus isEqualToString:@""]){
+                    //申请理事
+                    weakself.name = weakself.userInfoModel.name;
+                    
+                    weakself.company = weakself.userInfoModel.company;
+                    
+                    weakself.job = weakself.userInfoModel.position;
+                    
+                    weakself.phone = weakself.userInfoModel.phone;
+                    
+                    weakself.peopleType = weakself.userInfoModel.type;
+                    
+                    weakself.catetoryType = weakself.userInfoModel.category;
+                    
+                    weakself.memberType = weakself.userInfoModel.level;
+                    
+                    UIWindow *window = [[[UIApplication sharedApplication] delegate] window];
+                    
+                    [window addSubview: weakself.cancelView];
+                    
+                }
+                
+            }else{
+                
+                //普通会员。类别：2 秘书处人员 3 专家学者 4 连锁品牌商家。待定
+                
+            }
+        }else if ([weakself.userInfoModel.level isEqualToString:@"2"]){
+            //企业会员
+            [ToastView showToast:@"您已经是企业级会员，即享受常务理事的权益"];
+            
+        }else if ([weakself.userInfoModel.level isEqualToString:@"3"]){
+            //常务理事
+            [ToastView showToast:@"您已经是常务理事,即将进入会员权益"];
+            VipBenefitsController *control = [[VipBenefitsController alloc] init];
+            control.VipStatus = @"1";
+            [self.navigationController pushViewController:control animated:YES];
+        }
+    } failure:^(NSError *error) {
+        NSLog(@"%@",error);
+        [ProgressHUD hide];
+    }];
+}
+- (OrderAirportPayCancelView*)cancelView{
+    WS(weakSelf);
+    if (!_cancelView) {
+        _cancelView = [[NSBundle mainBundle]loadNibNamed:@"OrderAirportPayCancelView" owner:self options:nil].firstObject;
+        _cancelView.frame = self.view.bounds;
+        //        _cancelView.isFromOrder = self.isFromOrder;
+        _cancelView.tipLabel.hidden = YES;
+        _cancelView.contentLabel.hidden = YES;
+        _cancelView.titleLabel.text = @"您已经加入联盟，是否要成为常务理事呢？";
+        _cancelView.titleLabelTop.constant = 35;
+        [_cancelView.rightBtn setBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
+        [_cancelView.leftBtn setTitle:@"确定取消" forState:UIControlStateNormal];
+        [_cancelView.rightBtn setTitle:@"继续申请" forState:UIControlStateNormal];
+        
+        _cancelView.leftBtnCallback = ^{
+            
+             [weakSelf.cancelView removeFromSuperview];
+        };
+        _cancelView.rightBtnCallback = ^{
+            applyForDirectorController *applyFor = [[applyForDirectorController alloc]init];
+            applyFor.name = weakSelf.name;
+            applyFor.company = weakSelf.company;
+            applyFor.job = weakSelf.job;
+            applyFor.phone = weakSelf.phone;
+            applyFor.peopleType = weakSelf.peopleType;
+            applyFor.catetoryType = weakSelf.catetoryType;
+            applyFor.memberType = weakSelf.memberType;
+            [weakSelf.navigationController pushViewController:applyFor animated:YES];
+            
+        };
+    }
+    return _cancelView;
+}
+
 - (void)VipLevelBystr:(NSString *)string
 {
     WS(weakSelf)
@@ -261,6 +402,11 @@
                 VipDemandController *control = [[VipDemandController alloc] init];
                 control.UserInfoModel = weakSelf.userInfoModel;
                 [self.navigationController pushViewController:control animated:YES];
+            }else if ([string isEqualToString:@"3"]){
+                VipBenefitsController *control = [[VipBenefitsController alloc] init];
+                control.UserInfoModel = weakSelf.userInfoModel;
+                [self.navigationController pushViewController:control animated:YES];
+                
             }
         }
     } failure:^(NSError *error) {

ZhongJingLianMeng/main/home(首页)/joinAllianceVController.h

@@ -10,4 +10,6 @@
 
 @interface joinAllianceVController : UIViewController
 
+@property(nonatomic,strong)NSString *phone;
+
 @end

ZhongJingLianMeng/main/home(首页)/joinAllianceVController.m

@@ -85,7 +85,7 @@
     bottomView.backgroundColor = [UIColor colorWithHexValue:0x3C915C];
     [self.view addSubview:bottomView];
     _sendBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    _sendBtn.frame = CGRectMake(0, 0, kGScreenWidth-30, 50);
+    _sendBtn.frame = CGRectMake(0, 0, kGScreenWidth, 50);
     [_sendBtn setTitle:@"提交申请" forState:UIControlStateNormal];
     _sendBtn.backgroundColor = [UIColor colorWithHexValue:0x3C915C];
     [_sendBtn setTintColor:[UIColor whiteColor]];
@@ -230,7 +230,7 @@
         _phoneLab = [[UILabel alloc]init];
         _phoneLab.textAlignment = NSTextAlignmentLeft;
         _phoneLab.font = TextFont(14);
-        _phoneLab.text = @"150****2935";
+        _phoneLab.text = _phone;
         _phoneLab.textColor = [UIColor blackColor];
         [cell addSubview:_phoneLab];
         [_phoneLab mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -335,13 +335,7 @@
     }
         
   
-    
-    
-    
-    
-    
-    
-    
+
     
     return cell;
 }

ZhongJingLianMeng/main/home(首页)/newsDetailVController.m

@@ -29,8 +29,11 @@
 @implementation newsDetailVController
 
 - (HttpRequestManger*) sessionManager{
+    
     if (!_sessionManager) {
+        
         _sessionManager = [[HttpRequestManger alloc]init];
+        
     }
     return _sessionManager;
 }
@@ -42,8 +45,6 @@
         
         [self loadIsCollection:self.typeStr];
     }
-   
-    
 }
 -(void)loadIsCollection:(NSString *)typeString{
     
@@ -201,7 +202,7 @@
             
             parma[@"id"] = weakself.newsId;
             
-            if ([_typeStr isEqualToString:@"1"]) {
+            if ([_typeStr isEqualToString:@"2"]) {
                 
                  parma[@"collectType"] = @"2";
                 
@@ -231,7 +232,7 @@
             NSMutableDictionary *parma = [NSMutableDictionary dictionary];
             
             parma[@"id"] = weakself.newsId;
-            if ([_typeStr isEqualToString:@"1"]) {
+            if ([_typeStr isEqualToString:@"2"]) {
                  parma[@"type"] = @"2";
             }else{
                 

ZhongJingLianMeng/main/me(我的)/model/UserInfoModel.h

@@ -23,7 +23,7 @@
 @property (nonatomic, copy) NSString *category;
 @property (nonatomic, copy) NSString *committee_id;
 
-
+@property(nonatomic,copy) NSString *auditStatus;
 
 
 @end

ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0/UMAnalytics.framework/5.5.0_443a85fb47_20180329145809

@@ -0,0 +1 @@
+5.5.0

ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0/UMAnalytics.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0/UMAnalytics.framework/UMAnalytics

@@ -0,0 +1 @@
+Versions/Current/UMAnalytics

ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0/UMAnalytics.framework/Versions/A/Headers/DplusMobClick.h

@@ -0,0 +1,77 @@
+//
+//  DplusMobClick.h
+//  Analytics
+//
+//  Copyright (C) 2010-2016 Umeng.com . All rights reserved.
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+
+@interface DplusMobClick : NSObject
+
+/** Dplus增加事件
+ @param eventName 事件名
+ @param property 自定义属性
+ */
++(void) track:(NSString *)eventName;
++(void) track:(NSString *)eventName property:(NSDictionary *) property;
+
+/**
+ * 设置属性 键值对 会覆盖同名的key
+ * 将该函数指定的key-value写入dplus专用文件；APP启动时会自动读取该文件的所有key-value，并将key-value自动作为后续所有track事件的属性。
+ */
++(void) registerSuperProperty:(NSDictionary *)property;
+
+/**
+ *
+ * 从dplus专用文件中删除指定key-value
+ @param key
+ */
++(void) unregisterSuperProperty:(NSString *)propertyName;
+
+/**
+ *
+ * 返回dplus专用文件中key对应的value；如果不存在，则返回空。
+ @param key
+ @return void
+ */
++(NSString *)getSuperProperty:(NSString *)propertyName;
+
+/**
+ * 返回Dplus专用文件中的所有key-value；如果不存在，则返回空。
+ */
++(NSDictionary *)getSuperProperties;
+
+/**
+ *清空Dplus专用文件中的所有key-value。
+ */
++(void)clearSuperProperties;
+
+/**
+ * 设置预置事件属性 键值对 会覆盖同名的key
+ */
++(void) registerPreProperties:(NSDictionary *)property;
+
+/**
+ *
+ * 删除指定预置事件属性
+ @param key
+ */
++(void) unregisterPreProperty:(NSString *)propertyName;
+
+/**
+ * 获取预置事件所有属性；如果不存在，则返回空。
+ */
++(NSDictionary *)getPreProperties;
+
+/**
+ *清空所有预置事件属性。
+ */
++(void)clearPreProperties;
+
+
+/**
+ * 设置关注事件是否首次触发,只关注eventList前五个合法eventID.只要已经保存五个,此接口无效
+ */
++(void)setFirstLaunchEvent:(NSArray *)eventList;
+@end

ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0/UMAnalytics.framework/Versions/A/Headers/MobClick.h

@@ -0,0 +1,214 @@
+//
+//  MobClick.h
+//  Analytics
+//
+//  Copyright (C) 2010-2017 Umeng.com . All rights reserved.
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+
+typedef void(^CallbackBlock)();
+
+/**
+ 统计的场景类别，默认为普通统计；若使用游戏统计API，则需选择游戏场景类别，如E_UM_GAME。
+ */
+typedef NS_ENUM (NSUInteger, eScenarioType)
+{
+    E_UM_NORMAL = 0,    // default value
+    E_UM_GAME   = 1,    // game
+    E_UM_DPLUS  = 4    // DPlus
+};
+
+@class CLLocation;
+@interface MobClick : NSObject <UIAlertViewDelegate>
+
+#pragma mark basics
+
+///---------------------------------------------------------------------------------------
+/// @name  设置
+///---------------------------------------------------------------------------------------
+
+/** 设置 统计场景类型，默认为普通应用统计：E_UM_NORMAL
+ @param 游戏统计必须设置为：E_UM_GAME.
+ @return void.
+ */
++ (void)setScenarioType:(eScenarioType)eSType;
+
+/** 开启CrashReport收集, 默认YES(开启状态).
+ @param value 设置为NO,可关闭友盟CrashReport收集功能.
+ @return void.
+*/
++ (void)setCrashReportEnabled:(BOOL)value;
+
+#pragma mark event logs
+///---------------------------------------------------------------------------------------
+/// @name  页面计时
+///---------------------------------------------------------------------------------------
+
+/** 手动页面时长统计, 记录某个页面展示的时长.
+ @param pageName 统计的页面名称.
+ @param seconds 单位为秒，int型.
+ @return void.
+ */
++ (void)logPageView:(NSString *)pageName seconds:(int)seconds;
+
+/** 自动页面时长统计, 开始记录某个页面展示时长.
+ 使用方法：必须配对调用beginLogPageView:和endLogPageView:两个函数来完成自动统计，若只调用某一个函数不会生成有效数据。
+ 在该页面展示时调用beginLogPageView:，当退出该页面时调用endLogPageView:
+ @param pageName 统计的页面名称.
+ @return void.
+ */
++ (void)beginLogPageView:(NSString *)pageName;
+
+/** 自动页面时长统计, 结束记录某个页面展示时长.
+ 使用方法：必须配对调用beginLogPageView:和endLogPageView:两个函数来完成自动统计，若只调用某一个函数不会生成有效数据。
+ 在该页面展示时调用beginLogPageView:，当退出该页面时调用endLogPageView:
+ @param pageName 统计的页面名称.
+ @return void.
+ */
++ (void)endLogPageView:(NSString *)pageName;
+
+
+///---------------------------------------------------------------------------------------
+/// @name  事件统计
+///---------------------------------------------------------------------------------------
+
+/** 自定义事件,数量统计.
+使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID
+ 
+ @param  eventId 网站上注册的事件Id.
+ @param  label 分类标签。不同的标签会分别进行统计，方便同一事件的不同标签的对比,为nil或空字符串时后台会生成和eventId同名的标签.
+ @param  accumulation 累加值。为减少网络交互，可以自行对某一事件ID的某一分类标签进行累加，再传入次数作为参数。
+ @return void.
+ */
++ (void)event:(NSString *)eventId; //等同于 event:eventId label:eventId;
+/** 自定义事件,数量统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID
+ */
++ (void)event:(NSString *)eventId label:(NSString *)label; // label为nil或@""时，等同于 event:eventId label:eventId;
+
+/** 自定义事件,数量统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID
+ */
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes;
+
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes counter:(int)number;
+
+/** 自定义事件,时长统计.
+    使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+    beginEvent,endEvent要配对使用,也可以自己计时后通过durations参数传递进来
+ 
+ @param  eventId 网站上注册的事件Id.
+ @param  label 分类标签。不同的标签会分别进行统计，方便同一事件的不同标签的对比,为nil或空字符串时后台会生成和eventId同名的标签.
+ @param  primarykey 这个参数用于和event_id一起标示一个唯一事件，并不会被统计；对于同一个事件在beginEvent和endEvent 中要传递相同的eventId 和 primarykey
+ @param millisecond 自己计时需要的话需要传毫秒进来
+ @return void.
+ 
+ @warning 每个event的attributes不能超过10个
+    eventId、attributes中key和value都不能使用空格和特殊字符，必须是NSString,且长度不能超过255个字符（否则将截取前255个字符）
+    id， ts， du是保留字段，不能作为eventId及key的名称
+*/
++ (void)beginEvent:(NSString *)eventId;
+
+/** 自定义事件,时长统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+ */
+
++ (void)endEvent:(NSString *)eventId;
+/** 自定义事件,时长统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+ */
+
++ (void)beginEvent:(NSString *)eventId label:(NSString *)label;
+/** 自定义事件,时长统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+ */
+
++ (void)endEvent:(NSString *)eventId label:(NSString *)label;
+/** 自定义事件,时长统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+ */
+
++ (void)beginEvent:(NSString *)eventId primarykey :(NSString *)keyName attributes:(NSDictionary *)attributes;
+/** 自定义事件,时长统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+ */
+
++ (void)endEvent:(NSString *)eventId primarykey:(NSString *)keyName;
+/** 自定义事件,时长统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+ */
+
++ (void)event:(NSString *)eventId durations:(int)millisecond;
+/** 自定义事件,时长统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+ */
+
++ (void)event:(NSString *)eventId label:(NSString *)label durations:(int)millisecond;
+/** 自定义事件,时长统计.
+ 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID.
+ */
++ (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes durations:(int)millisecond;
+
+
+#pragma mark - user methods
+/** active user sign-in.
+ 使用sign-In函数后，如果结束该PUID的统计，需要调用sign-Off函数
+ @param puid : user's ID
+ @param provider : 不能以下划线"_"开头，使用大写字母和数字标识; 如果是上市公司，建议使用股票代码。
+ @return void.
+ */
++ (void)profileSignInWithPUID:(NSString *)puid;
++ (void)profileSignInWithPUID:(NSString *)puid provider:(NSString *)provider;
+
+/** active user sign-off.
+ 停止sign-in PUID的统计
+ @return void.
+ */
++ (void)profileSignOff;
+
+///---------------------------------------------------------------------------------------
+/// @name 地理位置设置
+/// 需要链接 CoreLocation.framework 并且 #import <CoreLocation/CoreLocation.h>
+///---------------------------------------------------------------------------------------
+
+/** 设置经纬度信息
+ @param latitude 纬度.
+ @param longitude 经度.
+ @return void
+ */
++ (void)setLatitude:(double)latitude longitude:(double)longitude;
+
+/** 设置经纬度信息
+ @param location CLLocation 经纬度信息
+ @return void
+ */
++ (void)setLocation:(CLLocation *)location;
+
+///---------------------------------------------------------------------------------------
+/// @name Utility函数
+///---------------------------------------------------------------------------------------
+
+/** 判断设备是否越狱，依据是否存在apt和Cydia.app
+ */
++ (BOOL)isJailbroken;
+
+/** 判断App是否被破解
+ */
++ (BOOL)isPirated;
+
+/** 设置 app secret
+ @param secret string
+ @return void.
+ */
++ (void)setSecret:(NSString *)secret;
+
++ (void)setCrashCBBlock:(CallbackBlock)cbBlock;
+
+/** DeepLink事件
+ @param link 唤起应用的link
+ @return void.
+ */
++ (void)onDeepLinkReceived:(NSURL *)link;
+
+@end

ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0/UMAnalytics.framework/Versions/A/Headers/MobClickGameAnalytics.h

@@ -0,0 +1,184 @@
+//
+//  MobClickGameAnalytics.h
+//  Analytics
+//
+//  Copyright (C) 2010-2014 Umeng.com . All rights reserved.
+
+@interface MobClickGameAnalytics : NSObject
+
+#pragma mark - account function
+/** active user sign-in.
+ 使用sign-In函数后，如果结束该PUID的统计，需要调用sign-Off函数
+ @param puid : user's ID
+ @param provider : 不能以下划线"_"开头，使用大写字母和数字标识; 如果是上市公司，建议使用股票代码。
+ @return void.
+ */
++ (void)profileSignInWithPUID:(NSString *)puid;
++ (void)profileSignInWithPUID:(NSString *)puid provider:(NSString *)provider;
+
+/** active user sign-off.
+ 停止sign-in PUID的统计
+ @return void.
+ */
++ (void)profileSignOff;
+
+#pragma mark GameLevel methods
+///---------------------------------------------------------------------------------------
+/// @name  set game level
+///---------------------------------------------------------------------------------------
+
+/** 设置玩家的等级.
+ */
+
+/** 设置玩家等级属性.
+ @param level 玩家等级
+ @return void
+ */
++ (void)setUserLevelId:(int)level;
+
+///---------------------------------------------------------------------------------------
+/// @name  关卡统计
+///---------------------------------------------------------------------------------------
+
+/** 记录玩家进入关卡，通过关卡及失败的情况.
+ */
+
+
+/** 进入关卡.
+ @param level 关卡
+ @return void
+ */
++ (void)startLevel:(NSString *)level;
+
+/** 通过关卡.
+ @param level 关卡,如果level == nil 则为当前关卡
+ @return void
+ */
++ (void)finishLevel:(NSString *)level;
+
+/** 未通过关卡.
+ @param level 关卡,如果level == nil 则为当前关卡
+ @return void
+ */
+
++ (void)failLevel:(NSString *)level;
+
+
+#pragma mark -
+#pragma mark Pay methods
+
+///---------------------------------------------------------------------------------------
+/// @name  支付统计
+///---------------------------------------------------------------------------------------
+
+/** 记录玩家交易兑换货币的情况
+ @param currencyAmount 现金或等价物总额
+ @param currencyType 为ISO4217定义的3位字母代码，如CNY,USD等（如使用其它自定义等价物作为现金，可使用ISO4217中未定义的3位字母组合传入货币类型）
+ @param virtualAmount 虚拟币数量
+ @param channel 支付渠道
+ @param orderId 交易订单ID
+ @return void
+ */
++ (void)exchange:(NSString *)orderId currencyAmount:(double)currencyAmount currencyType:(NSString *)currencyType virtualCurrencyAmount:(double)virtualAmount paychannel:(int)channel;
+
+/** 玩家支付货币兑换虚拟币.
+ @param cash 真实货币数量
+ @param source 支付渠道
+ @param coin 虚拟币数量
+ @return void
+ */
+
++ (void)pay:(double)cash source:(int)source coin:(double)coin;
+
+/** 玩家支付货币购买道具.
+ @param cash 真实货币数量
+ @param source 支付渠道
+ @param item 道具名称
+ @param amount 道具数量
+ @param price 道具单价
+ @return void
+ */
++ (void)pay:(double)cash source:(int)source item:(NSString *)item amount:(int)amount price:(double)price;
+
+
+#pragma mark -
+#pragma mark Buy methods
+
+///---------------------------------------------------------------------------------------
+/// @name  虚拟币购买统计
+///---------------------------------------------------------------------------------------
+
+/** 记录玩家使用虚拟币的消费情况
+ */
+
+
+/** 玩家使用虚拟币购买道具
+@param item 道具名称
+@param amount 道具数量
+@param price 道具单价
+@return void
+ */
++ (void)buy:(NSString *)item amount:(int)amount price:(double)price;
+
+
+#pragma mark -
+#pragma mark Use methods
+
+
+///---------------------------------------------------------------------------------------
+/// @name  道具消耗统计
+///---------------------------------------------------------------------------------------
+
+/** 记录玩家道具消费情况
+ */
+
+
+/** 玩家使用虚拟币购买道具
+@param item 道具名称
+@param amount 道具数量
+@param price 道具单价
+@return void
+ */
+
++ (void)use:(NSString *)item amount:(int)amount price:(double)price;
+
+
+#pragma mark -
+#pragma mark Bonus methods
+
+
+///---------------------------------------------------------------------------------------
+/// @name  虚拟币及道具奖励统计
+///---------------------------------------------------------------------------------------
+
+/** 记录玩家获赠虚拟币及道具的情况
+ */
+
+
+/** 玩家获虚拟币奖励
+@param coin 虚拟币数量
+@param source 奖励方式
+@return void
+ */
+
++ (void)bonus:(double)coin source:(int)source;
+
+/** 玩家获道具奖励
+@param item 道具名称
+@param amount 道具数量
+@param price 道具单价
+@param source 奖励方式
+@return void
+ */
+
++ (void)bonus:(NSString *)item amount:(int)amount price:(double)price source:(int)source;
+
+#pragma mark DEPRECATED
+
+//已经被新的setUserLevelId:方法替代，请使用新的API。
++ (void)setUserLevel:(NSString *)level;
+
+//已经被新的active user方法替代，请使用新的API。
++ (void)setUserID:(NSString *)userId sex:(int)sex age:(int)age platform:(NSString *)platform;
+
+@end

ZhongJingLianMeng/other/Youmeng/analytics/analytics_ios_5.5.0/UMAnalytics.framework/Versions/Current

@@ -0,0 +1 @@
+A

ZhongJingLianMeng/other/Youmeng/common/common_ios_1.5.0/normal/UMCommon.framework/1.5.0_a340324cb9_20180329145728

@@ -0,0 +1 @@
+1.5.0

ZhongJingLianMeng/other/Youmeng/common/common_ios_1.5.0/normal/UMCommon.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

ZhongJingLianMeng/other/Youmeng/common/common_ios_1.5.0/normal/UMCommon.framework/UMCommon

@@ -0,0 +1 @@
+Versions/Current/UMCommon

ZhongJingLianMeng/other/Youmeng/common/common_ios_1.5.0/normal/UMCommon.framework/Versions/A/Headers/UMCommon.h

@@ -0,0 +1,19 @@
+//
+//  UMCommon.h
+//  UMCommon
+//
+//  Created by San Zhang on 11/2/16.
+//  Copyright © 2016 UMeng. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for UMCommon.
+FOUNDATION_EXPORT double UMCommonVersionNumber;
+
+//! Project version string for UMCommon.
+FOUNDATION_EXPORT const unsigned char UMCommonVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <UMCommon/PublicHeader.h>
+
+#import <UMCommon/UMConfigure.h>

ZhongJingLianMeng/other/Youmeng/common/common_ios_1.5.0/normal/UMCommon.framework/Versions/A/Headers/UMConfigure.h

@@ -0,0 +1,38 @@
+//
+//  UMConfigure.h
+//  UMCommon
+//
+//  Created by San Zhang on 9/6/16.
+//  Copyright © 2016 UMeng. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface UMConfigure : NSObject
+
+/** 初始化友盟所有组件产品
+ @param appKey 开发者在友盟官网申请的appkey.
+ @param channel 渠道标识，可设置nil表示"App Store".
+ */
++ (void)initWithAppkey:(NSString *)appKey channel:(NSString *)channel;
+
+/** 设置是否在console输出sdk的log信息.
+ @param bFlag 默认NO(不输出log); 设置为YES, 输出可供调试参考的log信息. 发布产品时必须设置为NO.
+ */
++ (void)setLogEnabled:(BOOL)bFlag;
+
+/** 设置是否对日志信息进行加密, 默认NO(不加密).
+ @param value 设置为YES, umeng SDK 会将日志信息做加密处理
+ */
++ (void)setEncryptEnabled:(BOOL)value;
+
++ (NSString *)umidString;
+
+/**
+ 集成测试需要device_id
+ */
++ (NSString*)deviceIDForIntegration;
+
+
+
+@end

ZhongJingLianMeng/other/Youmeng/common/common_ios_1.5.0/normal/UMCommon.framework/Versions/Current

@@ -0,0 +1 @@
+A

ZhongJingLianMeng/other/Youmeng/push/push_ios_3.2.1/UMPush.framework/3.2.1_53c5a11395_20180418134515

@@ -0,0 +1 @@
+3.2.1

ZhongJingLianMeng/other/Youmeng/push/push_ios_3.2.1/UMPush.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

ZhongJingLianMeng/other/Youmeng/push/push_ios_3.2.1/UMPush.framework/UMPush

@@ -0,0 +1 @@
+Versions/Current/UMPush

ZhongJingLianMeng/other/Youmeng/push/push_ios_3.2.1/UMPush.framework/Versions/A/Headers/UMessage.h

@@ -0,0 +1,249 @@
+//
+//  UMessage.h
+//  UMessage
+//
+//  Created by shile on 2017/4/1.
+//  Copyright © 2017年 umeng.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <UserNotifications/UserNotifications.h>
+/** String type for alias
+ */
+//新浪微博
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeSina;
+//腾讯微博
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeTencent;
+//QQ
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeQQ;
+//微信
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeWeiXin;
+//百度
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeBaidu;
+//人人网
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeRenRen;
+//开心网
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeKaixin;
+//豆瓣
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeDouban;
+//facebook
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeFacebook;
+//twitter
+UIKIT_EXTERN NSString * __nonnull const kUMessageAliasTypeTwitter;
+
+
+//error for handle
+extern NSString * __nonnull const kUMessageErrorDomain;
+
+typedef NS_ENUM(NSInteger, kUMessageError) {
+    /**未知错误*/
+    kUMessageErrorUnknown = 0,
+    /**响应出错*/
+    kUMessageErrorResponseErr = 1,
+    /**操作失败*/
+    kUMessageErrorOperateErr = 2,
+    /**参数非法*/
+    kUMessageErrorParamErr = 3,
+    /**条件不足(如:还未获取device_token，添加tag是不成功的)*/
+    kUMessageErrorDependsErr = 4,
+    /**服务器限定操作*/
+    kUMessageErrorServerSetErr = 5,
+};
+
+typedef NS_OPTIONS(NSUInteger, UMessageAuthorizationOptions) {
+    UMessageAuthorizationOptionNone    = 0,
+    UMessageAuthorizationOptionBadge   = (1 << 0),
+    UMessageAuthorizationOptionSound   = (1 << 1),
+    UMessageAuthorizationOptionAlert   = (1 << 2),
+};
+
+typedef void (^UMPlaunchFinishBlock)();
+
+@interface UMessageRegisterEntity : NSObject
+//需要注册的类型
+@property (nonatomic, assign) NSInteger types;
+
+@property (nonatomic, strong) NSSet * __nullable categories;
+@end
+
+/** UMessage：开发者使用主类（API）
+ */
+@interface UMessage : NSObject
+
+
+///---------------------------------------------------------------------------------------
+/// @name settings（most required）
+///---------------------------------------------------------------------------------------
+
+//--required
+
+/**
+ 友盟推送的注册接口
+
+ @param launchOptions 系统的launchOptions启动消息参数用于处理用户通过消息打开应用相关信息。
+ @param entity 友盟推送的注册类如果使用默认的注册，Entity设置为nil即可。如需其他的可选择其他参数，具体的参考demo或者文档。
+ @param completionHandler iOS10授权后的回调。
+ */
++ (void)registerForRemoteNotificationsWithLaunchOptions:(NSDictionary * __nullable)launchOptions Entity:(UMessageRegisterEntity * __nullable)entity completionHandler:(void (^ __nullable)(BOOL granted, NSError *_Nullable error))completionHandler;
+
+
+/** 解除RemoteNotification的注册（关闭消息推送，实际调用：[[UIApplication sharedApplication] unregisterForRemoteNotifications]）
+ 
+ iOS10.0，iOS10.1两个版本存在系统bug,调用此方法后可能会导致无法再次打开推送
+ */
++ (void)unregisterForRemoteNotifications;
+
+/** 向友盟注册该设备的deviceToken，便于发送Push消息
+ @param deviceToken APNs返回的deviceToken
+ */
++ (void)registerDeviceToken:( NSData * __nullable)deviceToken;
+
+/** 应用处于运行时（前台、后台）的消息处理，回传点击数据
+ @param userInfo 消息参数
+ */
++ (void)didReceiveRemoteNotification:( NSDictionary * __nullable)userInfo;
+
+/** 设置是否允许SDK自动清空角标（默认开启）
+ @param value 是否开启角标清空
+ */
++ (void)setBadgeClear:(BOOL)value;
+
+/** 设置是否允许SDK当应用在前台运行收到Push时弹出Alert框（默认开启）
+ @param value 是否开启弹出框
+ */
++ (void)setAutoAlert:(BOOL)value;
+
+/** 为某个消息发送点击事件
+ */
++ (void)sendClickReportForRemoteNotification:(NSDictionary * __nullable)userInfo;
+
+
+///---------------------------------------------------------------------------------------
+/// @name tag (optional)
+///---------------------------------------------------------------------------------------
+
+
+/** 获取当前绑定设备上的所有tag(每台设备最多绑定1024个tag)
+ @warning 获取列表的先决条件是已经成功获取到device_token，否则失败(kUMessageErrorDependsErr)
+ @param handle responseTags为绑定的tag
+ 集合,remain剩余可用的tag数,为-1时表示异常,error为获取失败时的信息(ErrCode:kUMessageError)
+ */
++ (void)getTags:(void (^__nonnull)(NSSet * __nonnull responseTags,NSInteger remain,NSError * __nullable error))handle;
+
+/** 绑定一个或多个tag至设备，每台设备最多绑定1024个tag，超过1024个，绑定tag不再成功，可`removeTag`来精简空间
+ @warning 添加tag的先决条件是已经成功获取到device_token，否则直接添加失败(kUMessageErrorDependsErr)
+ @param tag tag标记,可以为单个tag（NSString）也可以为tag集合（NSArray、NSSet），单个tag最大允许长度128字节，编码UTF-8，超过长度绑定失败
+ @param handle responseTags为绑定的tag集合,remain剩余可用的tag数,为-1时表示异常,error为获取失败时的信息(ErrCode:kUMessageError)
+ */
++ (void)addTags:(__nonnull id)tag response:( void (^ __nonnull)(id __nullable responseObject ,NSInteger remain,NSError * __nullable error))handle;
+
+/** 删除设备中绑定的一个或多个tag
+ @warning 添加tag的先决条件是已经成功获取到device_token，否则失败(kUMessageErrorDependsErr)
+ @param tag tag标记,可以为单个tag（NSString）也可以为tag集合（NSArray、NSSet），单个tag最大允许长度128字节，编码UTF-8，超过长度删除失败
+ @param handle responseTags为绑定的tag集合,remain剩余可用的tag数,为-1时表示异常,error为获取失败时的信息(ErrCode:kUMessageError)
+ */
++ (void)deleteTags:(__nonnull id)tag response:(void (^__nonnull)(id __nullable responseObject,NSInteger remain,NSError * __nullable error))handle;
+
+
+///---------------------------------------------------------------------------------------
+/// @name WeightedTag (optional)
+///---------------------------------------------------------------------------------------
+
+/**
+ 绑定一个或多个weightedtag以及权值至设备
+
+ @warning 添加tag的先决条件是已经成功获取到device_token，否则直接添加失败(kUMessageErrorDependsErr)
+ @param weightedTag tag标记,为NSDictionary类型，key为weightedtag名称，value为权值。
+ @param handle responseTags为绑定的tag集合,remain剩余可用的tag数,为-1时表示异常,error为获取失败时的信息(ErrCode:kUMessageError)
+ */
++ (void)addWeightedTags:(NSDictionary * __nonnull)weightedTag response:(void (^__nonnull)(id __nullable responseObject ,NSInteger remain,NSError * __nullable error))handle;
+
+/** 获取当前绑定设备上的所有Weightedtag
+ @warning 获取列表的先决条件是已经成功获取到device_token，否则失败(kUMessageErrorDependsErr)
+ @param handle responseWeightedTags为绑定的WeightedTags字典，key为weightedtag名称，value为权值,remain剩余可用的weightedtag数,为-1时表示异常,error为获取失败时的信息(ErrCode:kUMessageError)
+ */
++ (void)getWeightedTags:(void (^__nonnull)(NSDictionary * __nullable responseWeightedTags,NSInteger remain,NSError * __nullable error))handle;
+
+/**
+ 删除一个设备中绑定的一个或多个weightedtag
+ 
+ @warning 添加tag的先决条件是已经成功获取到device_token，否则直接添加失败(kUMessageErrorDependsErr)
+ @param weightedTags tag标记,为NSDictionary类型，key为tag名称，value为权值。
+ @param handle responseTags为绑定的tag集合,remain剩余可用的tag数,为-1时表示异常,error为获取失败时的信息(ErrCode:kUMessageError)
+ */
++ (void)deleteWeightedTags:(id __nonnull)weightedTags response:(void (^__nonnull)(id __nullable responseObject,NSInteger remain,NSError * __nullable error))handle;
+
+/// @name alias (optional)
+///---------------------------------------------------------------------------------------
+
+
+/** 绑定一个别名至设备（含账户，和平台类型）
+ @warning 添加Alias的先决条件是已经成功获取到device_token，否则失败(kUMessageErrorDependsErr)
+ @param name 账户，例如email
+ @param type 平台类型，参见本文件头部的`kUMessageAliasType...`，例如：kUMessageAliasTypeSina
+ @param handle block返回数据，error为获取失败时的信息，responseObject为成功返回的数据
+ */
++ (void)addAlias:(NSString * __nonnull)name type:(NSString * __nonnull)type response:(void (^__nonnull)(id __nullable responseObject,NSError * __nullable error))handle;
+
+/** 绑定一个别名至设备（含账户，和平台类型）,并解绑这个别名曾今绑定过的设备。
+ @warning 添加Alias的先决条件是已经成功获取到device_token，否则失败(kUMessageErrorDependsErr)
+ @param name 账户，例如email
+ @param type 平台类型，参见本文件头部的`kUMessageAliasType...`，例如：kUMessageAliasTypeSina
+ @param handle block返回数据，error为获取失败时的信息，responseObject为成功返回的数据
+ */
++ (void)setAlias:(NSString * __nonnull )name type:(NSString * __nonnull)type response:(void (^__nonnull)(id __nullable responseObject,NSError * __nullable error))handle;
+
+/** 删除一个设备的别名绑定
+ @warning 删除Alias的先决条件是已经成功获取到device_token，否则失败(kUMessageErrorDependsErr)
+ @param name 账户，例如email
+ @param type 平台类型，参见本文件头部的`kUMessageAliasType...`，例如：kUMessageAliasTypeSina
+ @param handle block返回数据，error为获取失败时的信息，responseObject为成功返回的数据
+ */
++ (void)removeAlias:(NSString * __nonnull)name type:(NSString * __nonnull)type response:(void (^__nonnull)(id __nullable responseObject, NSError * __nullable error))handle;
+
+
+/** 添加一个启动页的开屏消息
+ */
++(void)addLaunchMessage;
+
+/** 添加一个插屏消息
+ @warning 需先在触发一次才可以在后台配置中找到该标识
+ @param label 当前位置的标识
+ */
++(void)addCardMessageWithLabel:(NSString* __nonnull)label;
+
+/**
+ @warning 需先在触发一次才可以在后台配置中找到该标识
+ 添加一个自定义插屏消息
+
+ @param portraitsize portrait时显示的size
+ @param landscapesize landscape时显示的大小
+ @param button button 可以自定义的button
+ @param label 标识
+ */
++(void)addCustomCardMessageWithPortraitSize:(CGSize )portraitsize LandscapeSize:(CGSize )landscapesize CloseBtn:(UIButton * __nullable )button  Label:(NSString * __nonnull)label umCustomCloseButtonDisplayMode:(BOOL )displaymode;
+
+
+/**
+ @warning 需先在触发一次才可以在后台配置中找到该标识
+ 增加一个文本插屏消息
+
+ @param label 当前位置的标识
+ */
++(void)addPlainTextCardMessageWithTitleFont:(UIFont * __nullable)titlefont ContentFont:(UIFont * __nullable)contentfont buttonFont:(UIFont * __nullable)buttonfont Label:(NSString * __nonnull)label;;
+
+/**
+ 设置应用内通知的模式
+
+ @param debugmode 是否是debug模式
+ */
++(void)openDebugMode:(BOOL)debugmode;
+
+/**
+ @warning 注意此方法使用场景必须有Navigation 
+ 设置webViewController在.h文件中声明一个叫url的参数，SDK内部会去调用
+ @param webViewController webViewController
+ */
++(void)setWebViewController:(UIViewController * __nonnull)webViewController;
+@end

ZhongJingLianMeng/other/Youmeng/push/push_ios_3.2.1/UMPush.framework/Versions/Current

@@ -0,0 +1 @@
+A

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.bundle/en.lproj/UMAnalyticsLog.strings

@@ -0,0 +1,173 @@
+/*
+ UMCommonLog.strings
+ testUMCommonLog
+ 
+ Created by 张军华 on 2017/12/11.
+ Copyright © 2017年 张军华. All rights reserved.
+ */
+
+//init  20000 - 20250
+analytics_init_error1 = "[AIE10012]Latitude或者longitude设置错误 https://developer.umeng.com/docs/66632/detail/66999?um_channel=sdk";
+analytics_init_error2 = "[AIE10013]puid 为空 https://developer.umeng.com/docs/66632/detail/67000?um_channel=sdk";
+analytics_init_error3 = "[AIE10013]puid 大于64字节 https://developer.umeng.com/docs/66632/detail/67000?um_channel=sdk";
+analytics_init_error4 = "[AIE10013]provider 大于32字节 https://developer.umeng.com/docs/66632/detail/67000?um_channel=sdk";
+analytics_init_error5 = "[AIE10005]请设置Dplus 场景 https://developer.umeng.com/docs/66632/detail/66990?um_channel=sdk";
+analytics_init_error6 = "数据库连接失败";
+analytics_init_error7 = "数据库已经打开";
+analytics_init_error8 = "修改表失败,TABLE %@ with columnName(%@)";
+analytics_init_error9 = "数据库运行失败,sql: %@, error: %s,errorCode:%d";
+analytics_init_error10 = "%@ 表创建失败";
+analytics_init_error11 = "%@ 表删除失败";
+analytics_init_error12 = "sql执行失败 %s";
+analytics_init_error13 = "%@ 表写入失败";
+analytics_init_error14 = "%@ 表修改失败";
+analytics_init_error15 = "[AIE10011]DeepLink url 不能大于 %d字节 https://developer.umeng.com/docs/66632/detail/66998?um_channel=sdk";
+analytics_init_error16 = "[AIE10011]DeepLink eventId %@ 不能大于 %d字节 https://developer.umeng.com/docs/66632/detail/66998?um_channel=sdk";
+analytics_init_error17 = "[AIE10006]%@是SDK保留字段，不能作为eventId使用 https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+analytics_init_error18 = "[AIE1006]attributes中value 不能为 NSNull https://developer.umeng.com/docs/66632/detail/67191?um_channel=sdk";
+analytics_init_error19 = "[AIE10001]appkey 不能为空 https://developer.umeng.com/docs/66632/detail/66982?um_channel=sdk";
+analytics_init_error20 = "[AIE10005]MobClickGameAnalytics 是游戏API，请先设置游戏场景 https://developer.umeng.com/docs/66632/detail/66990?um_channel=sdk";
+analytics_init_error21 = "[AIE10014]MobClickGameAnalytics orderId 不能大于 1024字节 https://developer.umeng.com/docs/66632/detail/67001?um_channel=sdk";
+analytics_init_error22 = "[AIE10014]MobClickGameAnalytics currencyType 不能大于 3字节 https://developer.umeng.com/docs/66632/detail/67001?um_channel=sdk";
+analytics_init_error23 = "[AIE10005]DplusMobClick 是Dplus API，请先设置Dplus场景 https://developer.umeng.com/docs/66632/detail/66990?um_channel=sdk";
+
+analytics_init_error24 = "[AIE1008]Dplus key：%@ 是预制字段，不能使用 https://developer.umeng.com/docs/66632/detail/67191?um_channel=sdk";
+analytics_init_error25 = "[AIE10008]Dplus property value只能使用NSString,NSNumber,NSArray类型 NSArray只能是(NSString,NSNumber)类型且不能为空 https://developer.umeng.com/docs/66993/detail/id?um_channel=sdk";
+analytics_init_error26 = "[AIE10008]Dplus property的key只能是NSString类型且不能为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+analytics_init_error27 = "[AIE10008]Dplus property的value数组只能是NSString类型或NSNumber类型且不能为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+//analytics_init_error27 = "[AIE10027]Dplus array内容只能是NSString 或者 NSNumber类型";
+//analytics_init_error28 = "[AIE10028]Dplus 事件的key和value 必须是string类型,key不能大于%@字节，value不能大于%@字节";
+//analytics_init_error29 = "[AIE10029]Dplus property的value只能是NSString或者NSNumber类型且不能为空";
+analytics_init_error30 = "[AIE10010]Dplus eventList必须是NSArray类型 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+analytics_init_error31 = "[AIE10010]Dplus eventList已存入5个，无法再添加 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+analytics_init_error32 = "[AIE10008]Dplus property只能是NSDictionary类型 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+analytics_init_error33 = "[AIE10008]Dplus propertyName只能是NSString类型并且不能为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+
+analytics_init_error34 = "[AIE10006]关键字id, ts, du, dplus_st, %@是SDK保留字段，不能作为key使用。https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+analytics_init_error35 = "[AIE10006]事件的key和value 必须是string类型,key不能大于%ld字节，value不能大于%ld字节 https://developer.umeng.com/docs/66991/detail/id?um_channel=sdk";
+analytics_init_error36 = "[AIE10008]Dplus eventName为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+analytics_init_error37 = "[AIE10006]关键字id, ts, du, dplus_st是友盟SDK保留字段，不能作为key使用。https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+analytics_init_error38 = "make envelope failed code:%d";
+analytics_init_error39 = "获取内容失败";
+analytics_init_error40 = "[AIE10006]eventId %@ 不能大于 %d字节 https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+analytics_init_error41 = "[AIE10011]DeepLink 请检查参数是否正确 https://developer.umeng.com/docs/66632/detail/66998?um_channel=sdk";
+analytics_init_error42 = "[AIE10010]Dplus eventList参数错误 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+
+analytics_init_error43 = "[AIE10009]Dplus 请检查预置事件参数 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error44 = "[AIE10009]Dplus 预置事件的key和value 必须是string类型,key不能大于%d字节，value不能大于%d字节 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error45 = "[AIE10009]Dplus 预置事件property的value只能是NSString或者NSNumber类型且不能为空 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error46 = "[AIE10009]Dplus 预支事件property的key只能是NSString类型且不能为空 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error47 = "[AIE10009]Dplus 预置事件property只能是NSDictionary类型 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error48 = "[AIE10009]Dplus 预置事件property为空 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error49 = "[AIE10009]Dplus 请检查预置事件property中的key和value是否正确 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error50 = "[AIE10009]Dplus 预置事件propertyName只能是NSString类型并且不能为空 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+
+analytics_init_error51 = "[AIE10007]请检查参数是否正确 https://developer.umeng.com/docs/66632/detail/66992?um_channel=sdk";
+analytics_init_error52 = "[AIE10007]pageName不能为空 https://developer.umeng.com/docs/66632/detail/66992?um_channel=sdk";
+analytics_init_error53 = "[AIE10008]Dplus property为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+
+analytics_init_error54 = "[AIE10006]请检查参数是否正确 https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+
+analytics_init_error55 = "[AIE10014]MobClickGameAnalytics level不能为空 https://developer.umeng.com/docs/66632/detail/67000?um_channel=sdk";
+analytics_init_error56 = "[AIE10014]MobClickGameAnalytics 请检查currencyAmount和virtualAmount是否正确 https://developer.umeng.com/docs/66632/detail/67001?um_channel=sdk";
+analytics_init_error57 = "[AIE10014]请检查参数是否正确 https://developer.umeng.com/docs/66632/detail/67001?um_channel=sdk";
+
+
+
+
+
+
+analytics_init_warn1 = "provider 为空";
+analytics_init_warn3 = "错误信息表内容不是jsonString";
+analytics_init_warn5 = "请检查property中的key和value值";
+analytics_init_warn6 = "app已经启动";
+analytics_init_warn7 = "attributes中value 不能为空";
+analytics_init_warn8 = "setUserLevel 方法已下线，请使用setUserLevelId方法";
+analytics_init_warn9 = "setUserID 方法已下线，请使用其他相关User的方法";
+
+analytics_init_warn10 = "[AIE10010]Dplus eventList为空 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+analytics_init_warn11 = "Dplus value:%@ 超出限制字节，已被截取到%ld字节";
+analytics_init_warn12 = "Dplus array内容只能是NSString类型";
+analytics_init_warn13 = "Dplus property为空";
+analytics_init_warn14 = "Dplus 请检查property中的key和value是否正确";
+analytics_init_warn15 = "Dplus propertyName在Property中不存在";
+analytics_init_warn16 = "Dplus propertyName在PreProperty中不存在";
+analytics_init_warn17 = "Dplus propertyName在SuperProperty中不存在";
+
+analytics_init_warn18 = "event label (%@) 不能大于%d字节";
+analytics_init_warn19 = "event事件在8小时内最多发送%d";
+analytics_init_warn20 = "track事件在8小时内最多发送%d";
+analytics_init_warn21 = "sessionId为空";
+analytics_init_warn22 = "不确定event 类型";
+
+analytics_init_warn23 = "[AIE10010]Dplus %@ 过长，截取%ld字节 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+
+
+
+
+
+
+
+
+
+analytics_init_info1 = "超级属性注册成功";
+analytics_init_info2 = "缓存数据存储完成";
+analytics_init_info3 = "session 开始：%@";
+analytics_init_info4 = "session 结束：%@";
+analytics_init_info5 = "Dplus registerPreProperty成功";
+analytics_init_info6 = "Dplus unregisterSuperProperty成功";
+analytics_init_info7 = "Dplus unregisterPreProperty成功";
+analytics_init_info8 = "Dplus getSuperProperty成功";
+analytics_init_info9 = "dladdr(%p, ...) failed";
+analytics_init_info10 = "Invalid Mach-O header magic value: %x";
+analytics_init_info11 = "LC_SEGMENT 0x%08x";
+analytics_init_info12 = "数据过大，进行拆包";
+analytics_init_info13 = "数据过大，进行Dplus拆包";
+analytics_init_info14 = "数据过大，进行analytics拆包";
+
+
+
+
+
+
+
+
+
+
+
+analytics_init_debug1 = "UMAnalytics sdk版本号：%@,app 版本号：%@";
+analytics_init_debug2 = "UMAnalytics发送配置：sdk_version:%@, device_id:%@, model:%@, os_version:%@, app_version:%@";
+analytics_init_debug3 = "UMAnalytics统计发送内容：active_user:%@, activate_msg:%@, sessions:%@, ekv:%@";
+analytics_init_debug4 = "UMAnalytics游戏统计发送内容：gkv:%@";
+analytics_init_debug5 = "UMAnalytics Dplus发送内容：Dplus:%@";
+analytics_init_debug6 = "UMAnalytics error:%@";
+analytics_init_debug7 = "UMAnalytics event:%@";
+analytics_init_debug8 = "UMAnalytics session:%@";
+analytics_init_debug9 = "UMAnalytics ekv:%@";
+analytics_init_debug10 = "UMAnalytics gkv:%@";
+analytics_init_debug11 = "UMAnalytics app被杀死";
+analytics_init_debug12 = "UMAnalytics pageDuration:%@";
+analytics_init_debug13 = "UMAnalytics pageBegin=%@, beginTime:%@";
+analytics_init_debug14 = "UMAnalytics pageEnd=%@, duration:%lld";
+analytics_init_debug15 = "UMAnalytics eventBegin eventId=%@, label=%@";
+analytics_init_debug16 = "UMAnalytics ekvBegin ekvEvent.id=%@, ekvEvent.key=%@";
+
+
+
+
+
+
+
+
+
+
+
+
+analytics_init_verbose1 = "UMAnalytics 发送日志：%@";
+analytics_init_verbose2 = "UIApplicationWillTerminateNotification arrived";
+analytics_init_verbose3 = "app inactivate enter";
+analytics_init_verbose4 = "viewDidAppear is: %@";
+analytics_init_verbose5 = "viewDidDisappear is: %@";
+
+
+

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.bundle/en.lproj/UMCommonLog.strings

@@ -0,0 +1,112 @@
+/* 
+  UMCommonLog.strings
+  testUMCommonLog
+
+  Created by 张军华 on 2017/12/11.
+  Copyright © 2017年 张军华. All rights reserved.
+*/
+
+
+
+////////////////////////////////////////////////
+//init begin
+//init  20000 - 20250
+common_init_error1 = "[CIE10001]用户传入的appKey不合法，请到官网申请appkey，以免影响自己App的统计数据。网址如下：https://developer.umeng.com/docs/66632/detail/67191?um_channel=sdk";
+
+common_init_warn1 = "当前传入的appkey和用户以前设置过的appkey不一样。";
+common_init_warn2 = "当前传入的channel渠道为空。";
+common_init_warn3 = "检测用户正在使用UI无埋点功能，检测到UMABTest.framework和UMAutoEventBinding.framework同时并存，在需要release发布需要删除UMABTest.framework。";
+
+common_init_info1 = "正在使用国内Common组件化SDK版本。";
+common_init_info2 = "正在使用国际化Common组件化SDK版本。";
+
+common_init_debug1 = "UMCommon版本号：%@。";
+
+common_init_verbose1 = "";
+
+//init end
+////////////////////////////////////////////////
+
+////////////////////////////////////////////////
+//integration_test begin
+common_integrationtest_error1 = "experiment params invalid。";
+common_integrationtest_error2 = "unknow experiment group key。";
+common_integrationtest_error3 = "unknow experiment test key。";
+common_integrationtest_error4 = "experiment params invalid。";
+
+//client_test end
+////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////
+//deviceToken begin
+common_deviceToken_error1 = "error,tokenStringWithData, token inValid! [%ld]。";
+
+//deviceToken end
+////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////
+//Envelope begin
+
+common_envelope_error1 = "信封json创建失败";
+common_envelope_error2 = "信封raw size:(%d)超过最大限制,创建失败";
+common_envelope_error3 = "信封压缩数据失败";
+common_envelope_error4 = "信封打包失败";
+common_envelope_error5 = "信封创建失败";
+common_envelope_error6 = "信封size:(%d)超过最大限制，创建失败";
+common_envelope_error7 = "发送信封(%@)失败";
+common_envelope_error8 = "网络请求失败(Response Applog) {\"fail\": \"error\"}";
+common_envelope_error9 = "网络请求失败(Response Applog) {\"fail\": \"statusCode\":%d}";
+common_envelope_error10 = "网络请求失败(Error   Applog) %@";
+
+common_envelope_warn1 = "信封数量超过最大限制%d,并且删除此文件名为:%@";
+
+common_envelope_info1 = "准备发送信封";
+common_envelope_info2 = "信封名字的前缀:(%@)";
+
+common_envelope_debug1 = "当前正在发送网络请求，还不能打包信封(network running=YES)。";
+common_envelope_debug2 = "当前网络状态不可用。";
+common_envelope_debug3 = "当前本地有信封存在,还不能打包新的信封。";
+common_envelope_debug4 = "生成信封(%@)成功";
+common_envelope_debug5 = "准备发送信封(%@)...";
+common_envelope_debug6 = "发送信封(%@)成功";
+common_envelope_debug7 = "网络请求成功(Response Applog) {\"success\": \"ok\"}";
+common_envelope_debug8 = "将要打包的有状态数据:%@";
+common_envelope_debug9 = "信封SerialNum:%d";
+
+common_envelope_verbose1 = "";
+
+//Envelope end
+////////////////////////////////////////////////
+
+////////////////////////////////////////////////
+//SLEnvelope begin
+
+common_slenvelope_error1 = "无状态信封json创建失败";
+common_slenvelope_error2 = "无状态信封raw size:(%d)超过最大限制,创建失败";
+common_slenvelope_error3 = "无状态信封压缩数据失败";
+common_slenvelope_error4 = "无状态信封打包失败";
+common_slenvelope_error5 = "无状态信封创建失败";
+common_slenvelope_error6 = "无状态信封size:(%d)超过最大限制，创建失败";
+common_slenvelope_error7 = "发送无状态信封(%@)失败";
+common_slenvelope_error8 = "无状态信封(%@)不存在";
+common_slenvelope_error9 = "网络请求失败(SLResponse Applog) {\"fail\": \"statusCode\":%d}";
+
+common_slenvelope_warn1 = "";
+
+common_slenvelope_info1 = "";
+
+
+common_slenvelope_debug1 = "生成无状态信封(%@)成功";
+common_slenvelope_debug2 = "准备发送无状态信封(%@)...";
+common_slenvelope_debug3 = "发送无状态信封(%@)成功";
+common_slenvelope_debug4 = "网络请求成功(SLResponse Applog) {\"success\": \"ok\"}";
+common_slenvelope_debug5 = "将要打包的无状态数据:%@";
+
+common_slenvelope_verbose1 = "";
+
+
+//SLEnvelope end
+////////////////////////////////////////////////
+

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.bundle/en.lproj/UMPushLog.strings

@@ -0,0 +1,68 @@
+/*
+ UMPushLog.strings
+ UMessage
+ 
+ Created by shile on 2017/12/11.
+ Copyright © 2017年 shile. All rights reserved.
+ */
+
+//tag&alias
+push_tagandalias_debug1 = "%@ 方法调用参数是： [%@]";
+push_tagandalias_debug2 = "%@ 方法调用成功， 返回的内容是：[%@]， remainNumber [%ld]!";
+push_tagandalias_debug3 = "%@ 方法调用成功，name [%@] type [%@]!";
+
+push_tagandalias_warning1 = "%@ 长度为0";
+push_tagandalias_warning2 = "%@ 长度超过了限制[%ld],长度是[%ld]";
+push_tagandalias_warning3 = "%@ 类型不为NSString或者为nil。";
+
+push_tagandalias_error1 = "[PTAE10001] %@ 方法调用错误 ，token 为nil!，请查看：https://developer.umeng.com/docs/66632/detail/66964?um_channel=sdk";
+push_tagandalias_error2 = " %@ 方法调用错误 ，服务器异常或禁止请求，请检查是否调用错误！";
+push_tagandalias_error3 = "%@ 方法调用错误 ，error 是 %@，responseObject 内容是 %@!";
+push_tagandalias_error4 = "%@ 方法调用错误 ，请求过快，请检查是否调用正确!";
+
+push_tagandalias_error6 = "%@ 失败，name [%@] type [%@]![%@]";
+
+
+//应用内消息
+push_innermessage_warning1 = "已经有相同的label存在，label为%@：";
+
+push_innermessage_debug1 = "失败!error code:%d,sql:%@, result,SQL);";
+
+push_innermessage_error1 = "应用内消息统计回传失败,responseObject[%@],error[%@]";
+push_innermessage_error2 = "获取UPush应用内 开屏 消息失败，请检查是否在后台创建消息，如不需要开屏功能，请移除相关代码!";
+push_innermessage_error3 = "获取UPush应用内 开屏 消息失败 [%@]!";
+push_innermessage_error4 = "获取UPush应用内 插屏 消息失败 [%@]!";
+push_innermessage_error5 = "label 格式错误，label只能为字符串，且不能为nil,或空串!";
+push_innermessage_error6 = "每个app只允许创建10个CardMessage!";
+
+
+//UMessage
+push_umessage_info1 = "UMPush版本号：%@";
+
+push_umessage_debug1 = "payload 内容是： [%@]";
+push_umessage_debug2 = "launchOptions 为 nil 或 class [%@] 不是 NSDictionary";
+push_umessage_debug3 = "消息到达!内容是：[%@]";
+push_umessage_debug4 = "这条消息已经上传到服务器了!msgid是:%@";
+push_umessage_debug5 = "UMPushMessage 内容是：[%@]";
+push_umessage_debug6 = "消息中不包含Alert， 内容是：[%@]";
+push_umessage_debug7 = "今天已经回传过 register 请求了";
+push_umessage_debug8 = "今天已经回传过 launch 请求了";
+push_umessage_debug9 = "responseDic 返回格式错误，内容是：[%@]";
+push_umessage_debug10 = "responseDic内容是：[%@]";
+push_umessage_debug11 = "clickPolicy 详情：[%d]";
+push_umessage_debug12 = "消息不属于友盟!";
+push_umessage_debug13 = "register devicetoken [%@]!";
+push_umessage_debug14 = "register AppKey [%@]!";
+
+push_umessage_error1 = "userInfo 不包含msgid，或者消息不来自UPush!";
+push_umessage_error3 = "UMPushMessage init异常：[%@]";
+push_umessage_error4 = "application:didFailToRegisterForRemoteNotificationsWithError: [%@]";
+push_umessage_error5 = "token错误! [%ld]";
+push_umessage_error6 = "tagClass错误! tagClass是 [%@]";
+push_umessage_error7 = "错误! 每一最多只能发送[%ld]个tag,当前数量是[%ld]!";
+push_umessage_error8 = "WeightedTagClass错误! tagClass是 [%@]";
+
+
+
+
+

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.bundle/en.lproj/UMSocialPromptLocalizable.strings

@@ -0,0 +1,115 @@
+
+// -------------- FAQ log
+
+//core模块的平台相关
+"core_platform_error_2" = "[SCE10001]创建平台失败:%@。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+"core_platform_warn_1" = "[SCE10001]平台检查失败:%@，请检查是否实现 @selector(socialPlatformType)，参考UMSocialPlatformConfig.h头文件说明。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+
+"core_share_error_7" = "[SCE10007]出现报错2014，请使用 HTTPS 图片 URL。 https://developer.umeng.com/docs/66632/detail/67029?um_channel=sdk";
+"core_info_1" = "[SCI10005]初始化平台参数中redirectURL参数的作用。 https://developer.umeng.com/docs/66632/detail/67027?um_channel=sdk";
+"core_info_2" = "[SCI10006]分享/授权登录后如果无法返回应用（微信、QQ、微博等平台）。 https://developer.umeng.com/docs/66632/detail/67028?um_channel=sdk";
+//core handle 协议相关
+"core_auth_error_1" = "[SCE10001]未发现第三方或自定义平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+"core_auth_error_4" = "[SCE10001]未发现第三方或自定义平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+
+//core模块获得用户资料相关
+"core_getuserinfo_error_1" = "[SCE10001]未发现平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+
+//core模块分享相关
+"core_share_error_1" = "[SCE10008]传入平台('%@')的UMSocialMessageObject类型参数messageObject的数据类型无效，请检查\n1.messageObject是否空。\n2.messageObject.text和messageObject.shareObject是否同时为空。 https://developer.umeng.com/docs/66632/detail/67030?um_channel=sdk";
+"core_share_error_2" = "[SCE10001]未发现第三方或自定义平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+"core_share_error_4" = "[SCE10001]未发现第三方或自定义平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+"core_share_error_5" = "[SCE10001]未实现<UMSocialPlatformProvider>协议方法@selector(umSocial_ShareWithObject:withViewController:withCompletionHandler:)：%@。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+
+// 分享面板
+"ui_info_1" = "[SUII10002]当前操作相关提示：分享面板无法弹出。 https://developer.umeng.com/docs/66632/detail/67033?um_channel=sdk";
+"ui_info_2" = "[SUII10003]分享面板图标不显示图片。 https://developer.umeng.com/docs/66632/detail/67034?um_channel=sdk";
+
+"core_share_error_6" = "[SUIE10001]平台%@分享时，传入的参数currentViewController应该是nil或者是继承UIViewController的子类。 https://developer.umeng.com/docs/66632/detail/67032?um_channel=sdk";
+"core_auth_error_6" = "[SUIE10001]平台%@分享时，传入的参数currentViewController应该是nil或者是继承UIViewController的子类。 https://developer.umeng.com/docs/66632/detail/67032?um_channel=sdk";
+"core_getuserinfo_error_3" = "[SUIE10001]平台%@分享时，传入的参数currentViewController应该是nil或者是继承UIViewController的子类。 https://developer.umeng.com/docs/66632/detail/67032?um_channel=sdk";
+
+//wechat
+"wechat_auth_error_1" = "[SCE10002]请检查是否设置了微信的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+
+"wechat_share_error_1" = "[SCE10002]请检查是否设置了微信的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"wechat_share_error_2" = "[SCE10003]分享前，请检查微信是否安装。 https://developer.umeng.com/docs/66632/detail/67025?um_channel=sdk";
+"wechat_share_error_3" = "[SWE10001]当前的sdk不支持微信的OpenAPI,请更新最新的微信SDK。 https://developer.umeng.com/docs/66632/detail/67036?um_channel=sdk";
+"wechat_share_error_4" = "[SWE10002]微信分享不支持的分享类型，微信的分享类型为：文本，图片，网络链接，音乐链接，视频链接，Gif表情，文件。 https://developer.umeng.com/docs/66632/detail/67037?um_channel=sdk";
+"wechat_share_error_5" = "[SWE10003]下载UMShareImageObject的shareImage失败，请检查图片参数是否正确。（本地图片，请检查是否赋值，网络图片请检查是否为https，防止下载失败）。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+
+"wechat_shareWebPage_warn_1" = "[SWE10003]微信分享网页链接的时候，提供的缩略图为错误的下载url或者下载失败,具体的原因如下:%@。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+"wechat_shareWebPage_warn_2" = "[SWE10003]微信分享网页链接的时候，提供的缩略图为错误的下载url或者下载失败。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+
+"wechat_shareImage_warn_1" = "[SWE10003]微信分享图片的时候，提供的缩略图为为错误的下载url或者下载失败,具体的原因如下:%@。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+"wechat_shareImage_warn_2" = "[SWE10003]微信分享图片的时候，提供的缩略图为为错误的下载url或者下载失败。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+// wechat info
+"wechat_info_1" = "[SWI10004]分享面板中不显示微信。 https://developer.umeng.com/docs/66632/detail/67039?um_channel=sdk";
+"wechat_info_2" = "[SWI10005]如何获取微信code。 https://developer.umeng.com/docs/66632/detail/67040?um_channel=sdk";
+"wechat_info_3" = "[SWI10007]微信分享报错提示，请请检查微信是否安装。 https://developer.umeng.com/docs/66632/detail/67042?um_channel=sdk";
+"wechat_info_4" = "[SWI10008]微信授权登录提示该链接无法访问。 https://developer.umeng.com/docs/66632/detail/67043?um_channel=sdk";
+"wechat_info_5" = "[SWI10009]微信分享报错'由于invalid_app无法分享到微信。 https://developer.umeng.com/docs/66632/detail/67044?um_channel=sdk";
+
+//qq
+"qq_auth_error_1" = "[SCE10002]请检查是否设置了QQ的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"qq_auth_error_2" = "[SQE10001]授权失败，点击qq授权没有跳转，请查看是否设置了appid,查看初始化函数:[[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_QQ appKey:???  appSecret:nil redirectURL:???];。 https://developer.umeng.com/docs/66632/detail/67045?um_channel=sdk";
+
+"qq_getuserinfo_error_1" = "[SCE10002]请检查是否设置了QQ的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"qq_getuserinfo_info_1" = "[SCE10004]可设置获得用户信息时是否清除缓存，通过UMSocialGlobal的isClearCacheWhenGetUserInfo变量来改变,默认是每次都清除用户的授权缓存。 https://developer.umeng.com/docs/66632/detail/67026?um_channel=sdk";
+
+
+"qq_share_error_1" = "[SCE10002]请检查是否设置了QQ的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"qq_share_error_2" = "[SCE10003]请检查是否安装了QQ。 https://developer.umeng.com/docs/66632/detail/67025?um_channel=sdk";
+"qq_share_error_3" = "[SQE10002]请检查当前的SDK是否支持API调用，如果不能请升级SDK或者QQ的版本。 https://developer.umeng.com/docs/66632/detail/67046?um_channel=sdk";
+"qq_share_error_4" = "[SQE10003]QQ分享不支持的分享类型，QQ的分享类型为：文本，图片，网络链接，音乐链接，视频链接。 https://developer.umeng.com/docs/66632/detail/67047?um_channel=sdk";
+
+"qq_shareWebPage_warn_1" = "[SQE10004]QQ分享网页链接的时提供的缩略图为错误的下载url或者下载失败,具体的原因如下:%@。 https://developer.umeng.com/docs/66632/detail/67048?um_channel=sdk";
+"qq_shareWebPage_warn_2" = "[SQE10004]QQ分享网页链接的时提供的缩略图为错误的下载url或者下载失败。 https://developer.umeng.com/docs/66632/detail/67048?um_channel=sdk";
+//info
+"qq_info_1" = "[SQI10005]QQ和TIM平台混淆问题。 https://developer.umeng.com/docs/66632/detail/67049?um_channel=sdk";
+"qq_info_2" = "[SQI10006]QQ登录时显示的应用名如何设置。 https://developer.umeng.com/docs/66632/detail/67050?um_channel=sdk";
+"qq_info_3" = "[SQI10007]QQ登录提示错误110406。 https://developer.umeng.com/docs/66632/detail/67051?um_channel=sdk";
+"qq_info_4" = "[SQI10008]QQ报错 100008 client request's app is not existed。 https://developer.umeng.com/docs/66632/detail/67053?um_channel=sdk";
+
+
+//sina
+"sina_auth_error_1" = "[SCE10002]请检查是否设置了sina的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+
+"sina_getuserinfo_error_1" = "[SCE10002]请检查是否设置了sina的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+
+"sina_share_error_1" = "[SCE10002]请检查是否设置了sina的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"sina_share_error_2" = "[SSE10001]新浪分享不支持的分享类型，新浪的分享类型为：文本，图片，图文，网络链接，音乐链接，视频链接。 https://developer.umeng.com/docs/66632/detail/67329?um_channel=sdk";
+"sina_shareWebPage_error_1"="[SSE10002]新浪分享webpage类型(需要强制加入缩略图)错误，具体原因如下：%@。 https://developer.umeng.com/docs/66632/detail/67054?um_channel=sdk";
+"sina_shareText_Info_1" = "[SSI10003]新浪文本分享最大的字是140个，如果超过就不能分享成功，sdk默认开启截断功能，如果需要停止截断需要在调用分享前加入代码[UMSocialGlobal shareInstance].isTruncateShareText=NO。 https://developer.umeng.com/docs/66632/detail/67055?um_channel=sdk";
+//info
+"sina_info_1" = "[SSI10004]微博分享 网页(WebPage)类型，链接在微博只显示为'网页链接'的文字。 https://developer.umeng.com/docs/66632/detail/67056?um_channel=sdk";
+"sina_info_2" = "[SSI10005]微博登录报错'sso package or sign error'。 https://developer.umeng.com/docs/66632/detail/67058?um_channel=sdk";
+"sina_info_3" = "[SSI10006]微博授权实现关注官方微博功能。 https://developer.umeng.com/docs/66632/detail/67059?um_channel=sdk";
+"sina_info_4" = "[SSI10007]微博报错 redirect url mismatch。 https://developer.umeng.com/docs/66632/detail/67060?um_channel=sdk";
+
+// 钉钉支付宝
+// info
+"ding_error_1" = "[SDE10001]支付宝/钉钉返回鉴权失败。 https://developer.umeng.com/docs/66632/detail/67062?um_channel=sdk";
+
+//facebook
+"facebook_share_error_1" = "[SFE10001]facebook分享不支持的分享类型，facebook的分享类型为：文本，图片，网络链接，音乐链接，视频链接。(新版的facebook采用的是对话框的形式分享的，如果设置文本的话需要有publish_actions权限调用OpenAPI)。 https://developer.umeng.com/docs/66632/detail/67064?um_channel=sdk";
+//error
+"facebook_info_2" = "[SFI10002]FAQ: Facebook/Twitter分享点击分享后没有进入分享编辑页。 https://developer.umeng.com/docs/66632/detail/67065?um_channel=sdk";
+"facebook_info_3" = "[SFE10003]FAQ: Facebook分享失败，提示missing publish_actions permissions。 https://developer.umeng.com/docs/66632/detail/67066?um_channel=sdk";
+
+//twitter
+"twitter_auth_error_1" = "[SCE10002]请检查是否设置了 Twitter 的 URLScheme。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+//info
+"twitter_info_1" = "[STI10001]Twitter如何获取TokenSecret。 https://developer.umeng.com/docs/66632/detail/67068?um_channel=sdk";
+"twitter_info_2" = "[STE10002]FAQ: Twitter 分享报错401。 https://developer.umeng.com/docs/66632/detail/67069?um_channel=sdk";
+
+// --------- sdk 内 log
+"core_version" = "UMShare版本号：%@。";
+// 实现handler协议提示
+"core_platform_warn_2" = "第三方或自定义平台异常：%@ > 未实现相应方法：@selector(umSocial_setAppKey:withAppSecret:withRedirectURL:)";
+"core_auth_error_2" = "未实现第三方或自定义<UMSocialPlatformProvider>协议方法@selector(umSocial_AuthorizeWithUserInfo:withViewController:withCompletionHandler:)：%@";
+"core_auth_error_3" = "未实现第三方或自定义<UMSocialPlatformProvider>协议方法@selector(umSocial_cancelAuthWithCompletionHandler:)：%@";
+"core_auth_error_5" = "未实现<UMSocialPlatformProvider>协议方法@selector(umSocial_AuthorizeWithUserInfo:withCompletionHandler:)：%@";
+"core_getuserinfo_error_2" = "未实现第三方或自定义<UMSocialPlatformProvider>协议方法@selector(umSocial_RequestForUserProfileWithViewController:completion:)：%@";
+"core_share_error_3" = "未实现第三方或自定义<UMSocialPlatformProvider>协议方法@selector(umSocial_ShareWithObject:withCompletionHandler:)：%@";
+

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.bundle/zh-Hans.lproj/UMAnalyticsLog.strings

@@ -0,0 +1,173 @@
+/*
+ UMCommonLog.strings
+ testUMCommonLog
+ 
+ Created by 张军华 on 2017/12/11.
+ Copyright © 2017年 张军华. All rights reserved.
+ */
+
+//init  20000 - 20250
+analytics_init_error1 = "[AIE10012]Latitude或者longitude设置错误 https://developer.umeng.com/docs/66632/detail/66999?um_channel=sdk";
+analytics_init_error2 = "[AIE10013]puid 为空 https://developer.umeng.com/docs/66632/detail/67000?um_channel=sdk";
+analytics_init_error3 = "[AIE10013]puid 大于64字节 https://developer.umeng.com/docs/66632/detail/67000?um_channel=sdk";
+analytics_init_error4 = "[AIE10013]provider 大于32字节 https://developer.umeng.com/docs/66632/detail/67000?um_channel=sdk";
+analytics_init_error5 = "[AIE10005]请设置Dplus 场景 https://developer.umeng.com/docs/66632/detail/66990?um_channel=sdk";
+analytics_init_error6 = "数据库连接失败";
+analytics_init_error7 = "数据库已经打开";
+analytics_init_error8 = "修改表失败,TABLE %@ with columnName(%@)";
+analytics_init_error9 = "数据库运行失败,sql: %@, error: %s,errorCode:%d";
+analytics_init_error10 = "%@ 表创建失败";
+analytics_init_error11 = "%@ 表删除失败";
+analytics_init_error12 = "sql执行失败 %s";
+analytics_init_error13 = "%@ 表写入失败";
+analytics_init_error14 = "%@ 表修改失败";
+analytics_init_error15 = "[AIE10011]DeepLink url 不能大于 %d字节 https://developer.umeng.com/docs/66632/detail/66998?um_channel=sdk";
+analytics_init_error16 = "[AIE10011]DeepLink eventId %@ 不能大于 %d字节 https://developer.umeng.com/docs/66632/detail/66998?um_channel=sdk";
+analytics_init_error17 = "[AIE10006]%@是SDK保留字段，不能作为eventId使用 https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+analytics_init_error18 = "[AIE1006]attributes中value 不能为 NSNull https://developer.umeng.com/docs/66632/detail/67191?um_channel=sdk";
+analytics_init_error19 = "[AIE10001]appkey 不能为空 https://developer.umeng.com/docs/66632/detail/66982?um_channel=sdk";
+analytics_init_error20 = "[AIE10005]MobClickGameAnalytics 是游戏API，请先设置游戏场景 https://developer.umeng.com/docs/66632/detail/66990?um_channel=sdk";
+analytics_init_error21 = "[AIE10014]MobClickGameAnalytics orderId 不能大于 1024字节 https://developer.umeng.com/docs/66632/detail/67001?um_channel=sdk";
+analytics_init_error22 = "[AIE10014]MobClickGameAnalytics currencyType 不能大于 3字节 https://developer.umeng.com/docs/66632/detail/67001?um_channel=sdk";
+analytics_init_error23 = "[AIE10005]DplusMobClick 是Dplus API，请先设置Dplus场景 https://developer.umeng.com/docs/66632/detail/66990?um_channel=sdk";
+
+analytics_init_error24 = "[AIE1008]Dplus key：%@ 是预制字段，不能使用 https://developer.umeng.com/docs/66632/detail/67191?um_channel=sdk";
+analytics_init_error25 = "[AIE10008]Dplus property value只能使用NSString,NSNumber,NSArray类型 NSArray只能是(NSString,NSNumber)类型且不能为空 https://developer.umeng.com/docs/66993/detail/id?um_channel=sdk";
+analytics_init_error26 = "[AIE10008]Dplus property的key只能是NSString类型且不能为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+analytics_init_error27 = "[AIE10008]Dplus property的value数组只能是NSString类型或NSNumber类型且不能为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+//analytics_init_error27 = "[AIE10027]Dplus array内容只能是NSString 或者 NSNumber类型";
+//analytics_init_error28 = "[AIE10028]Dplus 事件的key和value 必须是string类型,key不能大于%@字节，value不能大于%@字节";
+//analytics_init_error29 = "[AIE10029]Dplus property的value只能是NSString或者NSNumber类型且不能为空";
+analytics_init_error30 = "[AIE10010]Dplus eventList必须是NSArray类型 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+analytics_init_error31 = "[AIE10010]Dplus eventList已存入5个，无法再添加 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+analytics_init_error32 = "[AIE10008]Dplus property只能是NSDictionary类型 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+analytics_init_error33 = "[AIE10008]Dplus propertyName只能是NSString类型并且不能为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+
+analytics_init_error34 = "[AIE10006]关键字id, ts, du, dplus_st, %@是SDK保留字段，不能作为key使用。https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+analytics_init_error35 = "[AIE10006]事件的key和value 必须是string类型,key不能大于%ld字节，value不能大于%ld字节 https://developer.umeng.com/docs/66991/detail/id?um_channel=sdk";
+analytics_init_error36 = "[AIE10008]Dplus eventName为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+analytics_init_error37 = "[AIE10006]关键字id, ts, du, dplus_st是友盟SDK保留字段，不能作为key使用。https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+analytics_init_error38 = "make envelope failed code:%d";
+analytics_init_error39 = "获取内容失败";
+analytics_init_error40 = "[AIE10006]eventId %@ 不能大于 %d字节 https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+analytics_init_error41 = "[AIE10011]DeepLink 请检查参数是否正确 https://developer.umeng.com/docs/66632/detail/66998?um_channel=sdk";
+analytics_init_error42 = "[AIE10010]Dplus eventList参数错误 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+
+analytics_init_error43 = "[AIE10009]Dplus 请检查预置事件参数 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error44 = "[AIE10009]Dplus 预置事件的key和value 必须是string类型,key不能大于%d字节，value不能大于%d字节 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error45 = "[AIE10009]Dplus 预置事件property的value只能是NSString或者NSNumber类型且不能为空 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error46 = "[AIE10009]Dplus 预支事件property的key只能是NSString类型且不能为空 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error47 = "[AIE10009]Dplus 预置事件property只能是NSDictionary类型 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error48 = "[AIE10009]Dplus 预置事件property为空 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error49 = "[AIE10009]Dplus 请检查预置事件property中的key和value是否正确 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+analytics_init_error50 = "[AIE10009]Dplus 预置事件propertyName只能是NSString类型并且不能为空 https://developer.umeng.com/docs/66632/detail/66994?um_channel=sdk";
+
+analytics_init_error51 = "[AIE10007]请检查参数是否正确 https://developer.umeng.com/docs/66632/detail/66992?um_channel=sdk";
+analytics_init_error52 = "[AIE10007]pageName不能为空 https://developer.umeng.com/docs/66632/detail/66992?um_channel=sdk";
+analytics_init_error53 = "[AIE10008]Dplus property为空 https://developer.umeng.com/docs/66632/detail/66993?um_channel=sdk";
+
+analytics_init_error54 = "[AIE10006]请检查参数是否正确 https://developer.umeng.com/docs/66632/detail/66991?um_channel=sdk";
+
+analytics_init_error55 = "[AIE10014]MobClickGameAnalytics level不能为空 https://developer.umeng.com/docs/66632/detail/67000?um_channel=sdk";
+analytics_init_error56 = "[AIE10014]MobClickGameAnalytics 请检查currencyAmount和virtualAmount是否正确 https://developer.umeng.com/docs/66632/detail/67001?um_channel=sdk";
+analytics_init_error57 = "[AIE10014]请检查参数是否正确 https://developer.umeng.com/docs/66632/detail/67001?um_channel=sdk";
+
+
+
+
+
+
+analytics_init_warn1 = "provider 为空";
+analytics_init_warn3 = "错误信息表内容不是jsonString";
+analytics_init_warn5 = "请检查property中的key和value值";
+analytics_init_warn6 = "app已经启动";
+analytics_init_warn7 = "attributes中value 不能为空";
+analytics_init_warn8 = "setUserLevel 方法已下线，请使用setUserLevelId方法";
+analytics_init_warn9 = "setUserID 方法已下线，请使用其他相关User的方法";
+
+analytics_init_warn10 = "[AIE10010]Dplus eventList为空 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+analytics_init_warn11 = "Dplus value:%@ 超出限制字节，已被截取到%ld字节";
+analytics_init_warn12 = "Dplus array内容只能是NSString类型";
+analytics_init_warn13 = "Dplus property为空";
+analytics_init_warn14 = "Dplus 请检查property中的key和value是否正确";
+analytics_init_warn15 = "Dplus propertyName在Property中不存在";
+analytics_init_warn16 = "Dplus propertyName在PreProperty中不存在";
+analytics_init_warn17 = "Dplus propertyName在SuperProperty中不存在";
+
+analytics_init_warn18 = "event label (%@) 不能大于%d字节";
+analytics_init_warn19 = "event事件在8小时内最多发送%d";
+analytics_init_warn20 = "track事件在8小时内最多发送%d";
+analytics_init_warn21 = "sessionId为空";
+analytics_init_warn22 = "不确定event 类型";
+
+analytics_init_warn23 = "[AIE10010]Dplus %@ 过长，截取%ld字节 https://developer.umeng.com/docs/66632/detail/66996?um_channel=sdk";
+
+
+
+
+
+
+
+
+
+analytics_init_info1 = "超级属性注册成功";
+analytics_init_info2 = "缓存数据存储完成";
+analytics_init_info3 = "session 开始：%@";
+analytics_init_info4 = "session 结束：%@";
+analytics_init_info5 = "Dplus registerPreProperty成功";
+analytics_init_info6 = "Dplus unregisterSuperProperty成功";
+analytics_init_info7 = "Dplus unregisterPreProperty成功";
+analytics_init_info8 = "Dplus getSuperProperty成功";
+analytics_init_info9 = "dladdr(%p, ...) failed";
+analytics_init_info10 = "Invalid Mach-O header magic value: %x";
+analytics_init_info11 = "LC_SEGMENT 0x%08x";
+analytics_init_info12 = "数据过大，进行拆包";
+analytics_init_info13 = "数据过大，进行Dplus拆包";
+analytics_init_info14 = "数据过大，进行analytics拆包";
+
+
+
+
+
+
+
+
+
+
+
+analytics_init_debug1 = "UMAnalytics sdk版本号：%@,app 版本号：%@";
+analytics_init_debug2 = "UMAnalytics发送配置：sdk_version:%@, device_id:%@, model:%@, os_version:%@, app_version:%@";
+analytics_init_debug3 = "UMAnalytics统计发送内容：active_user:%@, activate_msg:%@, sessions:%@, ekv:%@";
+analytics_init_debug4 = "UMAnalytics游戏统计发送内容：gkv:%@";
+analytics_init_debug5 = "UMAnalytics Dplus发送内容：Dplus:%@";
+analytics_init_debug6 = "UMAnalytics error:%@";
+analytics_init_debug7 = "UMAnalytics event:%@";
+analytics_init_debug8 = "UMAnalytics session:%@";
+analytics_init_debug9 = "UMAnalytics ekv:%@";
+analytics_init_debug10 = "UMAnalytics gkv:%@";
+analytics_init_debug11 = "UMAnalytics app被杀死";
+analytics_init_debug12 = "UMAnalytics pageDuration:%@";
+analytics_init_debug13 = "UMAnalytics pageBegin=%@, beginTime:%@";
+analytics_init_debug14 = "UMAnalytics pageEnd=%@, duration:%lld";
+analytics_init_debug15 = "UMAnalytics eventBegin eventId=%@, label=%@";
+analytics_init_debug16 = "UMAnalytics ekvBegin ekvEvent.id=%@, ekvEvent.key=%@";
+
+
+
+
+
+
+
+
+
+
+
+
+analytics_init_verbose1 = "UMAnalytics 发送日志：%@";
+analytics_init_verbose2 = "UIApplicationWillTerminateNotification arrived";
+analytics_init_verbose3 = "app inactivate enter";
+analytics_init_verbose4 = "viewDidAppear is: %@";
+analytics_init_verbose5 = "viewDidDisappear is: %@";
+
+
+

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.bundle/zh-Hans.lproj/UMCommonLog.strings

@@ -0,0 +1,112 @@
+/*
+ UMCommonLog.strings
+ testUMCommonLog
+ 
+ Created by 张军华 on 2017/12/11.
+ Copyright © 2017年 张军华. All rights reserved.
+ */
+
+
+
+////////////////////////////////////////////////
+//init begin
+//init  20000 - 20250
+common_init_error1 = "[CIE10001]用户传入的appKey不合法，请到官网申请appkey，以免影响自己App的统计数据。网址如下：https://developer.umeng.com/docs/66632/detail/67191?um_channel=sdk";
+
+common_init_warn1 = "当前传入的appkey和用户以前设置过的appkey不一样。";
+common_init_warn2 = "当前传入的channel渠道为空。";
+common_init_warn3 = "检测用户正在使用UI无埋点功能，检测到UMABTest.framework和UMAutoEventBinding.framework同时并存，在需要release发布需要删除UMABTest.framework。";
+
+common_init_info1 = "正在使用国内Common组件化SDK版本。";
+common_init_info2 = "正在使用国际化Common组件化SDK版本。";
+
+common_init_debug1 = "UMCommon版本号：%@。";
+
+common_init_verbose1 = "";
+
+//init end
+////////////////////////////////////////////////
+
+////////////////////////////////////////////////
+//integration_test begin
+common_integrationtest_error1 = "experiment params invalid。";
+common_integrationtest_error2 = "unknow experiment group key。";
+common_integrationtest_error3 = "unknow experiment test key。";
+common_integrationtest_error4 = "experiment params invalid。";
+
+//client_test end
+////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////
+//deviceToken begin
+common_deviceToken_error1 = "error,tokenStringWithData, token inValid! [%ld]。";
+
+//deviceToken end
+////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////
+//Envelope begin
+
+common_envelope_error1 = "信封json创建失败";
+common_envelope_error2 = "信封raw size:(%d)超过最大限制,创建失败";
+common_envelope_error3 = "信封压缩数据失败";
+common_envelope_error4 = "信封打包失败";
+common_envelope_error5 = "信封创建失败";
+common_envelope_error6 = "信封size:(%d)超过最大限制，创建失败";
+common_envelope_error7 = "发送信封(%@)失败";
+common_envelope_error8 = "网络请求失败(Response Applog) {\"fail\": \"error\"}";
+common_envelope_error9 = "网络请求失败(Response Applog) {\"fail\": \"statusCode\":%d}";
+common_envelope_error10 = "网络请求失败(Error   Applog) %@";
+
+common_envelope_warn1 = "信封数量超过最大限制%d,并且删除此文件名为:%@";
+
+common_envelope_info1 = "准备发送信封";
+common_envelope_info2 = "信封名字的前缀:(%@)";
+
+common_envelope_debug1 = "当前正在发送网络请求，还不能打包信封(network running=YES)。";
+common_envelope_debug2 = "当前网络状态不可用。";
+common_envelope_debug3 = "当前本地有信封存在,还不能打包新的信封。";
+common_envelope_debug4 = "生成信封(%@)成功";
+common_envelope_debug5 = "准备发送信封(%@)...";
+common_envelope_debug6 = "发送信封(%@)成功";
+common_envelope_debug7 = "网络请求成功(Response Applog) {\"success\": \"ok\"}";
+common_envelope_debug8 = "将要打包的有状态数据:%@";
+common_envelope_debug9 = "信封SerialNum:%d";
+
+common_envelope_verbose1 = "";
+
+//Envelope end
+////////////////////////////////////////////////
+
+////////////////////////////////////////////////
+//SLEnvelope begin
+
+common_slenvelope_error1 = "无状态信封json创建失败";
+common_slenvelope_error2 = "无状态信封raw size:(%d)超过最大限制,创建失败";
+common_slenvelope_error3 = "无状态信封压缩数据失败";
+common_slenvelope_error4 = "无状态信封打包失败";
+common_slenvelope_error5 = "无状态信封创建失败";
+common_slenvelope_error6 = "无状态信封size:(%d)超过最大限制，创建失败";
+common_slenvelope_error7 = "发送无状态信封(%@)失败";
+common_slenvelope_error8 = "无状态信封(%@)不存在";
+common_slenvelope_error9 = "网络请求失败(SLResponse Applog) {\"fail\": \"statusCode\":%d}";
+
+common_slenvelope_warn1 = "";
+
+common_slenvelope_info1 = "";
+
+
+common_slenvelope_debug1 = "生成无状态信封(%@)成功";
+common_slenvelope_debug2 = "准备发送无状态信封(%@)...";
+common_slenvelope_debug3 = "发送无状态信封(%@)成功";
+common_slenvelope_debug4 = "网络请求成功(SLResponse Applog) {\"success\": \"ok\"}";
+common_slenvelope_debug5 = "将要打包的无状态数据:%@";
+
+common_slenvelope_verbose1 = "";
+
+
+//SLEnvelope end
+////////////////////////////////////////////////
+

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.bundle/zh-Hans.lproj/UMPushLog.strings

@@ -0,0 +1,68 @@
+/*
+ UMPushLog.strings
+ UMessage
+ 
+ Created by shile on 2017/12/11.
+ Copyright © 2017年 shile. All rights reserved.
+ */
+
+//tag&alias
+push_tagandalias_debug1 = "%@ 方法调用参数是： [%@]";
+push_tagandalias_debug2 = "%@ 方法调用成功， 返回的内容是：[%@]， remainNumber [%ld]!";
+push_tagandalias_debug3 = "%@ 方法调用成功，name [%@] type [%@]!";
+
+push_tagandalias_warning1 = "%@ 长度为0";
+push_tagandalias_warning2 = "%@ 长度超过了限制[%ld],长度是[%ld]";
+push_tagandalias_warning3 = "%@ 类型不为NSString或者为nil。";
+
+push_tagandalias_error1 = "[PTAE10001] %@ 方法调用错误 ，token 为nil!，请查看：https://developer.umeng.com/docs/66632/detail/66964?um_channel=sdk";
+push_tagandalias_error2 = " %@ 方法调用错误 ，服务器异常或禁止请求，请检查是否调用错误！";
+push_tagandalias_error3 = "%@ 方法调用错误 ，error 是 %@，responseObject 内容是 %@!";
+push_tagandalias_error4 = "%@ 方法调用错误 ，请求过快，请检查是否调用正确!";
+
+push_tagandalias_error6 = "%@ 失败，name [%@] type [%@]![%@]";
+
+
+//应用内消息
+push_innermessage_warning1 = "已经有相同的label存在，label为%@：";
+
+push_innermessage_debug1 = "失败!error code:%d,sql:%@, result,SQL);";
+
+push_innermessage_error1 = "应用内消息统计回传失败,responseObject[%@],error[%@]";
+push_innermessage_error2 = "获取UPush应用内 开屏 消息失败，请检查是否在后台创建消息，如不需要开屏功能，请移除相关代码!";
+push_innermessage_error3 = "获取UPush应用内 开屏 消息失败 [%@]!";
+push_innermessage_error4 = "获取UPush应用内 插屏 消息失败 [%@]!";
+push_innermessage_error5 = "label 格式错误，label只能为字符串，且不能为nil,或空串!";
+push_innermessage_error6 = "每个app只允许创建10个CardMessage!";
+
+
+//UMessage
+push_umessage_info1 = "UMPush版本号：%@";
+
+push_umessage_debug1 = "payload 内容是： [%@]";
+push_umessage_debug2 = "launchOptions 为 nil 或 class [%@] 不是 NSDictionary";
+push_umessage_debug3 = "消息到达!内容是：[%@]";
+push_umessage_debug4 = "这条消息已经上传到服务器了!msgid是:%@";
+push_umessage_debug5 = "UMPushMessage 内容是：[%@]";
+push_umessage_debug6 = "消息中不包含Alert， 内容是：[%@]";
+push_umessage_debug7 = "今天已经回传过 register 请求了";
+push_umessage_debug8 = "今天已经回传过 launch 请求了";
+push_umessage_debug9 = "responseDic 返回格式错误，内容是：[%@]";
+push_umessage_debug10 = "responseDic内容是：[%@]";
+push_umessage_debug11 = "clickPolicy 详情：[%d]";
+push_umessage_debug12 = "消息不属于友盟!";
+push_umessage_debug13 = "register devicetoken [%@]!";
+push_umessage_debug14 = "register AppKey [%@]!";
+
+push_umessage_error1 = "userInfo 不包含msgid，或者消息不来自UPush!";
+push_umessage_error3 = "UMPushMessage init异常：[%@]";
+push_umessage_error4 = "application:didFailToRegisterForRemoteNotificationsWithError: [%@]";
+push_umessage_error5 = "token错误! [%ld]";
+push_umessage_error6 = "tagClass错误! tagClass是 [%@]";
+push_umessage_error7 = "错误! 每一最多只能发送[%ld]个tag,当前数量是[%ld]!";
+push_umessage_error8 = "WeightedTagClass错误! tagClass是 [%@]";
+
+
+
+
+

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.bundle/zh-Hans.lproj/UMSocialPromptLocalizable.strings

@@ -0,0 +1,115 @@
+
+// -------------- FAQ log
+
+//core模块的平台相关
+"core_platform_error_2" = "[SCE10001]创建平台失败:%@。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+"core_platform_warn_1" = "[SCE10001]平台检查失败:%@，请检查是否实现 @selector(socialPlatformType)，参考UMSocialPlatformConfig.h头文件说明。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+
+"core_share_error_7" = "[SCE10007]出现报错2014，请使用 HTTPS 图片 URL。 https://developer.umeng.com/docs/66632/detail/67029?um_channel=sdk";
+"core_info_1" = "[SCI10005]初始化平台参数中redirectURL参数的作用。 https://developer.umeng.com/docs/66632/detail/67027?um_channel=sdk";
+"core_info_2" = "[SCI10006]分享/授权登录后如果无法返回应用（微信、QQ、微博等平台）。 https://developer.umeng.com/docs/66632/detail/67028?um_channel=sdk";
+//core handle 协议相关
+"core_auth_error_1" = "[SCE10001]未发现第三方或自定义平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+"core_auth_error_4" = "[SCE10001]未发现第三方或自定义平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+
+//core模块获得用户资料相关
+"core_getuserinfo_error_1" = "[SCE10001]未发现平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+
+//core模块分享相关
+"core_share_error_1" = "[SCE10008]传入平台('%@')的UMSocialMessageObject类型参数messageObject的数据类型无效，请检查\n1.messageObject是否空。\n2.messageObject.text和messageObject.shareObject是否同时为空。 https://developer.umeng.com/docs/66632/detail/67030?um_channel=sdk";
+"core_share_error_2" = "[SCE10001]未发现第三方或自定义平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+"core_share_error_4" = "[SCE10001]未发现第三方或自定义平台相应类:%@\n请检查:\n1、平台类已实现<UMSocialPlatformProvider>协议\n2、此平台枚举值在正常枚举区间内，参考UMSocialPlatformConfig.h —> UMSocialPlatformType枚举。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+"core_share_error_5" = "[SCE10001]未实现<UMSocialPlatformProvider>协议方法@selector(umSocial_ShareWithObject:withViewController:withCompletionHandler:)：%@。 https://developer.umeng.com/docs/66632/detail/67023?um_channel=sdk";
+
+// 分享面板
+"ui_info_1" = "[SUII10002]当前操作相关提示：分享面板无法弹出。 https://developer.umeng.com/docs/66632/detail/67033?um_channel=sdk";
+"ui_info_2" = "[SUII10003]分享面板图标不显示图片。 https://developer.umeng.com/docs/66632/detail/67034?um_channel=sdk";
+
+"core_share_error_6" = "[SUIE10001]平台%@分享时，传入的参数currentViewController应该是nil或者是继承UIViewController的子类。 https://developer.umeng.com/docs/66632/detail/67032?um_channel=sdk";
+"core_auth_error_6" = "[SUIE10001]平台%@分享时，传入的参数currentViewController应该是nil或者是继承UIViewController的子类。 https://developer.umeng.com/docs/66632/detail/67032?um_channel=sdk";
+"core_getuserinfo_error_3" = "[SUIE10001]平台%@分享时，传入的参数currentViewController应该是nil或者是继承UIViewController的子类。 https://developer.umeng.com/docs/66632/detail/67032?um_channel=sdk";
+
+//wechat
+"wechat_auth_error_1" = "[SCE10002]请检查是否设置了微信的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+
+"wechat_share_error_1" = "[SCE10002]请检查是否设置了微信的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"wechat_share_error_2" = "[SCE10003]分享前，请检查微信是否安装。 https://developer.umeng.com/docs/66632/detail/67025?um_channel=sdk";
+"wechat_share_error_3" = "[SWE10001]当前的sdk不支持微信的OpenAPI,请更新最新的微信SDK。 https://developer.umeng.com/docs/66632/detail/67036?um_channel=sdk";
+"wechat_share_error_4" = "[SWE10002]微信分享不支持的分享类型，微信的分享类型为：文本，图片，网络链接，音乐链接，视频链接，Gif表情，文件。 https://developer.umeng.com/docs/66632/detail/67037?um_channel=sdk";
+"wechat_share_error_5" = "[SWE10003]下载UMShareImageObject的shareImage失败，请检查图片参数是否正确。（本地图片，请检查是否赋值，网络图片请检查是否为https，防止下载失败）。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+
+"wechat_shareWebPage_warn_1" = "[SWE10003]微信分享网页链接的时候，提供的缩略图为错误的下载url或者下载失败,具体的原因如下:%@。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+"wechat_shareWebPage_warn_2" = "[SWE10003]微信分享网页链接的时候，提供的缩略图为错误的下载url或者下载失败。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+
+"wechat_shareImage_warn_1" = "[SWE10003]微信分享图片的时候，提供的缩略图为为错误的下载url或者下载失败,具体的原因如下:%@。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+"wechat_shareImage_warn_2" = "[SWE10003]微信分享图片的时候，提供的缩略图为为错误的下载url或者下载失败。 https://developer.umeng.com/docs/66632/detail/67038?um_channel=sdk";
+// wechat info
+"wechat_info_1" = "[SWI10004]分享面板中不显示微信。 https://developer.umeng.com/docs/66632/detail/67039?um_channel=sdk";
+"wechat_info_2" = "[SWI10005]如何获取微信code。 https://developer.umeng.com/docs/66632/detail/67040?um_channel=sdk";
+"wechat_info_3" = "[SWI10007]微信分享报错提示，请请检查微信是否安装。 https://developer.umeng.com/docs/66632/detail/67042?um_channel=sdk";
+"wechat_info_4" = "[SWI10008]微信授权登录提示该链接无法访问。 https://developer.umeng.com/docs/66632/detail/67043?um_channel=sdk";
+"wechat_info_5" = "[SWI10009]微信分享报错'由于invalid_app无法分享到微信。 https://developer.umeng.com/docs/66632/detail/67044?um_channel=sdk";
+
+//qq
+"qq_auth_error_1" = "[SCE10002]请检查是否设置了QQ的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"qq_auth_error_2" = "[SQE10001]授权失败，点击qq授权没有跳转，请查看是否设置了appid,查看初始化函数:[[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_QQ appKey:???  appSecret:nil redirectURL:???];。 https://developer.umeng.com/docs/66632/detail/67045?um_channel=sdk";
+
+"qq_getuserinfo_error_1" = "[SCE10002]请检查是否设置了QQ的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"qq_getuserinfo_info_1" = "[SCE10004]可设置获得用户信息时是否清除缓存，通过UMSocialGlobal的isClearCacheWhenGetUserInfo变量来改变,默认是每次都清除用户的授权缓存。 https://developer.umeng.com/docs/66632/detail/67026?um_channel=sdk";
+
+
+"qq_share_error_1" = "[SCE10002]请检查是否设置了QQ的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"qq_share_error_2" = "[SCE10003]请检查是否安装了QQ。 https://developer.umeng.com/docs/66632/detail/67025?um_channel=sdk";
+"qq_share_error_3" = "[SQE10002]请检查当前的SDK是否支持API调用，如果不能请升级SDK或者QQ的版本。 https://developer.umeng.com/docs/66632/detail/67046?um_channel=sdk";
+"qq_share_error_4" = "[SQE10003]QQ分享不支持的分享类型，QQ的分享类型为：文本，图片，网络链接，音乐链接，视频链接。 https://developer.umeng.com/docs/66632/detail/67047?um_channel=sdk";
+
+"qq_shareWebPage_warn_1" = "[SQE10004]QQ分享网页链接的时提供的缩略图为错误的下载url或者下载失败,具体的原因如下:%@。 https://developer.umeng.com/docs/66632/detail/67048?um_channel=sdk";
+"qq_shareWebPage_warn_2" = "[SQE10004]QQ分享网页链接的时提供的缩略图为错误的下载url或者下载失败。 https://developer.umeng.com/docs/66632/detail/67048?um_channel=sdk";
+//info
+"qq_info_1" = "[SQI10005]QQ和TIM平台混淆问题。 https://developer.umeng.com/docs/66632/detail/67049?um_channel=sdk";
+"qq_info_2" = "[SQI10006]QQ登录时显示的应用名如何设置。 https://developer.umeng.com/docs/66632/detail/67050?um_channel=sdk";
+"qq_info_3" = "[SQI10007]QQ登录提示错误110406。 https://developer.umeng.com/docs/66632/detail/67051?um_channel=sdk";
+"qq_info_4" = "[SQI10008]QQ报错 100008 client request's app is not existed。 https://developer.umeng.com/docs/66632/detail/67053?um_channel=sdk";
+
+
+//sina
+"sina_auth_error_1" = "[SCE10002]请检查是否设置了sina的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+
+"sina_getuserinfo_error_1" = "[SCE10002]请检查是否设置了sina的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+
+"sina_share_error_1" = "[SCE10002]请检查是否设置了sina的URLSchema。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+"sina_share_error_2" = "[SSE10001]新浪分享不支持的分享类型，新浪的分享类型为：文本，图片，图文，网络链接，音乐链接，视频链接。 https://developer.umeng.com/docs/66632/detail/67329?um_channel=sdk";
+"sina_shareWebPage_error_1"="[SSE10002]新浪分享webpage类型(需要强制加入缩略图)错误，具体原因如下：%@。 https://developer.umeng.com/docs/66632/detail/67054?um_channel=sdk";
+"sina_shareText_Info_1" = "[SSI10003]新浪文本分享最大的字是140个，如果超过就不能分享成功，sdk默认开启截断功能，如果需要停止截断需要在调用分享前加入代码[UMSocialGlobal shareInstance].isTruncateShareText=NO。 https://developer.umeng.com/docs/66632/detail/67055?um_channel=sdk";
+//info
+"sina_info_1" = "[SSI10004]微博分享 网页(WebPage)类型，链接在微博只显示为'网页链接'的文字。 https://developer.umeng.com/docs/66632/detail/67056?um_channel=sdk";
+"sina_info_2" = "[SSI10005]微博登录报错'sso package or sign error'。 https://developer.umeng.com/docs/66632/detail/67058?um_channel=sdk";
+"sina_info_3" = "[SSI10006]微博授权实现关注官方微博功能。 https://developer.umeng.com/docs/66632/detail/67059?um_channel=sdk";
+"sina_info_4" = "[SSI10007]微博报错 redirect url mismatch。 https://developer.umeng.com/docs/66632/detail/67060?um_channel=sdk";
+
+// 钉钉支付宝
+// info
+"ding_error_1" = "[SDE10001]支付宝/钉钉返回鉴权失败。 https://developer.umeng.com/docs/66632/detail/67062?um_channel=sdk";
+
+//facebook
+"facebook_share_error_1" = "[SFE10001]facebook分享不支持的分享类型，facebook的分享类型为：文本，图片，网络链接，音乐链接，视频链接。(新版的facebook采用的是对话框的形式分享的，如果设置文本的话需要有publish_actions权限调用OpenAPI)。 https://developer.umeng.com/docs/66632/detail/67064?um_channel=sdk";
+//error
+"facebook_info_2" = "[SFI10002]FAQ: Facebook/Twitter分享点击分享后没有进入分享编辑页。 https://developer.umeng.com/docs/66632/detail/67065?um_channel=sdk";
+"facebook_info_3" = "[SFE10003]FAQ: Facebook分享失败，提示missing publish_actions permissions。 https://developer.umeng.com/docs/66632/detail/67066?um_channel=sdk";
+
+//twitter
+"twitter_auth_error_1" = "[SCE10002]请检查是否设置了 Twitter 的 URLScheme。 https://developer.umeng.com/docs/66632/detail/67024?um_channel=sdk";
+//info
+"twitter_info_1" = "[STI10001]Twitter如何获取TokenSecret。 https://developer.umeng.com/docs/66632/detail/67068?um_channel=sdk";
+"twitter_info_2" = "[STE10002]FAQ: Twitter 分享报错401。 https://developer.umeng.com/docs/66632/detail/67069?um_channel=sdk";
+
+// --------- sdk 内 log
+"core_version" = "UMShare版本号：%@。";
+// 实现handler协议提示
+"core_platform_warn_2" = "第三方或自定义平台异常：%@ > 未实现相应方法：@selector(umSocial_setAppKey:withAppSecret:withRedirectURL:)";
+"core_auth_error_2" = "未实现第三方或自定义<UMSocialPlatformProvider>协议方法@selector(umSocial_AuthorizeWithUserInfo:withViewController:withCompletionHandler:)：%@";
+"core_auth_error_3" = "未实现第三方或自定义<UMSocialPlatformProvider>协议方法@selector(umSocial_cancelAuthWithCompletionHandler:)：%@";
+"core_auth_error_5" = "未实现<UMSocialPlatformProvider>协议方法@selector(umSocial_AuthorizeWithUserInfo:withCompletionHandler:)：%@";
+"core_getuserinfo_error_2" = "未实现第三方或自定义<UMSocialPlatformProvider>协议方法@selector(umSocial_RequestForUserProfileWithViewController:completion:)：%@";
+"core_share_error_3" = "未实现第三方或自定义<UMSocialPlatformProvider>协议方法@selector(umSocial_ShareWithObject:withCompletionHandler:)：%@";
+

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.framework/1.0.0_6583d2489a_20180404113346

@@ -0,0 +1 @@
+1.0.0

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.framework/Headers/UMCommonLogHeaders.h

@@ -0,0 +1,12 @@
+//
+//  UMCommonLogHeaders.h
+//  UMCommonLog
+//
+//  Created by 张军华 on 2017/12/4.
+//  Copyright © 2017年 张军华. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+#import <UMCommonLog/UMCommonLogManager.h>

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.framework/Headers/UMCommonLogManager.h

@@ -0,0 +1,18 @@
+//
+//  UMCommonLogManager.h
+//  testUMCommonLog
+//
+//  Created by 张军华 on 2017/11/28.
+//  Copyright © 2017年 张军华. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+
+@interface UMCommonLogManager : NSObject
+
++(void) setUpUMCommonLogManager;
+
+
+@end

ZhongJingLianMeng/other/Youmeng/umcommonlog/umcommonlog_ios_1.0.0/UMCommonLog.framework/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module UMCommonLog {
+  umbrella header "UMCommonLog.h"
+
+  export *
+  module * { export * }
+}

ZhongJingLianMeng/prefixHeader/HeaderFile.h

@@ -40,5 +40,12 @@
 #import <AliyunOSSiOS/OSSService.h>
 
 #import "MBProgressHUD+MJ.h"
+
+#define 友盟埋点
+#import <UMCommon/UMCommon.h>
+#import <UMAnalytics/MobClick.h>
+
+#import <UMCommonLog/UMCommonLogHeaders.h>
+#import <UMPush/UMessage.h>
  
 #endif /* HeaderFile_h */

ZhongJingLianMeng/prefixHeader/MacroHeader.h

@@ -21,7 +21,7 @@
 #define WEIXIN_APPSECRET  @"3e84b6613b6b35c2a6190ca5c15690c8"
 #define alipay @"2016081501750777"
 #define alipayScheme @"MaipubaoScheme"
-#define UMeng_APPKEY @"5bce85b3b465f552f5000107"
+#define UMeng_APPKEY @"5c0634b8b465f5174c000239"
 
 //屏幕宽高
 #define kGScreenWidth         ([UIScreen mainScreen].bounds).size.width