xiongzhu %!s(int64=7) %!d(string=hai) anos
pai
achega
edfefd2e67
Modificáronse 100 ficheiros con 94 adicións e 606 borrados
  1. 33 39
      model.xcodeproj/project.pbxproj
  2. 23 0
      model/Assets.xcassets/个人中心/icon_yonghuduan.imageset/Contents.json
  3. BIN=BIN
      model/Assets.xcassets/个人中心/icon_yonghuduan.imageset/icon_yonghuduan.png
  4. BIN=BIN
      model/Assets.xcassets/个人中心/icon_yonghuduan.imageset/icon_yonghuduan@2x.png
  5. BIN=BIN
      model/Assets.xcassets/个人中心/icon_yonghuduan.imageset/icon_yonghuduan@3x.png
  6. BIN=BIN
      model/Classes/.DS_Store
  7. 0 0
      model/Classes/Application/AppDelegate.h
  8. 0 0
      model/Classes/Application/AppDelegate.m
  9. 0 0
      model/Classes/Application/ModelHeader.h
  10. 0 0
      model/Classes/Application/ModelPrefix.pch
  11. 0 0
      model/Classes/Application/NTESGlobalMacro.h
  12. 0 0
      model/Classes/Application/main.m
  13. 0 0
      model/Classes/Application/model.entitlements
  14. 0 0
      model/Classes/Controllers/AboutUsVC/AboutUsViewController.h
  15. 0 0
      model/Classes/Controllers/AboutUsVC/AboutUsViewController.m
  16. 0 0
      model/Classes/Controllers/ActivityVC/ActivityDetailViewController.h
  17. 0 0
      model/Classes/Controllers/ActivityVC/ActivityDetailViewController.m
  18. 0 0
      model/Classes/Controllers/ActivityVC/ActivityDetailViewController.xib
  19. 0 0
      model/Classes/Controllers/ActivityVC/PlatformActivityController.h
  20. 0 0
      model/Classes/Controllers/ActivityVC/PlatformActivityController.m
  21. 0 0
      model/Classes/Controllers/ActivityVC/SignInfoCell.h
  22. 0 0
      model/Classes/Controllers/ActivityVC/SignInfoCell.m
  23. 0 0
      model/Classes/Controllers/ActivityVC/SignInfoCell.xib
  24. 0 0
      model/Classes/Controllers/ActivityVC/SignUpViewController.h
  25. 0 0
      model/Classes/Controllers/ActivityVC/SignUpViewController.m
  26. 0 0
      model/Classes/Controllers/ActivityVC/SignUpViewController.xib
  27. 0 0
      model/Classes/Controllers/ActivityVC/SignViewCell.h
  28. 0 0
      model/Classes/Controllers/ActivityVC/SignViewCell.m
  29. 0 0
      model/Classes/Controllers/ActivityVC/SignViewCell.xib
  30. 0 0
      model/Classes/Controllers/CodeVC/ModelCodeController.h
  31. 0 0
      model/Classes/Controllers/CodeVC/ModelCodeController.m
  32. 0 13
      model/Classes/Controllers/Controller/MineController.h
  33. 0 554
      model/Classes/Controllers/Controller/MineController.m
  34. BIN=BIN
      model/Classes/Controllers/Controller/MineVC/.DS_Store
  35. BIN=BIN
      model/Classes/Controllers/Controller/MyProfileVC/.DS_Store
  36. BIN=BIN
      model/Classes/Controllers/Controller/MyTeamVC/.DS_Store
  37. 0 0
      model/Classes/Controllers/MineVC/MineNewViewController.h
  38. 20 0
      model/Classes/Controllers/MineVC/MineNewViewController.m
  39. 18 0
      model/Classes/Controllers/MineVC/MineNewViewController.xib
  40. 0 0
      model/Classes/Controllers/MineVC/View/ApplyRecommendView.h
  41. 0 0
      model/Classes/Controllers/MineVC/View/ApplyRecommendView.m
  42. 0 0
      model/Classes/Controllers/MineVC/View/IntroView.h
  43. 0 0
      model/Classes/Controllers/MineVC/View/IntroView.m
  44. 0 0
      model/Classes/Controllers/MineVC/View/IntroView.xib
  45. 0 0
      model/Classes/Controllers/MineVC/View/MineItemView.h
  46. 0 0
      model/Classes/Controllers/MineVC/View/MineItemView.m
  47. 0 0
      model/Classes/Controllers/MineVC/View/MineItemView.xib
  48. 0 0
      model/Classes/Controllers/MineVC/View/SettingsItemView.h
  49. 0 0
      model/Classes/Controllers/MineVC/View/SettingsItemView.m
  50. 0 0
      model/Classes/Controllers/MineVC/View/SettingsItemView.xib
  51. 0 0
      model/Classes/Controllers/MineVC/View/ShadowMenu.h
  52. 0 0
      model/Classes/Controllers/MineVC/View/ShadowMenu.m
  53. 0 0
      model/Classes/Controllers/MineVC/View/ShadowMenu.xib
  54. 0 0
      model/Classes/Controllers/MineVC/View/ShadowView.h
  55. 0 0
      model/Classes/Controllers/MineVC/View/ShadowView.m
  56. 0 0
      model/Classes/Controllers/MineVC/View/ShadowView.xib
  57. 0 0
      model/Classes/Controllers/MyOrderVC/MyOrderController.h
  58. 0 0
      model/Classes/Controllers/MyOrderVC/MyOrderController.m
  59. 0 0
      model/Classes/Controllers/MyOrderVC/OrderDetailViewController.h
  60. 0 0
      model/Classes/Controllers/MyOrderVC/OrderDetailViewController.m
  61. 0 0
      model/Classes/Controllers/MyOrderVC/SkillOrderController.h
  62. 0 0
      model/Classes/Controllers/MyOrderVC/SkillOrderController.m
  63. 0 0
      model/Classes/Controllers/MyOrderVC/VideoOrderController.h
  64. 0 0
      model/Classes/Controllers/MyOrderVC/VideoOrderController.m
  65. 0 0
      model/Classes/Controllers/MyProfileVC/HobbyViewController.h
  66. 0 0
      model/Classes/Controllers/MyProfileVC/HobbyViewController.m
  67. 0 0
      model/Classes/Controllers/MyProfileVC/InfoEditViewController.h
  68. 0 0
      model/Classes/Controllers/MyProfileVC/InfoEditViewController.m
  69. 0 0
      model/Classes/Controllers/MyProfileVC/MeasurementsViewController.h
  70. 0 0
      model/Classes/Controllers/MyProfileVC/MeasurementsViewController.m
  71. 0 0
      model/Classes/Controllers/MyProfileVC/ModelCardController.h
  72. 0 0
      model/Classes/Controllers/MyProfileVC/ModelCardController.m
  73. 0 0
      model/Classes/Controllers/MyProfileVC/ModelDataController.h
  74. 0 0
      model/Classes/Controllers/MyProfileVC/ModelDataController.m
  75. 0 0
      model/Classes/Controllers/MyProfileVC/ModelHonorViewController.h
  76. 0 0
      model/Classes/Controllers/MyProfileVC/ModelHonorViewController.m
  77. 0 0
      model/Classes/Controllers/MyProfileVC/ModelPhotoViewController.h
  78. 0 0
      model/Classes/Controllers/MyProfileVC/ModelPhotoViewController.m
  79. 0 0
      model/Classes/Controllers/MyProfileVC/ModelTagViewController.h
  80. 0 0
      model/Classes/Controllers/MyProfileVC/ModelTagViewController.m
  81. 0 0
      model/Classes/Controllers/MyRedPacketsVC/RedEnvelopeController.h
  82. 0 0
      model/Classes/Controllers/MyRedPacketsVC/RedEnvelopeController.m
  83. 0 0
      model/Classes/Controllers/MySkillsVC/EditorSkillsController.h
  84. 0 0
      model/Classes/Controllers/MySkillsVC/EditorSkillsController.m
  85. 0 0
      model/Classes/Controllers/MySkillsVC/MySkillsController.h
  86. 0 0
      model/Classes/Controllers/MySkillsVC/MySkillsController.m
  87. 0 0
      model/Classes/Controllers/MySkillsVC/PostSkillsController.h
  88. 0 0
      model/Classes/Controllers/MySkillsVC/PostSkillsController.m
  89. 0 0
      model/Classes/Controllers/MyTeamVC/MyMemberController.h
  90. 0 0
      model/Classes/Controllers/MyTeamVC/MyMemberController.m
  91. 0 0
      model/Classes/Controllers/MyTeamVC/MyMemberController.xib
  92. 0 0
      model/Classes/Controllers/MyTeamVC/MyModelController.h
  93. 0 0
      model/Classes/Controllers/MyTeamVC/MyModelController.m
  94. 0 0
      model/Classes/Controllers/MyTeamVC/MyModelController.xib
  95. 0 0
      model/Classes/Controllers/MyTeamVC/MyTeamCell.h
  96. 0 0
      model/Classes/Controllers/MyTeamVC/MyTeamCell.m
  97. 0 0
      model/Classes/Controllers/MyTeamVC/MyTeamCell.xib
  98. 0 0
      model/Classes/Controllers/MyTeamVC/MyTeamController.h
  99. 0 0
      model/Classes/Controllers/MyTeamVC/MyTeamController.m
  100. 0 0
      model/Classes/Controllers/MyTeamVC/MyTeamController.xib

