diff --git a/ProductApp/ProductApp.xcodeproj/project.pbxproj b/ProductApp/ProductApp.xcodeproj/project.pbxproj index 0a9b6bb..d689aca 100644 --- a/ProductApp/ProductApp.xcodeproj/project.pbxproj +++ b/ProductApp/ProductApp.xcodeproj/project.pbxproj @@ -48,6 +48,8 @@ CA1EADB42D9A8DAA0008907A /* YuYinDianHuaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1EADB32D9A8DAA0008907A /* YuYinDianHuaViewController.m */; }; CA1EADB82D9A8E780008907A /* YuYinDianHuaView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1EADB72D9A8E780008907A /* YuYinDianHuaView.m */; }; CA1EADBB2D9A91080008907A /* YuYinDianHuaShowView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1EADBA2D9A91080008907A /* YuYinDianHuaShowView.m */; }; + CA2082ED2DB0FB1000C858FA /* XieYiAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA2082EC2DB0FB1000C858FA /* XieYiAlterView.m */; }; + CA2082F02DB0FB4000C858FA /* GengXinAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA2082EF2DB0FB4000C858FA /* GengXinAlterView.m */; }; CA2A7EA12D9B7B7C0006CD05 /* ZhuanZhangTSYViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA2A7EA02D9B7B7C0006CD05 /* ZhuanZhangTSYViewController.m */; }; CA2A7EA52D9B7BDD0006CD05 /* ZhuanZhangTSYView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA2A7EA42D9B7BDD0006CD05 /* ZhuanZhangTSYView.m */; }; CA2A7EA92D9B80FC0006CD05 /* MoNiLaiDianViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA2A7EA82D9B80FC0006CD05 /* MoNiLaiDianViewController.m */; }; @@ -55,7 +57,6 @@ CA2A7EB12D9B83E10006CD05 /* MoNiLaiDianYPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA2A7EB02D9B83E10006CD05 /* MoNiLaiDianYPViewController.m */; }; CA2A7EB52D9B84360006CD05 /* MoNiLaiDianYPView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA2A7EB42D9B84360006CD05 /* MoNiLaiDianYPView.m */; }; CA2A7EB82D9B8AE10006CD05 /* MoNiLaiDianYPViewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA2A7EB72D9B8AE10006CD05 /* MoNiLaiDianYPViewTableViewCell.m */; }; - CA2A7EE22D9B93A20006CD05 /* ShareProduct.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = CA2A7ED72D9B93A20006CD05 /* ShareProduct.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; CA3CD5792D913CFA002707C1 /* TimeTools.m in Sources */ = {isa = PBXBuildFile; fileRef = CA3CD5782D913CFA002707C1 /* TimeTools.m */; }; CA3CD57A2D913CFA002707C1 /* Tools.m in Sources */ = {isa = PBXBuildFile; fileRef = CA3CD5762D913CFA002707C1 /* Tools.m */; }; CA3CD59F2D913D27002707C1 /* UserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA3CD5872D913D27002707C1 /* UserModel.m */; }; @@ -526,16 +527,6 @@ FEC072023F9859D528B2D322 /* Pods_ProductApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE30F06E38E6805689BC5417 /* Pods_ProductApp.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - CA2A7EE02D9B93A20006CD05 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = CB489DBD27449D5C00DA044A /* Project object */; - proxyType = 1; - remoteGlobalIDString = CA2A7ED62D9B93A20006CD05; - remoteInfo = ShareProduct; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ CBD8C2A6299641ED00A2E09B /* Embed Foundation Extensions */ = { isa = PBXCopyFilesBuildPhase; @@ -543,7 +534,6 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - CA2A7EE22D9B93A20006CD05 /* ShareProduct.appex in Embed Foundation Extensions */, ); name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -636,6 +626,10 @@ CA1EADB72D9A8E780008907A /* YuYinDianHuaView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YuYinDianHuaView.m; sourceTree = ""; }; CA1EADB92D9A91080008907A /* YuYinDianHuaShowView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YuYinDianHuaShowView.h; sourceTree = ""; }; CA1EADBA2D9A91080008907A /* YuYinDianHuaShowView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YuYinDianHuaShowView.m; sourceTree = ""; }; + CA2082EB2DB0FB1000C858FA /* XieYiAlterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XieYiAlterView.h; sourceTree = ""; }; + CA2082EC2DB0FB1000C858FA /* XieYiAlterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XieYiAlterView.m; sourceTree = ""; }; + CA2082EE2DB0FB4000C858FA /* GengXinAlterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GengXinAlterView.h; sourceTree = ""; }; + CA2082EF2DB0FB4000C858FA /* GengXinAlterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GengXinAlterView.m; sourceTree = ""; }; CA2A7E9F2D9B7B7C0006CD05 /* ZhuanZhangTSYViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhuanZhangTSYViewController.h; sourceTree = ""; }; CA2A7EA02D9B7B7C0006CD05 /* ZhuanZhangTSYViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhuanZhangTSYViewController.m; sourceTree = ""; }; CA2A7EA32D9B7BDD0006CD05 /* ZhuanZhangTSYView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhuanZhangTSYView.h; sourceTree = ""; }; @@ -650,7 +644,6 @@ CA2A7EB42D9B84360006CD05 /* MoNiLaiDianYPView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MoNiLaiDianYPView.m; sourceTree = ""; }; CA2A7EB62D9B8AE10006CD05 /* MoNiLaiDianYPViewTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoNiLaiDianYPViewTableViewCell.h; sourceTree = ""; }; CA2A7EB72D9B8AE10006CD05 /* MoNiLaiDianYPViewTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MoNiLaiDianYPViewTableViewCell.m; sourceTree = ""; }; - CA2A7ED72D9B93A20006CD05 /* ShareProduct.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShareProduct.appex; sourceTree = BUILT_PRODUCTS_DIR; }; CA3CD5752D913CFA002707C1 /* Tools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Tools.h; sourceTree = ""; }; CA3CD5762D913CFA002707C1 /* Tools.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tools.m; sourceTree = ""; }; CA3CD5772D913CFA002707C1 /* TimeTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TimeTools.h; sourceTree = ""; }; @@ -1576,28 +1569,11 @@ CBD8C293299641ED00A2E09B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ -/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ - CA2A7EE32D9B93A20006CD05 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - Info.plist, - ); - target = CA2A7ED62D9B93A20006CD05 /* ShareProduct */; - }; -/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ - /* Begin PBXFileSystemSynchronizedRootGroup section */ - CA2A7ED82D9B93A20006CD05 /* ShareProduct */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (CA2A7EE32D9B93A20006CD05 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = ShareProduct; sourceTree = ""; }; + CA2A7ED82D9B93A20006CD05 /* ShareProduct */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = ShareProduct; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ - CA2A7ED42D9B93A20006CD05 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; CB489DC227449D5C00DA044A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -2003,6 +1979,10 @@ CA589DB92D9786C000D85384 /* PickerAlterView.m */, CAA1788F2DAF806900F3996F /* ShatAlterView.h */, CAA178902DAF806900F3996F /* ShatAlterView.m */, + CA2082EB2DB0FB1000C858FA /* XieYiAlterView.h */, + CA2082EC2DB0FB1000C858FA /* XieYiAlterView.m */, + CA2082EE2DB0FB4000C858FA /* GengXinAlterView.h */, + CA2082EF2DB0FB4000C858FA /* GengXinAlterView.m */, ); path = LoadAlter; sourceTree = ""; @@ -3954,7 +3934,6 @@ isa = PBXGroup; children = ( CB489DC527449D5C00DA044A /* ProductApp.app */, - CA2A7ED72D9B93A20006CD05 /* ShareProduct.appex */, ); name = Products; sourceTree = ""; @@ -4703,26 +4682,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - CA2A7ED62D9B93A20006CD05 /* ShareProduct */ = { - isa = PBXNativeTarget; - buildConfigurationList = CA2A7EE42D9B93A20006CD05 /* Build configuration list for PBXNativeTarget "ShareProduct" */; - buildPhases = ( - CA2A7ED32D9B93A20006CD05 /* Sources */, - CA2A7ED42D9B93A20006CD05 /* Frameworks */, - CA2A7ED52D9B93A20006CD05 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - fileSystemSynchronizedGroups = ( - CA2A7ED82D9B93A20006CD05 /* ShareProduct */, - ); - name = ShareProduct; - productName = ShareProduct; - productReference = CA2A7ED72D9B93A20006CD05 /* ShareProduct.appex */; - productType = "com.apple.product-type.app-extension"; - }; CB489DC427449D5C00DA044A /* ProductApp */ = { isa = PBXNativeTarget; buildConfigurationList = CB489DDE27449D5D00DA044A /* Build configuration list for PBXNativeTarget "ProductApp" */; @@ -4738,7 +4697,6 @@ buildRules = ( ); dependencies = ( - CA2A7EE12D9B93A20006CD05 /* PBXTargetDependency */, ); name = ProductApp; productName = ProductApp; @@ -4754,9 +4712,6 @@ BuildIndependentTargetsInParallel = 1; LastUpgradeCheck = 1300; TargetAttributes = { - CA2A7ED62D9B93A20006CD05 = { - CreatedOnToolsVersion = 16.2; - }; CB489DC427449D5C00DA044A = { CreatedOnToolsVersion = 13.0; }; @@ -4776,19 +4731,11 @@ projectRoot = ""; targets = ( CB489DC427449D5C00DA044A /* ProductApp */, - CA2A7ED62D9B93A20006CD05 /* ShareProduct */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - CA2A7ED52D9B93A20006CD05 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; CB489DC327449D5C00DA044A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -4958,13 +4905,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - CA2A7ED32D9B93A20006CD05 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; CB489DC127449D5C00DA044A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -5249,6 +5189,7 @@ CAA178442DAF803B00F3996F /* XWChatPaiXuBottomView.m in Sources */, CAA178452DAF803B00F3996F /* XWChatHomeZhiDingViewTableViewCell.m in Sources */, CAA178462DAF803B00F3996F /* XWWoZDTJYueJEEditViewController.m in Sources */, + CA2082ED2DB0FB1000C858FA /* XieYiAlterView.m in Sources */, CAA178472DAF803B00F3996F /* XWLinQianTongModel.m in Sources */, CAA178482DAF803B00F3996F /* XWWoZDTJTypeView.m in Sources */, CAA178492DAF803B00F3996F /* XWChatDanSetNextTableViewCell.m in Sources */, @@ -5336,6 +5277,7 @@ CB489F752744A0BD00DA044A /* NavgationController.m in Sources */, CA3CD5B42D913D33002707C1 /* PublicNetWorkManager.m in Sources */, CA3CD5B52D913D33002707C1 /* PublicUploadImageManager.m in Sources */, + CA2082F02DB0FB4000C858FA /* GengXinAlterView.m in Sources */, CAB2AB482D9242D30022C535 /* MainHomeViewController.m in Sources */, CAA178A22DAF822000F3996F /* UITableView+MoveCell.m in Sources */, CA1EADB82D9A8E780008907A /* YuYinDianHuaView.m in Sources */, @@ -5384,14 +5326,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - CA2A7EE12D9B93A20006CD05 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = CA2A7ED62D9B93A20006CD05 /* ShareProduct */; - targetProxy = CA2A7EE02D9B93A20006CD05 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ CB489DD127449D5C00DA044A /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -5412,68 +5346,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - CA2A7EE52D9B93A20006CD05 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_ENTITLEMENTS = ShareProduct/ShareProduct.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = B8MTNU3W9A; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = ShareProduct/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = ShareProduct; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 18.2; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.lb.zyds.ShareProduct; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - CA2A7EE62D9B93A20006CD05 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CODE_SIGN_ENTITLEMENTS = ShareProduct/ShareProduct.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = B8MTNU3W9A; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = ShareProduct/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = ShareProduct; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 18.2; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.lb.zyds.ShareProduct; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; CB489DDC27449D5D00DA044A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -5628,6 +5500,7 @@ INFOPLIST_KEY_NSMicrophoneUsageDescription = "相机"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "装样大师意见反馈和短信通知和模拟来电上传图片需要使用相册"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "装样大师视频模拟需要保存视频到相册"; + INFOPLIST_KEY_NSUserTrackingUsageDescription = "装样大师用于推荐个性化广告"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -5694,6 +5567,7 @@ INFOPLIST_KEY_NSMicrophoneUsageDescription = "相机"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "装样大师意见反馈和短信通知和模拟来电上传图片需要使用相册"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "装样大师视频模拟需要保存视频到相册"; + INFOPLIST_KEY_NSUserTrackingUsageDescription = "装样大师用于推荐个性化广告"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -5721,15 +5595,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - CA2A7EE42D9B93A20006CD05 /* Build configuration list for PBXNativeTarget "ShareProduct" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CA2A7EE52D9B93A20006CD05 /* Debug */, - CA2A7EE62D9B93A20006CD05 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; CB489DC027449D5C00DA044A /* Build configuration list for PBXProject "ProductApp" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index d504803..068441a 100644 Binary files a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate and b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ProductApp/ProductApp/AppDelegate.m b/ProductApp/ProductApp/AppDelegate.m index 1755281..2c7c0f9 100644 --- a/ProductApp/ProductApp/AppDelegate.m +++ b/ProductApp/ProductApp/AppDelegate.m @@ -65,7 +65,7 @@ self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; [GeYanSdk setEloginTimeout:10]; //登录超时时长 // NSLog(@"pgj = %@",[GeYanSdk getVersion]); //初始化 - [GeYanSdk startWithAppId:kGtAppId + [GeYanSdk startWithAppId:GeTuiAPPID withCallback:^(BOOL isSuccess, NSError *error, NSString *gtcid) { NSLog(@"GeYanSdk startWithAppId gtcid:%@", gtcid); }]; @@ -75,14 +75,25 @@ self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; NSLog(@"preGetToken:%@", preDic); }]; - //推送 - // 通过个推平台分配的appId、 appKey 、appSecret 启动SDK，注：该方法需要在主线程中调用 - [GeTuiSdk startSdkWithAppId:kGtAppId appKey:kGtAppKey appSecret:kGtAppSecret delegate:self launchingOptions:launchOptions]; - - // 注册远程通知 - [GeTuiSdk registerRemoteNotification: (UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge)]; +// //推送 +// // 通过个推平台分配的appId、 appKey 、appSecret 启动SDK，注：该方法需要在主线程中调用 +// [GeTuiSdk startSdkWithAppId:kGtAppId appKey:kGtAppKey appSecret:kGtAppSecret delegate:self launchingOptions:launchOptions]; +// +// // 注册远程通知 +// [GeTuiSdk registerRemoteNotification: (UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge)]; }); } +- (void)applicationDidBecomeActive:(UIApplication *)application +{ + /// + [[NSNotificationCenter defaultCenter] postNotificationName:@"huoquidfanotifi" object:nil]; +} +- (void)applicationWillResignActive:(UIApplication *)application +{ + +} + + @end diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 1.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 1.png new file mode 100644 index 0000000..3181e17 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 1.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 2.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 2.png new file mode 100644 index 0000000..3a7f864 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 2.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 3.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 3.png new file mode 100644 index 0000000..3a7f864 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 3.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 4.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 4.png new file mode 100644 index 0000000..9ad91d6 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 4.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 5.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 5.png new file mode 100644 index 0000000..4ff8dc1 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 5.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 6.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 6.png new file mode 100644 index 0000000..bf9602f Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 6.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 7.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 7.png new file mode 100644 index 0000000..fae95eb Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 7.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 8.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 8.png new file mode 100644 index 0000000..bf5b96f Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本 8.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本.png index e407f0d..013511f 100644 Binary files a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本.png and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512x512直角@1x_副本.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/Contents.json index 8e7f638..820298c 100644 --- a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,41 +1,49 @@ { "images" : [ { + "filename" : "512x512直角@1x_副本 8.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "512x512直角@1x_副本 6.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "512x512直角@1x_副本 7.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "512x512直角@1x_副本 4.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "512x512直角@1x_副本 5.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "512x512直角@1x_副本 2.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "512x512直角@1x_副本 3.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "512x512直角@1x_副本 1.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" diff --git a/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/Contents.json new file mode 100644 index 0000000..13017c3 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 45808@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 45808@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/组 45808@2x.png b/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/组 45808@2x.png new file mode 100644 index 0000000..b6eb4d0 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/组 45808@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/组 45808@3x.png b/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/组 45808@3x.png new file mode 100644 index 0000000..3be70e8 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/gengxinback.imageset/组 45808@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/Contents.json new file mode 100644 index 0000000..ebedcfb --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 45502@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 45502@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/组 45502@2x.png b/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/组 45502@2x.png new file mode 100644 index 0000000..6796df5 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/组 45502@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/组 45502@3x.png b/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/组 45502@3x.png new file mode 100644 index 0000000..875cd21 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/xieyialterBack.imageset/组 45502@3x.png differ diff --git a/ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m b/ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m index fe36914..a7d8128 100644 --- a/ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m +++ b/ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m @@ -257,7 +257,7 @@ static NSTimeInterval af_timeout = 30.0f; { [dicheadertemp setDictionary:Headers]; } - [dicheadertemp setObject:@"com.devcon.audi" forKey:@"x-package"]; + [dicheadertemp setObject:@"com.devcon.flaunt" forKey:@"x-package"]; NSArray *arrkeys = [dicheadertemp allKeys]; for(NSString *key in arrkeys) diff --git a/ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.m b/ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.m index de4c5af..d6cfd9d 100644 --- a/ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.m +++ b/ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.m @@ -206,7 +206,7 @@ static UserInfoModel *userinfo; BOOL ispay = NO; if([UserInfoModel shareModel].config != nil) { - NSString *str = [[UserInfoModel shareModel].config objectForKey:@"client.material.search"]; + NSString *str = [[UserInfoModel shareModel].config objectForKey:@"client.pay.enable"]; if(str.intValue == 1 || [Tools isStringnil:str].length==0) { ispay = YES; diff --git a/ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.h b/ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.h index 160a7a0..ace1a4e 100644 --- a/ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.h +++ b/ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.h @@ -16,7 +16,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong) NSString *strurl; ///内容 @property (nonatomic,strong) NSString *strcontnt; - +/// +@property (nonatomic , strong) UIView *viewsuperShow; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/Configure/ConfigireSetting.h b/ProductApp/ProductApp/Configure/ConfigireSetting.h index 75da8f6..c2059cd 100644 --- a/ProductApp/ProductApp/Configure/ConfigireSetting.h +++ b/ProductApp/ProductApp/Configure/ConfigireSetting.h @@ -13,10 +13,15 @@ NS_ASSUME_NONNULL_BEGIN //********************项目域名配置*********************** ///解密 -#define AESJieMiKey @"xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil" +#define AESJieMiKey @"e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB" ///加密字符 -#define MDPassword @"e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB" - +#define MDPassword @"xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil" +/* + { + "server.api.encrypt.password": "e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB", + "server.api.signature.password": "xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil" + } + */ //******服***** #define BaseUrl @"https://flaunt.batiao8.com/" @@ -115,11 +120,16 @@ alpha:alphaValue] #define ZhiFuBaoPayNotifi @"ZhiFuBaoPayNotifi" #define ZhiFuBaoStringPay @"5pSv5LuY5a6d" +///协议弹窗 +#define YongHuXieYiState @"YongHuXieYiState" + //用户协议 #define UserXieUrl @"static/policy/user.html" //隐私协议 #define UserYinSiUrl @"static/policy/provacy.html" +#define AppXZUrl @"itms-apps://itunes.apple.com/cn/app/id6744357775?mt=8" + @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/LoadAlter/GengXinAlterView.h b/ProductApp/ProductApp/ProductMain/LoadAlter/GengXinAlterView.h new file mode 100644 index 0000000..15389d7 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/LoadAlter/GengXinAlterView.h @@ -0,0 +1,16 @@ +// +// GengXinAlterView.h +// ProductApp +// +// Created by 工作 on 2025/4/10. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface GengXinAlterView : UIView ++(void)showName:(NSString *)name strversion:(NSString *)strversion isforce:(BOOL)isforce; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/LoadAlter/XieYiAlterView.m b/ProductApp/ProductApp/ProductMain/LoadAlter/XieYiAlterView.m new file mode 100644 index 0000000..2331acf --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/LoadAlter/XieYiAlterView.m @@ -0,0 +1,184 @@ +// +// XieYiAlterView.m +// ProductApp +// +// Created by 工作 on 2024/6/20. +// + +#import "XieYiAlterView.h" +#import +#import "AppDelegate.h" +#import "TabBarController.h" +#import "WkWebviewViewController.h" + +@implementation XieYiAlterView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + [self setBackgroundColor:RGBACOLOR(0, 0, 0, 0.4)]; + + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(50); + make.right.equalTo(self).offset(-50); + make.center.equalTo(self); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:20]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"xieyialterBack"]]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.top.equalTo(viewback); + make.height.offset(100); + }]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"欢迎使用"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentCenter]; + [lbname setFont:[UIFont boldSystemFontOfSize:18]]; + [lbname setNumberOfLines:0]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(20); + make.left.offset(20); + make.right.equalTo(viewback).offset(-20); + }]; + + YYLabel *lbinfo = [[YYLabel alloc] init]; + [lbinfo setText:@"请你务必审慎阅读、充分理解《服务协议》和《隐私政策》各条款，包括但不限于:为了更好的向你 提供服务，我们需要访问你的相册、IDFA等信息等。你可阅读《隐私政策》了解详细信息。如果你同意，请点击下面同意按钮开始接受我们的服务。"]; + [lbinfo setTextColor:RGBCOLOR(51, 51, 51)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [lbinfo setNumberOfLines:0]; + [viewback addSubview:lbinfo]; + float fh = [Tools getLabelHeightWithText:lbinfo.text width:UISCREEN_WIDTH-148 font:14 linHeight:5]+2; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(24); + make.right.equalTo(viewback).offset(-24); + make.top.equalTo(lbname.mas_bottom).offset(20); + make.height.offset(fh); + }]; + + NSMutableAttributedString *noteStr = [[NSMutableAttributedString alloc]initWithString:lbinfo.text]; + + NSMutableParagraphStyle *style = [NSMutableParagraphStyle new]; + style.lineSpacing = 5; + style.lineBreakMode = NSLineBreakByTruncatingTail; + [noteStr addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, lbinfo.text.length)]; + noteStr.yy_font = [UIFont boldSystemFontOfSize:14.0f]; + noteStr.yy_color = RGBCOLOR(51, 51, 51); + [noteStr yy_setTextHighlightRange:NSMakeRange(13, 6) color:RGBCOLOR(92, 117, 248) backgroundColor:[UIColor whiteColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + NSLog(@"服务协议"); + [self pushXieYiTag:0]; + }]; + [noteStr yy_setTextHighlightRange:NSMakeRange(20, 6) color:RGBCOLOR(92, 117, 248) backgroundColor:[UIColor whiteColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + NSLog(@"隐私政策"); + [self pushXieYiTag:1]; + }]; + [noteStr yy_setTextHighlightRange:NSMakeRange(74, 6) color:RGBCOLOR(92, 117, 248) backgroundColor:[UIColor whiteColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + NSLog(@"隐私政策"); + [self pushXieYiTag:1]; + }]; + + lbinfo.attributedText = noteStr; + + + UIButton *btok = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-256, 40)]; + [btok setTitle:@"同意并继续" forState:UIControlStateNormal]; + [btok setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btok.titleLabel setFont:[UIFont systemFontOfSize:16]]; + [viewback addSubview:btok]; + [btok mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(viewback).offset(-24); + make.top.equalTo(lbinfo.mas_bottom).offset(20); + make.height.offset(40); + make.width.equalTo(viewback).offset(-156); + }]; + [btok addTarget:self action:@selector(okAction) forControlEvents:UIControlEventTouchUpInside]; + [btok.layer setMasksToBounds:YES]; + [btok.layer setCornerRadius:20]; + [Tools changedView:btok colors:@[(id)RGBCOLOR(119, 140, 245).CGColor,(id)RGBCOLOR(166, 121, 244).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + + UIButton *btdis = [[UIButton alloc] init]; + [btdis setTitle:@"不同意" forState:UIControlStateNormal]; + [btdis setTitleColor:RGBCOLOR(102, 102, 102) forState:UIControlStateNormal]; + [btdis.titleLabel setFont:[UIFont systemFontOfSize:16]]; + [btdis setBackgroundColor:RGBCOLOR(238, 238, 238)]; + [viewback addSubview:btdis]; + [btdis mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(24); + make.top.height.equalTo(btok); + make.right.equalTo(btok.mas_left).offset(-12); + }]; + [btdis.layer setMasksToBounds:YES]; + [btdis.layer setCornerRadius:20]; + [btdis addTarget:self action:@selector(disAction) forControlEvents:UIControlEventTouchUpInside]; + + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(btdis).offset(19); + }]; + + } + return self; +} +-(void)pushXieYiTag:(int)tag +{ + AppDelegate *app = (AppDelegate *)[UIApplication sharedApplication].delegate; + UINavigationController *nav; + if([app.window.rootViewController isKindOfClass:[UINavigationController class]]) + { + nav = (UINavigationController *)app.window.rootViewController; + } + else + { + TabBarController *tabbar = (TabBarController *)app.window.rootViewController; + nav = tabbar.selectedViewController; + } + + + WkWebviewViewController *vc = [[WkWebviewViewController alloc] init]; + if(tag==0) + { + vc.strtitle = @"服务协议"; + vc.strurl = UserXieUrl; + } + else + { + vc.strtitle = @"隐私政策"; + vc.strurl = UserYinSiUrl; + } + vc.viewsuperShow = self; + [nav pushViewController:vc animated:YES]; + +} +-(void)okAction +{ + [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:YongHuXieYiState]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"YongHuTongYiXieYi" object:nil]; + [self removeFromSuperview]; +} +-(void)disAction +{ + [HXHud showMessage:@"需要同意才能使用APP" afterDelayType:0]; +} ++(void)show +{ + if([[[NSUserDefaults standardUserDefaults] objectForKey:YongHuXieYiState] intValue] != 1) + { + XieYiAlterView *view = [[XieYiAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + AppDelegate *app = (AppDelegate *)[UIApplication sharedApplication].delegate; + [app.window addSubview:view]; + } + else + { + [[NSNotificationCenter defaultCenter] postNotificationName:@"YongHuTongYiXieYi" object:nil]; + } +} +@end diff --git a/ProductApp/ProductApp/ProductMain/我的/MainMyViewController.m b/ProductApp/ProductApp/ProductMain/我的/MainMyViewController.m index 911da33..9fe7ede 100644 --- a/ProductApp/ProductApp/ProductMain/我的/MainMyViewController.m +++ b/ProductApp/ProductApp/ProductMain/我的/MainMyViewController.m @@ -7,9 +7,11 @@ #import "MainMyViewController.h" #import "MainMyView.h" - +#import "PublicNetWorkManager.h" @interface MainMyViewController () +/// +@property (nonatomic , strong) MainMyView *viewback; @end @@ -20,7 +22,7 @@ -(void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; - + [self getdata]; } - (void)viewDidLoad { [super viewDidLoad]; @@ -32,8 +34,23 @@ [viewback mas_makeConstraints:^(MASConstraintMaker *make) { make.edges.equalTo(self.view); }]; + _viewback = viewback; +} +-(void)getdata +{ + [PublicNetWorkManager requestUserData:self.view Callback:^(BOOL state, UserModel *responseObject, NSString * _Nullable describle) { + if(state) + { + [UserInfoModel setRole:responseObject.data.role]; + [UserInfoModel setTemp:responseObject.data.temp]; + [UserInfoModel shareModel].vip = responseObject.data.vip; + [UserInfoModel shareModel].balance = responseObject.data.balance; + [UserInfoModel setUserid:responseObject.data.user_id]; + self.viewback.modelDetail = responseObject.data; + } + }]; + } - @end diff --git a/ProductApp/ProductApp/ProductMain/我的/view/MainMyUserView.h b/ProductApp/ProductApp/ProductMain/我的/view/MainMyUserView.h index d0995fd..cf1c5c7 100644 --- a/ProductApp/ProductApp/ProductMain/我的/view/MainMyUserView.h +++ b/ProductApp/ProductApp/ProductMain/我的/view/MainMyUserView.h @@ -6,11 +6,12 @@ // #import - +#import "UserModel.h" NS_ASSUME_NONNULL_BEGIN @interface MainMyUserView : UIView - +/// +@property (nonatomic , strong) UserModelData *modelDetail; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/我的/view/MainMyUserView.m b/ProductApp/ProductApp/ProductMain/我的/view/MainMyUserView.m index 5526091..4710ac1 100644 --- a/ProductApp/ProductApp/ProductMain/我的/view/MainMyUserView.m +++ b/ProductApp/ProductApp/ProductMain/我的/view/MainMyUserView.m @@ -78,7 +78,10 @@ [lbweidenglu mas_makeConstraints:^(MASConstraintMaker *make) { make.edges.equalTo(viewwdl); }]; - + if([UserInfoModel shareModel].temp.intValue == 0) + { + [self.viewwdl setHidden:YES]; + } UILabel *lbID = [[UILabel alloc] init]; [lbID setText:[NSString stringWithFormat:@"ID：%@",[UserInfoModel shareModel].userid]]; @@ -93,12 +96,6 @@ _lbID = lbID; - -// if([UserInfoModel shareModel].temp.intValue == 0) -// { -// [self.viewwdl setHidden:YES]; -// } - UIButton *btuser = [[UIButton alloc] init]; [self addSubview:btuser]; [btuser mas_makeConstraints:^(MASConstraintMaker *make) { @@ -122,35 +119,35 @@ } return self; } -//-(void)setModelDetail:(UserModelData *)modelDetail -//{ -// _modelDetail = modelDetail; -// [self.imgvhead sd_setImageWithURL:[NSURL URLWithString:[Tools isStringnil:self.modelDetail.avater]] placeholderImage:[UIImage imageNamed:@"hb_log"]]; -// self.lbname.text = [Tools isStringnil:modelDetail.name]; -// self.lbID.text = [NSString stringWithFormat:@"ID：%@",modelDetail.user_id]; -// if(modelDetail.temp.intValue != 1) -// { -// [self.viewwdl setHidden:YES]; -// } -// else -// { -// [self.viewwdl setHidden:NO]; -// } -//} +-(void)setModelDetail:(UserModelData *)modelDetail +{ + _modelDetail = modelDetail; + [self.imgvhead sd_setImageWithURL:[NSURL URLWithString:[Tools isStringnil:self.modelDetail.avater]] placeholderImage:[UIImage imageNamed:@"hb_log"]]; + self.lbname.text = [Tools isStringnil:modelDetail.name]; + self.lbID.text = [NSString stringWithFormat:@"ID：%@",modelDetail.user_id]; + if(modelDetail.temp.intValue != 1) + { + [self.viewwdl setHidden:YES]; + } + else + { + [self.viewwdl setHidden:NO]; + } +} -(void)copyAction { -// UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; -// pasteboard.string = [Tools isStringnil:self.modelDetail.user_id]; -// [HXHud showMessage:@"复制成功" afterDelayType:0]; + UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; + pasteboard.string = [Tools isStringnil:self.modelDetail.user_id]; + [HXHud showMessage:@"复制成功" afterDelayType:0]; } ///用户信息 游客才有以下数据 并且点击进入登录页面 -(void)userAction { -// if(self.modelDetail.temp.intValue == 1) -// { -// LoginViewController *vc = [[LoginViewController alloc] init]; -// [self.viewController.navigationController pushViewController:vc animated:YES]; -// } + if(self.modelDetail.temp.intValue == 1) + { + LoginViewController *vc = [[LoginViewController alloc] init]; + [self.viewController.navigationController pushViewController:vc animated:YES]; + } } diff --git a/ProductApp/ProductApp/ProductMain/我的/view/MainMyView.h b/ProductApp/ProductApp/ProductMain/我的/view/MainMyView.h index 50a66fb..15e386d 100644 --- a/ProductApp/ProductApp/ProductMain/我的/view/MainMyView.h +++ b/ProductApp/ProductApp/ProductMain/我的/view/MainMyView.h @@ -6,11 +6,12 @@ // #import - +#import "UserModel.h" NS_ASSUME_NONNULL_BEGIN @interface MainMyView : UIView - +/// +@property (nonatomic , strong) UserModelData *modelDetail; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/我的/view/MainMyView.m b/ProductApp/ProductApp/ProductMain/我的/view/MainMyView.m index 964264c..51bf2be 100644 --- a/ProductApp/ProductApp/ProductMain/我的/view/MainMyView.m +++ b/ProductApp/ProductApp/ProductMain/我的/view/MainMyView.m @@ -22,7 +22,8 @@ @interface MainMyView () - +/// +@property (nonatomic , strong) MainMyUserView *viewinfo; ///会员信息 @property (nonatomic , strong) UILabel *lbHYname; @@ -72,6 +73,7 @@ make.width.equalTo(scvback); make.height.offset(90); }]; + _viewinfo = viewinfo; UIImageView *imgvhy = [[UIImageView alloc] init]; [imgvhy setImage:[UIImage imageNamed:@"my_VIPBack"]]; @@ -115,7 +117,7 @@ }]; - self.arrdata = [NSMutableArray arrayWithObjects:@"优惠券",@"分享好友",@"在线客服",@"意见反馈",@"设置", nil]; + self.arrdata = [NSMutableArray arrayWithObjects:@"分享好友",@"在线客服",@"意见反馈",@"设置", nil];//@"优惠券", [self.tableView reloadData]; [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) { make.height.offset(60*self.arrdata.count); @@ -160,11 +162,36 @@ }]; [bthy addTarget:self action:@selector(hyAction) forControlEvents:UIControlEventTouchUpInside]; } + +-(void)setModelDetail:(UserModelData *)modelDetail +{ + _modelDetail = modelDetail; + self.viewinfo.modelDetail = modelDetail; + + if([UserInfoModel shareModel].vip.intValue==2) + { + [self.lbHYname setText:@"普通会员"]; + [self.lbHYinfo setText:[NSString stringWithFormat:@"%@ 会员到期",modelDetail.vip_expire]]; + } + else if([UserInfoModel shareModel].vip.intValue==3) + { + [self.lbHYname setText:@"终身会员"]; + [self.lbHYinfo setText:@"享受永久会员专属权益"]; + } + else + { + [self.lbHYname setText:@"装样大师·会员"]; + [self.lbHYinfo setText:@"点击成为会员解锁所有功能"]; + } +} + -(void)hyAction { - HuiYuanZXViewController *vc = [HuiYuanZXViewController new]; - - [self.viewController.navigationController pushViewController:vc animated:YES]; + if([UserInfoModel shareModel].vip.intValue != 3) + { + HuiYuanZXViewController *vc = [HuiYuanZXViewController new]; + [self.viewController.navigationController pushViewController:vc animated:YES]; + } } #pragma mark - UITableView -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section diff --git a/ProductApp/ProductApp/ProductMain/首页/MainHomeViewController.m b/ProductApp/ProductApp/ProductMain/首页/MainHomeViewController.m index 94635dc..addd78e 100644 --- a/ProductApp/ProductApp/ProductMain/首页/MainHomeViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/MainHomeViewController.m @@ -8,9 +8,30 @@ #import "MainHomeViewController.h" #import "MainHomeView.h" +#import "PublicNetWorkManager.h" +#import "XieYiAlterView.h" + +#import +#import +#import +#import + +#import + +#import "GengXinAlterView.h" +#import "TabBarController.h" +#import "NavgationController.h" @interface MainHomeViewController () +@property (nonatomic , assign) BOOL isnetwork; +@property (nonatomic , assign) BOOL isgedata; +/// +@property (nonatomic , strong) UserConfigModelData *modelDetail; + +/// +@property (nonatomic , strong) MainHomeView *viewShow; + @end @implementation MainHomeViewController @@ -33,10 +54,183 @@ make.left.top.offset(0); make.width.bottom.equalTo(self.view); }]; + _viewShow = view; + [self getAllData]; +} + +-(void)getAllData +{ + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + ///用户协议 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tongYiXieYi) name:@"YongHuTongYiXieYi" object:nil]; + [XieYiAlterView show]; + }); + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(network) name:@"huoquidfanotifi" object:nil]; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self getData]; + }); +} +///用户同意了协议 +-(void)tongYiXieYi +{ + [[NSNotificationCenter defaultCenter] removeObserver:self name:@"YongHuTongYiXieYi" object:nil]; + ///同意了协议再注册友盟 + [UMConfigure initWithAppkey:YouMengAppKey channel:@"App Store"]; + [UMCommonLogManager setUpUMCommonLogManager]; +} +-(void)showUpDataAltre:(NSDictionary *)dic +{ + NSString *strfw = [[dic objectForKey:@"version"] stringByReplacingOccurrencesOfString:@"." withString:@""]; + NSString *strbd = [[Tools applicationVersion] stringByReplacingOccurrencesOfString:@"." withString:@""]; + NSString *strbig = [[dic objectForKey:@"last_version_force"] stringByReplacingOccurrencesOfString:@"." withString:@""]; + + if(strfw.intValue>strbd.intValue) + { + + BOOL isforce = [[dic objectForKey:@"force"] boolValue]; + + if(strbd.intValue<=strbig.intValue) + { + isforce = YES; + } + + [GengXinAlterView showName:[Tools isStringnil:[dic objectForKey:@"description"]] strversion:[NSString stringWithFormat:@"V%@",[dic objectForKey:@"version"]] isforce:isforce]; + } +} + +-(void)network +{ + if(self.isnetwork) + { + [self getIdfa]; + return; + } + AFNetworkReachabilityManager *manager = [AFNetworkReachabilityManager sharedManager]; + [manager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) { + switch (status) { + case AFNetworkReachabilityStatusUnknown: + self.isnetwork = NO; + break; + + case AFNetworkReachabilityStatusNotReachable: + self.isnetwork = NO; + break; + + case AFNetworkReachabilityStatusReachableViaWWAN: + { + self.isnetwork = YES; + [self getIdfa]; + } + break; + + case AFNetworkReachabilityStatusReachableViaWiFi: + { + self.isnetwork = YES; + [self getIdfa]; + } + break; + default: + break; + } + }]; + [manager startMonitoring]; +} + +-(void)getData +{ + if(self.modelDetail!=nil || self.isgedata==YES)return; + self.isgedata = YES; + NSString *stridfa = [[NSUserDefaults standardUserDefaults] objectForKey:UserIDFA]; + [PublicNetWorkManager requestUserConfigData:self.view idfa:stridfa Callback:^(BOOL state, UserConfigModel *responseObject, NSString * _Nullable describle) { + if(state) + { + [[NSNotificationCenter defaultCenter] removeObserver:self name:@"huoquidfanotifi" object:nil]; + self.modelDetail = responseObject.data; + [UserInfoModel setToken:responseObject.data.token]; + [UserInfoModel setLoingState:@"1"]; + [UserInfoModel setUserid:responseObject.data.user_id]; + [UserInfoModel setAppid:responseObject.data.app_id]; + [UserInfoModel setRole:responseObject.data.role]; + [UserInfoModel setTemp:responseObject.data.temp]; + [UserInfoModel setName:responseObject.data.name]; + [UserInfoModel setConfig:responseObject.data.config]; + + [UserInfoModel shareModel].isloadconfig = YES; + [self getUserInfoData]; + + ///版本信息 version title description force + NSDictionary *dic = [[UserInfoModel shareModel].config objectForKey:@"client.version.upgrade"]; + [self showUpDataAltre:dic]; + + [self.viewShow refShowData]; + + } + else + { + self.isgedata = NO; + } + }]; +} + +-(void)getUserInfoData +{ + [PublicNetWorkManager requestUserData:self.view Callback:^(BOOL state, UserModel *responseObject, NSString * _Nullable describle) { + if(state) + { + [UserInfoModel setRole:responseObject.data.role]; + [UserInfoModel setTemp:responseObject.data.temp]; + [UserInfoModel shareModel].vip = responseObject.data.vip; + } + }]; +} + +-(void)getIdfa +{ + if (@available(iOS 14, *)) { + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) { + // 处理用户响应 + if (status == ATTrackingManagerAuthorizationStatusAuthorized) { + + if([[[NSUserDefaults standardUserDefaults] objectForKey:UserIDFA] length] == 0) + { + NSString *idfa = [[ASIdentifierManager sharedManager] advertisingIdentifier].UUIDString; + [[NSUserDefaults standardUserDefaults] setObject:idfa forKey:UserIDFA]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"huoquidfanotifi" object:nil]; + } + dispatch_async(dispatch_get_main_queue(), ^{ + [self getData]; + }); + } + else if (status == ATTrackingManagerAuthorizationStatusDenied) + { + if([[[NSUserDefaults standardUserDefaults] objectForKey:UserIDFA] length] == 0) + { + [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserIDFA]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"huoquidfanotifi" object:nil]; + } + dispatch_async(dispatch_get_main_queue(), ^{ + [self getData]; + }); + } + else if (status == ATTrackingManagerAuthorizationStatusNotDetermined) + { + + } + }]; + }); + + } else { + // 在iOS 14以下版本中，直接获取IDFA + NSString *idfa = [[ASIdentifierManager sharedManager] advertisingIdentifier].UUIDString; + [[NSUserDefaults standardUserDefaults] setObject:idfa forKey:UserIDFA]; + dispatch_async(dispatch_get_main_queue(), ^{ + [self getData]; + }); + } } - @end diff --git a/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.h b/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.h index 41712bd..ca82027 100644 --- a/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.h +++ b/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN @interface MainHomeView : UIView - +-(void)refShowData; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.m b/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.m index 0607b17..25ccddd 100644 --- a/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.m +++ b/ProductApp/ProductApp/ProductMain/首页/view/MainHomeView.m @@ -13,6 +13,14 @@ @property (nonatomic, strong) SDCycleScrollView *cleScrollView; //轮播 @property (nonatomic, strong) SDCycleScrollView *cleScrollBottomView; + +/// +@property (nonatomic , strong) UIView *viewinfo; +/// +@property (nonatomic , strong) UIView *viewxw; +@property (nonatomic , strong) UIView *viewcenter; +@property (nonatomic , strong) UIView *viewbottom; + @end @implementation MainHomeView @@ -65,59 +73,10 @@ }]; [viewinfo.layer setMasksToBounds:YES]; [viewinfo.layer setCornerRadius:20]; + _viewinfo = viewinfo; - UIView *viewxw = [[UIView alloc] init]; - [viewinfo addSubview:viewxw]; - [viewxw mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(viewinfo); - make.top.offset(20); - }]; - [self drawInfoTop:viewxw]; - - UIView *viewcenter = [[UIView alloc] init]; - [viewinfo addSubview:viewcenter]; - [viewcenter mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(viewinfo); - make.top.equalTo(viewxw.mas_bottom).offset(10); - make.height.offset(90); - }]; - [self drawSmallsView:viewcenter values:@[@"模拟来电",@"语音电话",@"视频电话",@"微信通知"]]; -// [self drawSmallsView:viewcenter values:@[@"语音电话",@"视频电话"]]; - - UIView *viewbottom = [[UIView alloc] init]; - [viewinfo addSubview:viewbottom]; - [viewbottom mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(viewinfo); - make.top.equalTo(viewcenter.mas_bottom).offset(10); - make.height.offset(90); - }]; - [self drawSmallsView:viewbottom values:@[@"模拟余额",@"模拟转账",@"短信通知",@"模拟视频"]]; -// [self drawSmallsView:viewbottom values:@[@"模拟来电",@"短信通知",@"模拟视频",@"微信通知"]]; - - - SDCycleScrollView *cleScrollBottomView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero imageNamesGroup:@[]]; - cleScrollBottomView.scrollDirection = UICollectionViewScrollDirectionHorizontal; - cleScrollBottomView.delegate = self; - cleScrollBottomView.backgroundColor = [UIColor clearColor]; - cleScrollBottomView.titleLabelBackgroundColor = [UIColor clearColor]; - cleScrollBottomView.titleLabelTextColor = [UIColor darkGrayColor]; - cleScrollBottomView.titleLabelTextFont = [UIFont systemFontOfSize:[Tools sizeFont:14]]; - cleScrollBottomView.autoScrollTimeInterval = 3.0; - cleScrollBottomView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; - [cleScrollBottomView setShowPageControl:NO]; - [cleScrollBottomView setPlaceholderImage:[UIImage imageNamed:@"mainHome_bottomBanner"]]; - [viewinfo addSubview:cleScrollBottomView]; - [cleScrollBottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.offset(12); - make.right.equalTo(viewinfo).offset(-12); - make.top.equalTo(viewbottom.mas_bottom).offset(20); - make.height.offset(128*UISCREEN_WIDTH/375.0); - }]; - _cleScrollBottomView = cleScrollBottomView; - - [viewinfo mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(cleScrollBottomView).offset(20); - }]; + [self drawInfoView]; + [self drawSonView]; [scvback mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.equalTo(viewinfo).offset(20); @@ -125,68 +84,167 @@ } return self; } +-(void)drawSonView +{ + for(UIView *view in self.viewxw.subviews) + { + [view removeFromSuperview]; + } + for(UIView *view in self.viewcenter.subviews) + { + [view removeFromSuperview]; + } + for(UIView *view in self.viewbottom.subviews) + { + [view removeFromSuperview]; + } + if([UserInfoModel PayWXQuanXian]) + { + [self drawInfoTop:self.viewxw]; + [self drawSmallsView:self.viewcenter values:@[@"模拟来电",@"语音电话",@"视频电话",@"微信通知"]]; + [self drawSmallsView:self.viewbottom values:@[@"模拟余额",@"模拟转账",@"短信通知",@"模拟视频"]]; + } + else + { + [self drawInfoTop:self.viewxw]; + [self drawSmallsView:self.viewcenter values:@[@"语音电话",@"视频电话"]]; + [self drawSmallsView:self.viewbottom values:@[@"模拟来电",@"短信通知",@"模拟视频",@"微信通知"]]; + } +} +-(void)drawInfoView +{ + UIView *viewxw = [[UIView alloc] init]; + [self.viewinfo addSubview:viewxw]; + [viewxw mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(self.viewinfo); + make.top.offset(20); + }]; + _viewxw = viewxw; + + UIView *viewcenter = [[UIView alloc] init]; + [self.viewinfo addSubview:viewcenter]; + [viewcenter mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(self.viewinfo); + make.top.equalTo(viewxw.mas_bottom).offset(10); + make.height.offset(90); + }]; + _viewcenter = viewcenter; + + UIView *viewbottom = [[UIView alloc] init]; + [self.viewinfo addSubview:viewbottom]; + [viewbottom mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(self.viewinfo); + make.top.equalTo(viewcenter.mas_bottom).offset(10); + make.height.offset(90); + }]; + _viewbottom = viewbottom; + + SDCycleScrollView *cleScrollBottomView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero imageNamesGroup:@[]]; + cleScrollBottomView.scrollDirection = UICollectionViewScrollDirectionHorizontal; + cleScrollBottomView.delegate = self; + cleScrollBottomView.backgroundColor = [UIColor clearColor]; + cleScrollBottomView.titleLabelBackgroundColor = [UIColor clearColor]; + cleScrollBottomView.titleLabelTextColor = [UIColor darkGrayColor]; + cleScrollBottomView.titleLabelTextFont = [UIFont systemFontOfSize:[Tools sizeFont:14]]; + cleScrollBottomView.autoScrollTimeInterval = 3.0; + cleScrollBottomView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; + [cleScrollBottomView setShowPageControl:NO]; + [cleScrollBottomView setPlaceholderImage:[UIImage imageNamed:@"mainHome_bottomBanner"]]; + [self.viewinfo addSubview:cleScrollBottomView]; + [cleScrollBottomView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.right.equalTo(self.viewinfo).offset(-12); + make.top.equalTo(viewbottom.mas_bottom).offset(20); + make.height.offset(128*UISCREEN_WIDTH/375.0); + }]; + _cleScrollBottomView = cleScrollBottomView; + [self refShowBanner]; + [self.viewinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(cleScrollBottomView).offset(20); + }]; +} + +-(void)refShowBanner +{ + NSArray *arrbanner = [[UserInfoModel shareModel].config objectForKey:@"client.banner.urls"]; + + NSMutableArray *arrurl = [NSMutableArray new]; + if([arrbanner isKindOfClass:[NSArray class]]) + { + for(NSDictionary *dic in arrbanner) + { + [arrurl addObject:[Tools isStringnil:[dic objectForKey:@"image"]]]; + } + } + self.cleScrollView.imageURLStringsGroup = arrurl; +} -(void)drawInfoTop:(UIView *)view { -// [view mas_updateConstraints:^(MASConstraintMaker *make) { -// make.top.offset(11); -// }]; -// UIImage *image = [UIImage imageNamed:@"mainHome_zzBig"]; -// float f_w = UISCREEN_WIDTH-24; -// float f_h = image.size.height*f_w/image.size.width; -// UIImageView *imgvzz = [[UIImageView alloc] init]; -// [imgvzz setImage:image]; -// [view addSubview:imgvzz]; -// [imgvzz mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.offset(12); -// make.top.offset(0); -// make.width.offset(f_w); -// make.height.offset(f_h); -// }]; -// [self drawBigBigView:imgvzz name:@"转账提示音" itag:0]; -// [view mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.equalTo(imgvzz); -// }]; - - UIImage *image = [UIImage imageNamed:@"mainHome_转账提示音"]; - float f_w = (UISCREEN_WIDTH-24)/2.0+5; - float f_h = image.size.height*f_w/image.size.width; - UIImageView *imgvzz = [[UIImageView alloc] init]; - [imgvzz setImage:image]; - [view addSubview:imgvzz]; - [imgvzz mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.offset(12); - make.top.offset(0); - make.width.offset(f_w); - make.height.offset(f_h); - }]; - [self drawBigView:imgvzz name:@"转账提示音" isbig:YES itag:0]; - - UIImageView *imgvwx = [[UIImageView alloc] init]; - [imgvwx setImage:[UIImage imageNamed:@"mainHome_模拟微信"]]; - [view addSubview:imgvwx]; - [imgvwx mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.offset(0); - make.right.equalTo(view).offset(-12); - make.width.offset(f_w); - make.height.offset(f_h); - }]; - [self drawBigView:imgvwx name:@"模拟微信" isbig:YES itag:1]; - -// UIImageView *imgvzfb = [[UIImageView alloc] init]; -// [imgvzfb setImage:[UIImage imageNamed:@"mainHome_模拟支付宝"]]; -// [view addSubview:imgvzfb]; -// [imgvzfb mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.equalTo(imgvzz); -// make.right.equalTo(view).offset(-12); -// make.width.offset(UISCREEN_WIDTH-f_w-18); -// make.height.equalTo(imgvwx); -// }]; -// [self drawBigView:imgvzfb name:@"模拟支付宝" isbig:NO itag:2]; - - [view mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(imgvzz); - }]; + if([UserInfoModel PayWXQuanXian]) + { + UIImage *image = [UIImage imageNamed:@"mainHome_转账提示音"]; + float f_w = (UISCREEN_WIDTH-24)/2.0+5; + float f_h = image.size.height*f_w/image.size.width; + UIImageView *imgvzz = [[UIImageView alloc] init]; + [imgvzz setImage:image]; + [view addSubview:imgvzz]; + [imgvzz mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(0); + make.width.offset(f_w); + make.height.offset(f_h); + }]; + [self drawBigView:imgvzz name:@"转账提示音" isbig:YES itag:0]; + + UIImageView *imgvwx = [[UIImageView alloc] init]; + [imgvwx setImage:[UIImage imageNamed:@"mainHome_模拟微信"]]; + [view addSubview:imgvwx]; + [imgvwx mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(0); + make.right.equalTo(view).offset(-12); + make.width.offset(f_w); + make.height.offset(f_h); + }]; + [self drawBigView:imgvwx name:@"模拟微信" isbig:YES itag:1]; + + // UIImageView *imgvzfb = [[UIImageView alloc] init]; + // [imgvzfb setImage:[UIImage imageNamed:@"mainHome_模拟支付宝"]]; + // [view addSubview:imgvzfb]; + // [imgvzfb mas_makeConstraints:^(MASConstraintMaker *make) { + // make.bottom.equalTo(imgvzz); + // make.right.equalTo(view).offset(-12); + // make.width.offset(UISCREEN_WIDTH-f_w-18); + // make.height.equalTo(imgvwx); + // }]; + // [self drawBigView:imgvzfb name:@"模拟支付宝" isbig:NO itag:2]; + + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(imgvzz); + }]; + } + else + { + [view mas_updateConstraints:^(MASConstraintMaker *make) { + make.top.offset(11); + }]; + UIImage *image = [UIImage imageNamed:@"mainHome_zzBig"]; + float f_w = UISCREEN_WIDTH-24; + float f_h = image.size.height*f_w/image.size.width; + UIImageView *imgvzz = [[UIImageView alloc] init]; + [imgvzz setImage:image]; + [view addSubview:imgvzz]; + [imgvzz mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(0); + make.width.offset(f_w); + make.height.offset(f_h); + }]; + [self drawBigBigView:imgvzz name:@"转账提示音" itag:0]; + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(imgvzz); + }]; + } } -(void)drawSmallsView:(UIView *)view values:(NSArray *)values { @@ -598,4 +656,10 @@ }); } +-(void)refShowData +{ + [self drawSonView]; + [self refShowBanner]; +} + @end