+ 33 - 39
model.xcodeproj/project.pbxproj

@@ -430,7 +430,6 @@
 		EF4A656E20FD99AF00FFCD3C /* VideoOrderController.m in Sources */ = {isa = PBXBuildFile; fileRef = EF4A656D20FD99AF00FFCD3C /* VideoOrderController.m */; };
 		EF4A657120FD9D6200FFCD3C /* SkillOrderController.m in Sources */ = {isa = PBXBuildFile; fileRef = EF4A657020FD9D6200FFCD3C /* SkillOrderController.m */; };
 		EF4A657420FDB8C700FFCD3C /* ModelTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = EF4A657320FDB8C700FFCD3C /* ModelTitleView.m */; };
-		EF4A657A20FDC94D00FFCD3C /* MineController.m in Sources */ = {isa = PBXBuildFile; fileRef = EF4A657920FDC94C00FFCD3C /* MineController.m */; };
 		EF4A657D20FDCB5600FFCD3C /* PlatformActivityCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EF4A657C20FDCB5600FFCD3C /* PlatformActivityCell.m */; };
 		EF4A658020FDD1CE00FFCD3C /* RedEnvelopeController.m in Sources */ = {isa = PBXBuildFile; fileRef = EF4A657F20FDD1CE00FFCD3C /* RedEnvelopeController.m */; };
 		EF4A658320FDDAEB00FFCD3C /* ModelNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = EF4A658220FDDAEB00FFCD3C /* ModelNavigationController.m */; };
@@ -1264,8 +1263,6 @@
 		EF4A657020FD9D6200FFCD3C /* SkillOrderController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SkillOrderController.m; sourceTree = "<group>"; };
 		EF4A657220FDB8C700FFCD3C /* ModelTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ModelTitleView.h; sourceTree = "<group>"; };
 		EF4A657320FDB8C700FFCD3C /* ModelTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ModelTitleView.m; sourceTree = "<group>"; };
-		EF4A657820FDC94C00FFCD3C /* MineController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineController.h; sourceTree = "<group>"; };
-		EF4A657920FDC94C00FFCD3C /* MineController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineController.m; sourceTree = "<group>"; };
 		EF4A657B20FDCB5600FFCD3C /* PlatformActivityCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformActivityCell.h; sourceTree = "<group>"; };
 		EF4A657C20FDCB5600FFCD3C /* PlatformActivityCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PlatformActivityCell.m; sourceTree = "<group>"; };
 		EF4A657E20FDD1CE00FFCD3C /* RedEnvelopeController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RedEnvelopeController.h; sourceTree = "<group>"; };
@@ -2496,6 +2493,29 @@
 			path = PromoteVC;
 			sourceTree = "<group>";
 		};
+		3AD0800021C1F57A009C657A /* Application */ = {
+			isa = PBXGroup;
+			children = (
+				2F8D27EF21183E6900CD7347 /* model.entitlements */,
+				9EC8711620FAE7190087746C /* AppDelegate.h */,
+				9EC8711720FAE7190087746C /* AppDelegate.m */,
+				2F8D27F021183E6900CD7347 /* NTESGlobalMacro.h */,
+				9EC8711420FAE7190087746C /* main.m */,
+				9EC8713120FAEB690087746C /* ModelHeader.h */,
+				9EC8713220FAEBAD0087746C /* ModelPrefix.pch */,
+			);
+			path = Application;
+			sourceTree = "<group>";
+		};
+		3AD0800121C1F7DC009C657A /* NewFeature */ = {
+			isa = PBXGroup;
+			children = (
+				EF812F6920FEE30E004A6A35 /* ModelNewFeatureController.h */,
+				EF812F6A20FEE30E004A6A35 /* ModelNewFeatureController.m */,
+			);
+			path = NewFeature;
+			sourceTree = "<group>";
+		};
 		3AE8C7B0218B65630069D147 /* RankVC */ = {
 			isa = PBXGroup;
 			children = (
@@ -2610,32 +2630,18 @@
 			isa = PBXGroup;
 			children = (
 				9EC8712A20FAE9FA0087746C /* Classes */,
-				9EC8711620FAE7190087746C /* AppDelegate.h */,
-				9EC8711720FAE7190087746C /* AppDelegate.m */,
 				9EC8711C20FAE7190087746C /* Main.storyboard */,
 				9EC8711F20FAE7190087746C /* Assets.xcassets */,
 				9EC8712120FAE7190087746C /* LaunchScreen.storyboard */,
 				9EC8712420FAE7190087746C /* Info.plist */,
-				9EC8711320FAE7190087746C /* Supporting Files */,
 			);
 			path = model;
 			sourceTree = "<group>";
 		};
-		9EC8711320FAE7190087746C /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				2F8D27EF21183E6900CD7347 /* model.entitlements */,
-				2F8D27F021183E6900CD7347 /* NTESGlobalMacro.h */,
-				9EC8711420FAE7190087746C /* main.m */,
-				9EC8713120FAEB690087746C /* ModelHeader.h */,
-				9EC8713220FAEBAD0087746C /* ModelPrefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		9EC8712A20FAE9FA0087746C /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				3AD0800021C1F57A009C657A /* Application */,
 				9EC8712B20FAE9FA0087746C /* Controllers */,
 				9EC8712F20FAE9FA0087746C /* Public */,
 				9EC8713020FAE9FA0087746C /* Tools */,
@@ -2646,38 +2652,27 @@
 		9EC8712B20FAE9FA0087746C /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				2F8D27CB21183E2B00CD7347 /* MessageVC */,
-				9EC8712C20FAE9FA0087746C /* Controller */,
-				9EC8712D20FAE9FA0087746C /* Model */,
-				9EC8712E20FAE9FA0087746C /* View */,
-			);
-			path = Controllers;
-			sourceTree = "<group>";
-		};
-		9EC8712C20FAE9FA0087746C /* Controller */ = {
-			isa = PBXGroup;
-			children = (
-				EF4A657820FDC94C00FFCD3C /* MineController.h */,
-				EF812F6920FEE30E004A6A35 /* ModelNewFeatureController.h */,
-				EF4A657920FDC94C00FFCD3C /* MineController.m */,
-				EF812F6A20FEE30E004A6A35 /* ModelNewFeatureController.m */,
 				2FA1AF8B212AA984005F12CA /* AboutUsVC */,
 				2F4A895C211D9F03006D7DD3 /* ActivityVC */,
 				EF7B0C0C20FC69EE0078781D /* CodeVC */,
+				2F8D27CB21183E2B00CD7347 /* MessageVC */,
 				3AF44FDC21856E5C00ABEAEB /* MineVC */,
+				9EC8712D20FAE9FA0087746C /* Model */,
 				EF7B0C0A20FC69EE0078781D /* MyOrderVC */,
 				EF7B0C0B20FC69EE0078781D /* MyProfileVC */,
 				EF7B0C1620FC69EF0078781D /* MyRedPacketsVC */,
 				EF7B0C0720FC69EE0078781D /* MySkillsVC */,
 				3A5EC7492186F54E00A9438E /* MyTeamVC */,
 				EF7B0C0D20FC69EF0078781D /* MyWalletVC */,
+				3AD0800121C1F7DC009C657A /* NewFeature */,
 				2F8D24AA21131B3900CD7347 /* PrivateVC */,
 				3A5EC75C218707B100A9438E /* PromoteVC */,
 				3AE8C7B0218B65630069D147 /* RankVC */,
 				3AF44FFF2185BD1A00ABEAEB /* SettingsVC */,
 				3AF44FEF21858F1600ABEAEB /* ShareVC */,
+				9EC8712E20FAE9FA0087746C /* View */,
 			);
-			path = Controller;
+			path = Controllers;
 			sourceTree = "<group>";
 		};
 		9EC8712D20FAE9FA0087746C /* Model */ = {
@@ -3486,7 +3481,6 @@
 				EF7B0C1D20FC6A810078781D /* IncreaseBalanceController.m in Sources */,
 				2F8D26FB21183D7400CD7347 /* NIMAdvancedTeamMemberCell.m in Sources */,
 				2F8D270121183D7400CD7347 /* NIMTimestampModel.m in Sources */,
-				EF4A657A20FDC94D00FFCD3C /* MineController.m in Sources */,
 				2F8D26D421183D7300CD7347 /* NIMKitRobotTemplateLayout.m in Sources */,
 				3AC5C9FE218BD9A600D4ACAC /* RankChildController.m in Sources */,
 				2F8D273221183D7400CD7347 /* NSString+NIMKit.m in Sources */,
@@ -3623,13 +3617,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_ENTITLEMENTS = model/model.entitlements;
+				CODE_SIGN_ENTITLEMENTS = model/Classes/Application/model.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = 99T6ZUAFCD;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SRCROOT)/model/ModelPrefix.pch";
+				GCC_PREFIX_HEADER = "$(SRCROOT)/model/Classes/Application/ModelPrefix.pch";
 				INFOPLIST_FILE = model/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -3646,13 +3640,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_ENTITLEMENTS = model/model.entitlements;
+				CODE_SIGN_ENTITLEMENTS = model/Classes/Application/model.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = 99T6ZUAFCD;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SRCROOT)/model/ModelPrefix.pch";
+				GCC_PREFIX_HEADER = "$(SRCROOT)/model/Classes/Application/ModelPrefix.pch";
 				INFOPLIST_FILE = model/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

+ 23 - 0
model/Assets.xcassets/个人中心/icon_yonghuduan.imageset/Contents.json

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

BIN=BIN
model/Assets.xcassets/个人中心/icon_yonghuduan.imageset/icon_yonghuduan.png


BIN=BIN
model/Assets.xcassets/个人中心/icon_yonghuduan.imageset/icon_yonghuduan@2x.png


BIN=BIN
model/Assets.xcassets/个人中心/icon_yonghuduan.imageset/icon_yonghuduan@3x.png


BIN=BIN
model/Classes/.DS_Store


+ 0 - 0
model/AppDelegate.h → model/Classes/Application/AppDelegate.h


+ 0 - 0
model/AppDelegate.m → model/Classes/Application/AppDelegate.m


+ 0 - 0
model/ModelHeader.h → model/Classes/Application/ModelHeader.h


+ 0 - 0
model/ModelPrefix.pch → model/Classes/Application/ModelPrefix.pch


+ 0 - 0
model/NTESGlobalMacro.h → model/Classes/Application/NTESGlobalMacro.h


+ 0 - 0
model/main.m → model/Classes/Application/main.m


+ 0 - 0
model/model.entitlements → model/Classes/Application/model.entitlements


+ 0 - 0
model/Classes/Controllers/Controller/AboutUsVC/AboutUsViewController.h → model/Classes/Controllers/AboutUsVC/AboutUsViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/AboutUsVC/AboutUsViewController.m → model/Classes/Controllers/AboutUsVC/AboutUsViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/ActivityDetailViewController.h → model/Classes/Controllers/ActivityVC/ActivityDetailViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/ActivityDetailViewController.m → model/Classes/Controllers/ActivityVC/ActivityDetailViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/ActivityDetailViewController.xib → model/Classes/Controllers/ActivityVC/ActivityDetailViewController.xib


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/PlatformActivityController.h → model/Classes/Controllers/ActivityVC/PlatformActivityController.h


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/PlatformActivityController.m → model/Classes/Controllers/ActivityVC/PlatformActivityController.m


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignInfoCell.h → model/Classes/Controllers/ActivityVC/SignInfoCell.h


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignInfoCell.m → model/Classes/Controllers/ActivityVC/SignInfoCell.m


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignInfoCell.xib → model/Classes/Controllers/ActivityVC/SignInfoCell.xib


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignUpViewController.h → model/Classes/Controllers/ActivityVC/SignUpViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignUpViewController.m → model/Classes/Controllers/ActivityVC/SignUpViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignUpViewController.xib → model/Classes/Controllers/ActivityVC/SignUpViewController.xib


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignViewCell.h → model/Classes/Controllers/ActivityVC/SignViewCell.h


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignViewCell.m → model/Classes/Controllers/ActivityVC/SignViewCell.m


+ 0 - 0
model/Classes/Controllers/Controller/ActivityVC/SignViewCell.xib → model/Classes/Controllers/ActivityVC/SignViewCell.xib


+ 0 - 0
model/Classes/Controllers/Controller/CodeVC/ModelCodeController.h → model/Classes/Controllers/CodeVC/ModelCodeController.h


+ 0 - 0
model/Classes/Controllers/Controller/CodeVC/ModelCodeController.m → model/Classes/Controllers/CodeVC/ModelCodeController.m


+ 0 - 13
model/Classes/Controllers/Controller/MineController.h

@@ -1,13 +0,0 @@
-//
-//  MineController.h
-//  model
-//
-//  Created by zuxiukuan on 2018/7/15.
-//  Copyright © 2018年 Mine. All rights reserved.
-//  我的
-
-#import "ModelBaseViewController.h"
-
-@interface MineController : ModelBaseViewController
-
-@end

+ 0 - 554
model/Classes/Controllers/Controller/MineController.m

@@ -1,554 +0,0 @@
-//
-//  MineController.m
-//  model
-//
-//  Created by zuxiukuan on 2018/7/15.
-//  Copyright © 2018年 Mine. All rights reserved.
-//  我的
-
-#import "MineController.h"
-#import "MyWalletController.h"
-#import "ModelDataController.h"
-#import "MySkillsController.h"
-#import "MyOrderController.h"
-#import "PlatformActivityController.h"
-#import "RedEnvelopeController.h"
-#import "ModelCodeController.h"
-#import "UIViewController+YJPhoto.h"
-#import "LoginViewController.h"
-#import "AboutUsViewController.h"
-
-@interface MineController ()
-@property (nonatomic, strong) UIImageView *iconView;  //  头像
-@property (nonatomic, strong) UILabel *nameLabel;    //  名字
-@property (nonatomic, strong) UILabel *incomeLabel;  //  收入
-@property (nonatomic, strong) UIView  *notificationView;  //  消息红点
-@property (nonatomic, strong) UIScrollView  *bgScrollView;  //  滚动背景
-@end
-
-@implementation MineController
-{
-    UIView *outPutView;
-    UILabel *outLabel;
-    UIImageView *cancelBtn;
-    UIImageView *sureBtn;
-    UIImageView *mengBanView;
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    [self changeLoginState:@"1"];
-    [super viewWillAppear:animated];
-    self.navigationController.navigationBar.hidden = YES;
-    // 网络请求
-    [self getDataFromNetworking];
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    self.navigationController.navigationBar.hidden = NO;
-}
-
-- (void)changeLoginState:(NSString *)state{
-    
-    NSString *str = [NSString stringWithFormat:@"%@modelInfo?action=doPutOnline&modelpk=%@&online=%@",imageURl,[ModelUser user].modelpk,state];
-    [[AHHttpManager sharedManager]POST:str parameters:nil success:^(id responseObject) {
-        NSLog(@"%@",responseObject);
-        if ([[responseObject objectForKey:@"msg"]isEqualToString:@"success"]) {
-            
-        }else{
-            
-        }
-    } failure:^(NSError *error) {
-        NSLog(@"error = %@",error);
-    }];
-}
-
-- (void)viewDidLoad {
-    
-    [super viewDidLoad];
-    self.view.backgroundColor = [UIColor whiteColor];
-    self.extendedLayoutIncludesOpaqueBars = YES;
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderNotification) name:@"orderMsg" object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hideNavigationBar) name:@"hideNavigationBar" object:nil];
-    
-    //布局子视图
-    [self createSubviews];
-    mengBanView = [[UIImageView alloc]init];
-    mengBanView.frame = self.view.bounds;
-    [mengBanView setImage:[UIImage imageNamed:@"graymengban"]];
-    outPutView = [[UIView alloc]initWithFrame:CGRectMake(0, ScreenHeight-140, ScreenWidth, 140)];
-    outPutView.backgroundColor = [UIColor whiteColor];
-    outLabel = [[UILabel alloc]initWithFrame:CGRectMake(ScreenWidth/2-50, 30, 140, 30)];
-    outLabel.text = @"是否确定退出?";
-    cancelBtn = [[UIImageView alloc]initWithFrame:CGRectMake(0, 80, ScreenWidth/2, 60)];
-    [cancelBtn setImage:[UIImage imageNamed:@"quxiao"]];
-    sureBtn = [[UIImageView alloc]initWithFrame:CGRectMake(ScreenWidth/2, 80, ScreenWidth/2, 60)];
-    [sureBtn setImage:[UIImage imageNamed:@"queding"]];
-    
-    [outPutView addSubview:cancelBtn];
-    [outPutView addSubview:sureBtn];
-    [outPutView addSubview:outLabel];
-    [mengBanView addSubview:outPutView];
-    UITapGestureRecognizer *cancelTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(cancelAction:)];
-    [cancelBtn  addGestureRecognizer:cancelTap];
-    UITapGestureRecognizer *sureTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(sureAction:)];
-    [sureBtn  addGestureRecognizer:sureTap];
-    cancelBtn.userInteractionEnabled = YES;
-    sureBtn.userInteractionEnabled = YES;
-    outPutView.userInteractionEnabled = YES;
-    mengBanView.userInteractionEnabled = YES;
-
-    [self.navigationController.view addSubview:mengBanView];
-    [self hideOutPut];
-}
-
--(void)hideNavigationBar{
-    
-    if ([[self getCurrentVC] isKindOfClass:[MineController class]]) {
-        self.navigationController.navigationBar.hidden = YES;
-    }
-}
-
-//获取当前屏幕显示的viewcontroller
--(UIViewController *)getCurrentVC {
-    
-    UIViewController *result = nil;
-    
-    UIViewController *rootVC = [UIApplication sharedApplication].keyWindow.rootViewController;
-    
-    do {
-        if ([rootVC isKindOfClass:[UINavigationController class]]) {
-            UINavigationController *navi = (UINavigationController *)rootVC;
-            UIViewController *vc = [navi.viewControllers lastObject];
-            result = vc;
-            rootVC = vc.presentedViewController;
-            continue;
-        } else if([rootVC isKindOfClass:[UITabBarController class]]) {
-            UITabBarController *tab = (UITabBarController *)rootVC;
-            result = tab;
-            rootVC = [tab.viewControllers objectAtIndex:tab.selectedIndex];
-            continue;
-        } else if([rootVC isKindOfClass:[UIViewController class]]) {
-            result = rootVC;
-            rootVC = nil;
-        }
-    } while (rootVC != nil);
-    
-    return result;
-}
-
-- (void)hideOutPut{
-    mengBanView.hidden = YES;
-    outPutView.hidden = YES;
-    outLabel.hidden = YES;
-    cancelBtn.hidden = YES;
-    sureBtn.hidden = YES;
-}
-
-- (void)showOutPut{
-    mengBanView.hidden = NO;
-    outPutView.hidden = NO;
-    outLabel.hidden = NO;
-    cancelBtn.hidden = NO;
-    sureBtn.hidden = NO;
-}
-
-//隐藏tabbar
-- (void)hideTabBar {
-    
-    if (self.tabBarController.tabBar.hidden == YES) {
-        
-        return;
-    }
-    
-    UIView *contentView;
-    
-    if ( [[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]]){
-        
-        contentView = [self.tabBarController.view.subviews objectAtIndex:1];
-    
-    }else{
-        contentView = [self.tabBarController.view.subviews objectAtIndex:0];
-    }
-    contentView.frame = CGRectMake(contentView.bounds.origin.x,  contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height + self.tabBarController.tabBar.frame.size.height);
-    
-    self.tabBarController.tabBar.hidden = YES;
-}
-
-//显示tabbar
-- (void)showTabBar
-{
-    if (self.tabBarController.tabBar.hidden == NO)
-    {
-        return;
-    }
-    
-    UIView *contentView;
-    
-    if ([[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]]){
-        
-        contentView = [self.tabBarController.view.subviews objectAtIndex:1];
-    
-    }else{
-        contentView = [self.tabBarController.view.subviews objectAtIndex:0];
-    }
-    contentView.frame = CGRectMake(contentView.bounds.origin.x, contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height - self.tabBarController.tabBar.frame.size.height);
-    
-    self.tabBarController.tabBar.hidden = NO;
-}
-
-- (void)cancelAction:(UITapGestureRecognizer*)recognizer{
-    [self showTabBar];
-    [self hideOutPut];
-}
-
-- (void)sureAction:(UITapGestureRecognizer*)recognizer{
-    [self changeLoginState];
-    [self setupLoginViewController];
-    [[[NIMSDK sharedSDK] loginManager] logout:^(NSError *error) {
-        
-        NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier];
-        [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:appDomain];
-    }];
-}
-
-- (void)setupLoginViewController
-{
-    [self.view.window.rootViewController dismissViewControllerAnimated:YES completion:nil];
-    LoginViewController *loginController = [[LoginViewController alloc] init];
-    UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:loginController];
-    self.view.window.rootViewController = nav;
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-}
-
-#pragma mark -- 网络请求
-- (void)getDataFromNetworking {
-    
-    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser user].modelpk,@"modelpk", nil];
-    [YanCNetWorkManager requestPostWithURLStr:Url_refreshLogin(PublicUrl) parameters:dic finish:^(id dataDic) {
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
- 
-        NSString *issuccess = dataDic[@"msg"];
-        if ([issuccess isEqualToString:@"success"]) {
-            ModelUser *user = [ModelUser modelUser];
-            [user setValuesForKeysWithDictionary:dataDic[@"data"]];
-            user.modelpk = dataDic[@"data"][@"modelpk"];
-            user.coin_a = dataDic[@"data"][@"coin_a"];
-            user.coin_ir = dataDic[@"data"][@"coin_ir"];
-            user.pk = dataDic[@"data"][@"pk"];
-            user.qrcode = dataDic[@"data"][@"qrcode"];
-            [ModelUser save:user];
-         
-            self.nameLabel.text = [NSString stringWithFormat:@"%@", dataDic[@"data"][@"pet"]];
-            [self.iconView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/%@", PublicUrl, dataDic[@"data"][@"hphoto"]]] placeholderImage:[UIImage imageNamed:@"morentouxiang"]];
-            
-            if ([dataDic[@"data"][@"hasred"] isEqualToString:@"1"]) {
-                self.notificationView.hidden = NO;
-            }else{
-                self.notificationView.hidden = YES;
-            }
-            
-            [self getIncomeFromNetworking];
-        } else {
-            [MBProgressHUD showInfo:@"请求失败!"];
-        }
-    } enError:^(NSError *error) {
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
-    }];
-}
-
--(void)getIncomeFromNetworking{
-    
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser modelUser].pk,@"memberpk", nil];
-    [YanCNetWorkManager requestPostWithURLStr:Url_getIncomeToday(PublicUrl) parameters:dic finish:^(id dataDic) {
-        NSString *issuccess = dataDic[@"msg"];
-        if ([issuccess isEqualToString:@"success"]) {
-            self.incomeLabel.text = [NSString stringWithFormat:@"%@元", dataDic[@"count"]];
-        }else {
-            [MBProgressHUD showInfo:@"请求失败!"];
-        }
-    }enError:^(NSError *error) {
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
-    }];
-}
-
-#pragma mark -- 布局子视图
-- (void)createSubviews {
-    
-    self.bgScrollView = [[UIScrollView alloc]initWithFrame:self.view.bounds];
-    self.bgScrollView.backgroundColor = [UIColor whiteColor];
-    self.bgScrollView.contentSize = CGSizeMake(ScreenWidth, 600);
-    self.bgScrollView.showsVerticalScrollIndicator = NO;
-    [self.view addSubview:self.bgScrollView];
-    
-    //头像
-    self.iconView = [[UIImageView alloc] initWithFrame:CGRectMake(ScreenWidth/2 - 40, 40, 80, 80)];
-    self.iconView.layer.masksToBounds = YES;
-    self.iconView.layer.cornerRadius = 40;
-    [self.bgScrollView addSubview:self.iconView];
-    
-    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickUploadHeadPhoto)];
-    self.iconView.userInteractionEnabled = YES;
-    [self.iconView addGestureRecognizer:tap];
-    
-    //姓名
-    self.nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.iconView.frame) + 18, ScreenWidth, 16)];
-    self.nameLabel.font = [UIFont systemFontOfSize:16.f];
-    self.nameLabel.textColor = RGBValueColor(0x333333, 1.0);
-    self.nameLabel.textAlignment = NSTextAlignmentCenter;
-    [self.bgScrollView addSubview:self.nameLabel];
-    
-    //线
-    UILabel *lineLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.nameLabel.frame) + 20, ScreenWidth, 0.5)];
-    lineLabel.backgroundColor = RGBValueColor(0xdfdfdf, 1.0);
-    [self.bgScrollView addSubview:lineLabel];
-    
-    //收入金额
-    self.incomeLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(lineLabel.frame) + 10, ScreenWidth, 16)];
-    self.incomeLabel.font = [UIFont systemFontOfSize:16.f];
-    self.incomeLabel.textColor = RGBValueColor(0x333333, 1.0);
-    self.incomeLabel.textAlignment = NSTextAlignmentCenter;
-    [self.bgScrollView addSubview:self.incomeLabel];
-    
-    //今日收入
-    UILabel *incomeTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.incomeLabel.frame) + 8, ScreenWidth, 13)];
-    incomeTitleLabel.font = [UIFont systemFontOfSize:13.f];
-    incomeTitleLabel.textColor = RGBValueColor(0x999999, 1.0);
-    incomeTitleLabel.textAlignment = NSTextAlignmentCenter;
-    incomeTitleLabel.text = @"今日收入";
-    [self.bgScrollView addSubview:incomeTitleLabel];
-    
-    //粗线条
-    UILabel *greyLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(incomeTitleLabel.frame) + 10, ScreenWidth, 10)];
-    greyLabel.backgroundColor = RGBValueColor(0xf7f7f7, 1.0);
-    [self.bgScrollView addSubview:greyLabel];
-    
-    //  九宫格
-    CGFloat btnWidth = ScreenWidth / 3;
-    CGFloat btnHeight = 95 * AutoSizeSalseX;
-    NSArray *imagesArr = @[@"qianbao",@"jineng",@"dingdan",@"mokaziliao",@"pingtaihuodong",@"erweima",@"aboutUs",@"tuichu"];
-    NSArray *titlesArr = @[@"我的钱包",@"我的技能",@"我的订单",@"模卡资料",@"平台活动",@"邀请二维码",@"联系我们",@"退出账号"];
-    
-    for (int i = 0; i < 8; i++) {// 0 1 2 3 4 5 6 7
-        int x = i % 3;
-        int y = i / 3;
-        
-        UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
-        btn.frame = CGRectMake(x * btnWidth, CGRectGetMaxY(greyLabel.frame) + y * btnHeight, btnWidth, btnHeight);
-        [btn setImage:[UIImage imageNamed:imagesArr[i]] forState:UIControlStateNormal];
-        btn.adjustsImageWhenHighlighted = NO;
-        [btn setTitle:titlesArr[i] forState:UIControlStateNormal];
-        [btn setTitleColor:RGBValueColor(0x333333, 1.0) forState:UIControlStateNormal];
-        btn.titleLabel.font = [UIFont systemFontOfSize:13];
-        // button标题的偏移量
-        btn.titleEdgeInsets = UIEdgeInsetsMake(btn.imageView.frame.size.height+12, -btn.imageView.bounds.size.width, 0,0);
-        // button图片的偏移量
-        btn.imageEdgeInsets = UIEdgeInsetsMake(0, btn.titleLabel.frame.size.width/2, btn.titleLabel.frame.size.height+12, -btn.titleLabel.frame.size.width/2);
-        btn.tag = i;
-        [btn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside];
-        [self.bgScrollView addSubview:btn];
-        
-        if (i == 2) {
-            self.notificationView = [[UIView alloc]initWithFrame:CGRectMake(CGRectGetMaxX(btn.imageView.frame)-3, CGRectGetMinY(btn.imageView.frame)-5, 10, 10)];
-            self.notificationView.backgroundColor = RGB(254, 64, 134);
-            self.notificationView.layer.cornerRadius = 5;
-            [btn addSubview:self.notificationView];
-            self.notificationView.hidden = YES;
-        }
-        
-        if (x == 1) {
-            UILabel *lineLabel = [[UILabel alloc] initWithFrame:CGRectMake(btnWidth * x, CGRectGetMaxY(greyLabel.frame), 0.5, btnHeight * 3)];
-            lineLabel.backgroundColor = RGBValueColor(0xefefef, 1.0);
-            [self.bgScrollView addSubview:lineLabel];
-        }
-        
-        if (x == 2) {
-            UILabel *lineLabel = [[UILabel alloc] initWithFrame:CGRectMake(btnWidth * x, CGRectGetMaxY(greyLabel.frame), 0.5, btnHeight * 3)];
-            lineLabel.backgroundColor = RGBValueColor(0xefefef, 1.0);
-            [self.bgScrollView addSubview:lineLabel];
-        }
-        
-        if (y == 0 || y == 1) {
-            UILabel *lineLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(greyLabel.frame) +btnHeight * (y + 1), ScreenWidth, 0.5)];
-            lineLabel.backgroundColor = RGBValueColor(0xefefef, 1.0);
-            [self.bgScrollView addSubview:lineLabel];
-        }
-        
-        if (y == 2) {
-            UILabel *lineLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(greyLabel.frame) +btnHeight * 3, btnWidth * 2, 0.5)];
-            lineLabel.backgroundColor = RGBValueColor(0xefefef, 1.0);
-            [self.bgScrollView addSubview:lineLabel];
-        }
-    }
-}
-
--(void)clickUploadHeadPhoto{
-    
-    [self showCanEdit:NO title:@"上传头像" wscale:0.7 hscale:0.7 photo:^(UIImage *photo) {
-        
-        NSData *photoData = UIImageJPEGRepresentation(photo, 0.2);
-        
-        NSInteger length = [photoData length] / 1000;
-        
-        NSLog(@"图片大小:%ld Kb",(long)length);
-        
-        UIImage *smallPhoto = [UIImage imageWithData:photoData];
-        
-        ModelUser *user = [ModelUser modelUser];
-        
-        AFHTTPSessionManager * manger  =[AFHTTPSessionManager manager];
-        manger.responseSerializer = [AFHTTPResponseSerializer serializer];
-        manger.requestSerializer = [AFJSONRequestSerializer serializer];
-        manger.securityPolicy.allowInvalidCertificates = YES;
-
-        NSDictionary *dict =@{@"memberpk":user.pk,
-                              @"action":@"hp"
-                              };
-        [manger POST:Url_uploadImage(PublicUrl) parameters:dict constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
-            if (photoData==NULL) {
-
-            }else{
-                [formData appendPartWithFileData:photoData name:@"img" fileName:@"head.png" mimeType:@"image/png"];
-            }
-        } progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
-
-            self.iconView.image = smallPhoto;
-            NSDictionary *dic =[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers| NSJSONReadingMutableLeaves error:nil];
-            NSString * img = [dic objectForKey:@"img"];
-            [[NIMSDK sharedSDK].userManager updateMyUserInfo:@{@(NIMUserInfoUpdateTagAvatar) : [NSString stringWithFormat:@"%@%@",imageURl,img]} completion:nil];
-
-        } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
-
-        }];
-    }];
-}
-
-- (void)btnAction:(UIButton *)sender {
-    NSLog(@"sender.tag = %ld", sender.tag);
-    
-    switch (sender.tag) {
-        case 0: //   我的钱包
-        {
-            MyWalletController *myWalletVC = [[MyWalletController alloc] init];
-            myWalletVC.hidesBottomBarWhenPushed = YES;
-            myWalletVC.amount = [ModelUser modelUser].coin_a;
-            [self.navigationController pushViewController:myWalletVC animated:YES];
-        }
-            break;
-            
-        case 1://   我的技能
-        {
-            MySkillsController *mySkillsVC = [[MySkillsController alloc] init];
-            mySkillsVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:mySkillsVC animated:YES];
-        }
-            break;
-            
-        case 2://   我的订单
-        {
-            [self doRemoveModelHasRed];
-            MyOrderController *myOrderVC = [[MyOrderController alloc] init];
-            myOrderVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:myOrderVC animated:YES];
-        }
-            break;
-            
-        case 3://   模卡资料
-        {
-            ModelDataController *modelDataVC = [[ModelDataController alloc] init];
-            modelDataVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:modelDataVC animated:YES];
-        }
-            break;
-            
-        case 4://   平台活动
-        {
-            PlatformActivityController *activityVC = [[PlatformActivityController alloc] init];
-            activityVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:activityVC animated:YES];
-        }
-            break;
-            
-        case 5://   邀请二维码
-        {
-            ModelCodeController *modelCodeVC = [[ModelCodeController alloc] init];
-            modelCodeVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:modelCodeVC animated:YES];
-        }
-            break;
-            
-        case 6://   关于我们
-        {
-            AboutUsViewController *aboutUsVC = [[AboutUsViewController alloc] init];
-            aboutUsVC.hidesBottomBarWhenPushed = YES;
-            [self.navigationController pushViewController:aboutUsVC animated:YES];
-        }
-            break;
-            
-        case 7://   退出账号
-        {
-//            UIAlertController *alertVc = [UIAlertController alertControllerWithTitle:nil message:@"是否确定退出" preferredStyle:UIAlertControllerStyleAlert];
-//            UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
-//            UIAlertAction *sureAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-//                [self.navigationController pushViewController:[UIViewController new] animated:YES];
-//            }];
-//            [alertVc addAction:cancelAction];
-//            [alertVc addAction:sureAction];
-//            [self presentViewController:alertVc animated:YES completion:nil];
-            [self hideTabBar];
-            [self showOutPut];
-        }
-            break;
-            
-        default:
-            break;
-    }
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
-    if (![outPutView isExclusiveTouch]) {
-        [self showTabBar];
-        [self hideOutPut];
-    }
-}
-
-- (void)changeLoginState{
-    NSString *str = [NSString stringWithFormat:@"%@modelInfo?action=doPutOnline&modelpk=%@&online=0",imageURl,[ModelUser user].modelpk];
-    [[AHHttpManager sharedManager]POST:str parameters:nil success:^(id responseObject) {
-        NSLog(@"%@",responseObject);
-        if ([[responseObject objectForKey:@"msg"]isEqualToString:@"success"]) {
-
-        }else{
-            
-        }
-    } failure:^(NSError *error) {
-        NSLog(@"error = %@",error);
-    }];
-}
-
--(void)doRemoveModelHasRed{
-    
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser modelUser].modelpk,@"modelpk", nil];
-    [YanCNetWorkManager requestPostWithURLStr:Url_doRemoveModelHasRed(PublicUrl) parameters:dic finish:^(id dataDic) {
-        NSString *issuccess = dataDic[@"msg"];
-        if ([issuccess isEqualToString:@"success"]) {
-            
-        }else {
-
-        }
-    }enError:^(NSError *error) {
-        
-    }];
-}
-
--(void)orderNotification{
-    
-    [self getDataFromNetworking];
-}
-
-@end

BIN=BIN
model/Classes/Controllers/Controller/MineVC/.DS_Store


BIN=BIN
model/Classes/Controllers/Controller/MyProfileVC/.DS_Store


BIN=BIN
model/Classes/Controllers/Controller/MyTeamVC/.DS_Store


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/MineNewViewController.h → model/Classes/Controllers/MineVC/MineNewViewController.h


+ 20 - 0
model/Classes/Controllers/Controller/MineVC/MineNewViewController.m → model/Classes/Controllers/MineVC/MineNewViewController.m

@@ -313,6 +313,26 @@
     [self updateOnline:!online];
 }
 
+- (IBAction)jumpToMemberClient:(id)sender {
+    NSString *account = [[NSUserDefaults standardUserDefaults] stringForKey:@"account"];
+    NSString *pwd = [[NSUserDefaults standardUserDefaults] stringForKey:@"pwd"];
+    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"chmoMember://login?mobile=%@&pass=%@", account, pwd]];
+    [[UIApplication sharedApplication] openURL:url];
+    if (@available(iOS 10.0, *)) {
+        [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) {
+            if (!success){
+                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"itms-apps://itunes.apple.com/app/id1434021876?mt=8"] options:@{} completionHandler:nil];
+            }
+        }];
+    } else {
+        if (![[UIApplication sharedApplication] canOpenURL:url]){
+            [[UIApplication sharedApplication] openURL:url];
+        } else {
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"itms-apps://itunes.apple.com/app/id1434021876?mt=8"]];
+        }
+    }
+}
+
 - (void)updateOnline:(BOOL)state {
     __weak MineNewViewController *this = self;
     NSDictionary *dic = @{@"modelpk": [ModelUser modelUser].modelpk, @"state": @(state)};

+ 18 - 0
model/Classes/Controllers/Controller/MineVC/MineNewViewController.xib → model/Classes/Controllers/MineVC/MineNewViewController.xib

@@ -65,6 +65,16 @@
                     <color key="textColor" red="0.20392156862745098" green="0.20392156862745098" blue="0.20392156862745098" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
+                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_yonghuduan" translatesAutoresizingMaskIntoConstraints="NO" id="a1J-et-eW5">
+                    <rect key="frame" x="311" y="149" width="64" height="62"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="64" id="XQC-8N-tsS"/>
+                        <constraint firstAttribute="height" constant="62" id="yYF-fS-fdV"/>
+                    </constraints>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="aPR-Ij-VAL" appends="YES" id="eE6-Tg-rhz"/>
+                    </connections>
+                </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SCh-5U-jcN">
                     <rect key="frame" x="144.66666666666666" y="61" width="86" height="86"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -515,7 +525,9 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstItem="60z-Gq-b3E" firstAttribute="trailing" secondItem="a1J-et-eW5" secondAttribute="trailing" id="1fB-fv-D08"/>
                 <constraint firstItem="60z-Gq-b3E" firstAttribute="trailing" secondItem="IBe-5v-ajR" secondAttribute="trailing" constant="20" id="2Ub-cG-Dlo"/>
+                <constraint firstItem="a1J-et-eW5" firstAttribute="top" secondItem="tnV-pA-N5a" secondAttribute="top" constant="-10" id="3tD-qt-vLr"/>
                 <constraint firstItem="r9j-ZU-SlD" firstAttribute="top" secondItem="JMR-FE-a0P" secondAttribute="bottom" constant="-30" id="4E2-i3-WaW"/>
                 <constraint firstItem="wPM-QM-mXD" firstAttribute="centerY" secondItem="TVo-sg-JF7" secondAttribute="centerY" id="8JB-aY-axc"/>
                 <constraint firstItem="kaC-Mh-u3w" firstAttribute="centerX" secondItem="tnV-pA-N5a" secondAttribute="centerX" id="97e-WL-o8e"/>
@@ -608,10 +620,16 @@
                 <action selector="tapSwitch:" destination="-1" id="6y1-yx-fDx"/>
             </connections>
         </tapGestureRecognizer>
+        <tapGestureRecognizer id="aPR-Ij-VAL">
+            <connections>
+                <action selector="jumpToMemberClient:" destination="-1" id="Hd6-fH-eX6"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="default_avatar" width="36" height="36"/>
         <image name="icon_paihang" width="56" height="56"/>
+        <image name="icon_yonghuduan" width="64" height="62"/>
         <image name="into_icon_dingdan" width="30" height="30"/>
         <image name="into_icon_huancun" width="30" height="30"/>
         <image name="into_icon_huodong" width="30" height="30"/>

+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/ApplyRecommendView.h → model/Classes/Controllers/MineVC/View/ApplyRecommendView.h


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/ApplyRecommendView.m → model/Classes/Controllers/MineVC/View/ApplyRecommendView.m


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/IntroView.h → model/Classes/Controllers/MineVC/View/IntroView.h


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/IntroView.m → model/Classes/Controllers/MineVC/View/IntroView.m


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/IntroView.xib → model/Classes/Controllers/MineVC/View/IntroView.xib


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/MineItemView.h → model/Classes/Controllers/MineVC/View/MineItemView.h


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/MineItemView.m → model/Classes/Controllers/MineVC/View/MineItemView.m


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/MineItemView.xib → model/Classes/Controllers/MineVC/View/MineItemView.xib


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/SettingsItemView.h → model/Classes/Controllers/MineVC/View/SettingsItemView.h


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/SettingsItemView.m → model/Classes/Controllers/MineVC/View/SettingsItemView.m


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/SettingsItemView.xib → model/Classes/Controllers/MineVC/View/SettingsItemView.xib


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/ShadowMenu.h → model/Classes/Controllers/MineVC/View/ShadowMenu.h


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/ShadowMenu.m → model/Classes/Controllers/MineVC/View/ShadowMenu.m


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/ShadowMenu.xib → model/Classes/Controllers/MineVC/View/ShadowMenu.xib


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/ShadowView.h → model/Classes/Controllers/MineVC/View/ShadowView.h


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/ShadowView.m → model/Classes/Controllers/MineVC/View/ShadowView.m


+ 0 - 0
model/Classes/Controllers/Controller/MineVC/View/ShadowView.xib → model/Classes/Controllers/MineVC/View/ShadowView.xib


+ 0 - 0
model/Classes/Controllers/Controller/MyOrderVC/MyOrderController.h → model/Classes/Controllers/MyOrderVC/MyOrderController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyOrderVC/MyOrderController.m → model/Classes/Controllers/MyOrderVC/MyOrderController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyOrderVC/OrderDetailViewController.h → model/Classes/Controllers/MyOrderVC/OrderDetailViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyOrderVC/OrderDetailViewController.m → model/Classes/Controllers/MyOrderVC/OrderDetailViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyOrderVC/SkillOrderController.h → model/Classes/Controllers/MyOrderVC/SkillOrderController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyOrderVC/SkillOrderController.m → model/Classes/Controllers/MyOrderVC/SkillOrderController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyOrderVC/VideoOrderController.h → model/Classes/Controllers/MyOrderVC/VideoOrderController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyOrderVC/VideoOrderController.m → model/Classes/Controllers/MyOrderVC/VideoOrderController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/HobbyViewController.h → model/Classes/Controllers/MyProfileVC/HobbyViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/HobbyViewController.m → model/Classes/Controllers/MyProfileVC/HobbyViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/InfoEditViewController.h → model/Classes/Controllers/MyProfileVC/InfoEditViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/InfoEditViewController.m → model/Classes/Controllers/MyProfileVC/InfoEditViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/MeasurementsViewController.h → model/Classes/Controllers/MyProfileVC/MeasurementsViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/MeasurementsViewController.m → model/Classes/Controllers/MyProfileVC/MeasurementsViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelCardController.h → model/Classes/Controllers/MyProfileVC/ModelCardController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelCardController.m → model/Classes/Controllers/MyProfileVC/ModelCardController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelDataController.h → model/Classes/Controllers/MyProfileVC/ModelDataController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelDataController.m → model/Classes/Controllers/MyProfileVC/ModelDataController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelHonorViewController.h → model/Classes/Controllers/MyProfileVC/ModelHonorViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelHonorViewController.m → model/Classes/Controllers/MyProfileVC/ModelHonorViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelPhotoViewController.h → model/Classes/Controllers/MyProfileVC/ModelPhotoViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelPhotoViewController.m → model/Classes/Controllers/MyProfileVC/ModelPhotoViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelTagViewController.h → model/Classes/Controllers/MyProfileVC/ModelTagViewController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyProfileVC/ModelTagViewController.m → model/Classes/Controllers/MyProfileVC/ModelTagViewController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyRedPacketsVC/RedEnvelopeController.h → model/Classes/Controllers/MyRedPacketsVC/RedEnvelopeController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyRedPacketsVC/RedEnvelopeController.m → model/Classes/Controllers/MyRedPacketsVC/RedEnvelopeController.m


+ 0 - 0
model/Classes/Controllers/Controller/MySkillsVC/EditorSkillsController.h → model/Classes/Controllers/MySkillsVC/EditorSkillsController.h


+ 0 - 0
model/Classes/Controllers/Controller/MySkillsVC/EditorSkillsController.m → model/Classes/Controllers/MySkillsVC/EditorSkillsController.m


+ 0 - 0
model/Classes/Controllers/Controller/MySkillsVC/MySkillsController.h → model/Classes/Controllers/MySkillsVC/MySkillsController.h


+ 0 - 0
model/Classes/Controllers/Controller/MySkillsVC/MySkillsController.m → model/Classes/Controllers/MySkillsVC/MySkillsController.m


+ 0 - 0
model/Classes/Controllers/Controller/MySkillsVC/PostSkillsController.h → model/Classes/Controllers/MySkillsVC/PostSkillsController.h


+ 0 - 0
model/Classes/Controllers/Controller/MySkillsVC/PostSkillsController.m → model/Classes/Controllers/MySkillsVC/PostSkillsController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyMemberController.h → model/Classes/Controllers/MyTeamVC/MyMemberController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyMemberController.m → model/Classes/Controllers/MyTeamVC/MyMemberController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyMemberController.xib → model/Classes/Controllers/MyTeamVC/MyMemberController.xib


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyModelController.h → model/Classes/Controllers/MyTeamVC/MyModelController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyModelController.m → model/Classes/Controllers/MyTeamVC/MyModelController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyModelController.xib → model/Classes/Controllers/MyTeamVC/MyModelController.xib


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyTeamCell.h → model/Classes/Controllers/MyTeamVC/MyTeamCell.h


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyTeamCell.m → model/Classes/Controllers/MyTeamVC/MyTeamCell.m


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyTeamCell.xib → model/Classes/Controllers/MyTeamVC/MyTeamCell.xib


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyTeamController.h → model/Classes/Controllers/MyTeamVC/MyTeamController.h


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyTeamController.m → model/Classes/Controllers/MyTeamVC/MyTeamController.m


+ 0 - 0
model/Classes/Controllers/Controller/MyTeamVC/MyTeamController.xib → model/Classes/Controllers/MyTeamVC/MyTeamController.xib


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio