Browse Source

帮奥东做的界面

kaipeng.ji 6 years ago
parent
commit
c51b99ea33
61 changed files with 520 additions and 131 deletions
  1. 4 4
      KXCardHelp.xcodeproj/project.pbxproj
  2. 14 0
      KXCardHelp.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist
  3. BIN
      KXCardHelp.xcworkspace/xcuserdata/kaipeng.xcuserdatad/UserInterfaceState.xcuserstate
  4. 5 0
      KXCardHelp.xcworkspace/xcuserdata/kaipeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  5. BIN
      KXCardHelp/Assets.xcassets/base/noData.imageset/4001531881657_.pic.jpg
  6. BIN
      KXCardHelp/Assets.xcassets/base/noData.imageset/4011531881660_.pic.jpg
  7. BIN
      KXCardHelp/Assets.xcassets/base/noData.imageset/4021531881661_.pic.jpg
  8. 3 3
      KXCardHelp/Assets.xcassets/base/noData.imageset/Contents.json
  9. BIN
      KXCardHelp/Assets.xcassets/base/noData.imageset/您还没有优惠券.png
  10. BIN
      KXCardHelp/Assets.xcassets/base/noData.imageset/您还没有优惠券@2x.png
  11. BIN
      KXCardHelp/Assets.xcassets/base/noData.imageset/您还没有优惠券@3x.png
  12. BIN
      KXCardHelp/Assets.xcassets/main/person/.DS_Store
  13. 23 0
      KXCardHelp/Assets.xcassets/main/person/main/mine_appstore.imageset/Contents.json
  14. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_appstore.imageset/去评分.png
  15. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_appstore.imageset/去评分@2x.png
  16. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_appstore.imageset/去评分@3x.png
  17. 23 0
      KXCardHelp/Assets.xcassets/main/person/main/mine_coupon.imageset/Contents.json
  18. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_coupon.imageset/我的优惠券.png
  19. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_coupon.imageset/我的优惠券@2x.png
  20. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_coupon.imageset/我的优惠券@3x.png
  21. 23 0
      KXCardHelp/Assets.xcassets/main/person/main/mine_feedback.imageset/Contents.json
  22. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_feedback.imageset/意见反馈.png
  23. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_feedback.imageset/意见反馈@2x.png
  24. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_feedback.imageset/意见反馈@3x.png
  25. 23 0
      KXCardHelp/Assets.xcassets/main/person/main/mine_privacy.imageset/Contents.json
  26. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_privacy.imageset/隐私政策.png
  27. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_privacy.imageset/隐私政策@2x.png
  28. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_privacy.imageset/隐私政策@3x.png
  29. 23 0
      KXCardHelp/Assets.xcassets/main/person/main/mine_vip.imageset/Contents.json
  30. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_vip.imageset/我的会员卡.png
  31. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_vip.imageset/我的会员卡@2x.png
  32. BIN
      KXCardHelp/Assets.xcassets/main/person/main/mine_vip.imageset/我的会员卡@3x.png
  33. 23 0
      KXCardHelp/Assets.xcassets/main/person/person_QQ_group.imageset/Contents.json
  34. BIN
      KXCardHelp/Assets.xcassets/main/person/person_QQ_group.imageset/qq群.png
  35. BIN
      KXCardHelp/Assets.xcassets/main/person/person_QQ_group.imageset/qq群@2x.png
  36. BIN
      KXCardHelp/Assets.xcassets/main/person/person_QQ_group.imageset/qq群@3x.png
  37. 23 0
      KXCardHelp/Assets.xcassets/main/person/person_QQ_service.imageset/Contents.json
  38. BIN
      KXCardHelp/Assets.xcassets/main/person/person_QQ_service.imageset/qq客服.png
  39. BIN
      KXCardHelp/Assets.xcassets/main/person/person_QQ_service.imageset/qq客服@2x.png
  40. BIN
      KXCardHelp/Assets.xcassets/main/person/person_QQ_service.imageset/qq客服@3x.png
  41. 23 0
      KXCardHelp/Assets.xcassets/main/person/person_email.imageset/Contents.json
  42. BIN
      KXCardHelp/Assets.xcassets/main/person/person_email.imageset/电子邮箱.png
  43. BIN
      KXCardHelp/Assets.xcassets/main/person/person_email.imageset/电子邮箱@2x.png
  44. BIN
      KXCardHelp/Assets.xcassets/main/person/person_email.imageset/电子邮箱@3x.png
  45. 3 3
      KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/Contents.json
  46. BIN
      KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/Rectangle 28.png
  47. BIN
      KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/Rectangle 28@2x.png
  48. BIN
      KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/Rectangle 28@3x.png
  49. BIN
      KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/头像.png
  50. BIN
      KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/头像@2x.png
  51. BIN
      KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/头像@3x.png
  52. 1 0
      KXCardHelp/Base/Tab/LVKBBaseTabBarViewController.m
  53. 1 1
      KXCardHelp/Main/Person/DiscountCoupon/VC/LVKBPersonDiscountCouponViewController.m
  54. 1 1
      KXCardHelp/Main/Person/Model/LVKBPersonModel.m
  55. 118 11
      KXCardHelp/Main/Person/Setting/AboutUs/VC/LVKBPersonAboutUsViewController.m
  56. 0 21
      KXCardHelp/Main/Person/Setting/VC/LVKBPersonSettingViewController.m
  57. 53 43
      KXCardHelp/Main/Person/VC/LVKBPersonViewController.m
  58. 1 1
      KXCardHelp/Main/Person/View/LVKBPersonHeader.m
  59. 4 4
      KXCardHelp/Main/Person/View/LVKBPersonTableViewCell.m
  60. 44 39
      KXCardHelp/Main/Person/View/LVKBPersonTableViewCell.xib
  61. 84 0
      Pods/Pods.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist

+ 4 - 4
KXCardHelp.xcodeproj/project.pbxproj

@@ -2864,7 +2864,7 @@
2864 2864
 				CODE_SIGN_IDENTITY = "iPhone Developer";
2865 2865
 				CODE_SIGN_STYLE = Automatic;
2866 2866
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2867
-				DEVELOPMENT_TEAM = CK5B2HKJ86;
2867
+				DEVELOPMENT_TEAM = QLZX2ZXRHW;
2868 2868
 				FRAMEWORK_SEARCH_PATHS = (
2869 2869
 					"$(inherited)",
2870 2870
 					"$(PROJECT_DIR)/KXCardHelp/OtherLib/BaiDu",
@@ -2881,7 +2881,7 @@
2881 2881
 					"$(PROJECT_DIR)/KXCardHelp/Tools/MiPush",
2882 2882
 				);
2883 2883
 				MiSDKRun = debug;
2884
-				PRODUCT_BUNDLE_IDENTIFIER = com.kxxuan.kabangAD;
2884
+				PRODUCT_BUNDLE_IDENTIFIER = com.kxxuan.kabangAD123;
2885 2885
 				PRODUCT_NAME = "$(TARGET_NAME)";
2886 2886
 				PROVISIONING_PROFILE = "";
2887 2887
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2898,7 +2898,7 @@
2898 2898
 				CODE_SIGN_ENTITLEMENTS = KXCardHelp/KXCardHelp.entitlements;
2899 2899
 				CODE_SIGN_IDENTITY = "iPhone Developer";
2900 2900
 				CODE_SIGN_STYLE = Automatic;
2901
-				DEVELOPMENT_TEAM = CK5B2HKJ86;
2901
+				DEVELOPMENT_TEAM = QLZX2ZXRHW;
2902 2902
 				FRAMEWORK_SEARCH_PATHS = (
2903 2903
 					"$(inherited)",
2904 2904
 					"$(PROJECT_DIR)/KXCardHelp/OtherLib/BaiDu",
@@ -2915,7 +2915,7 @@
2915 2915
 					"$(PROJECT_DIR)/KXCardHelp/Tools/MiPush",
2916 2916
 				);
2917 2917
 				MiSDKRun = online;
2918
-				PRODUCT_BUNDLE_IDENTIFIER = com.kxxuan.kabangAD;
2918
+				PRODUCT_BUNDLE_IDENTIFIER = com.kxxuan.kabangAD123;
2919 2919
 				PRODUCT_NAME = "$(TARGET_NAME)";
2920 2920
 				PROVISIONING_PROFILE = "";
2921 2921
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 14 - 0
KXCardHelp.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+<plist version="1.0">
4
+<dict>
5
+	<key>SchemeUserState</key>
6
+	<dict>
7
+		<key>KXCardHelp.xcscheme</key>
8
+		<dict>
9
+			<key>orderHint</key>
10
+			<integer>0</integer>
11
+		</dict>
12
+	</dict>
13
+</dict>
14
+</plist>

BIN
KXCardHelp.xcworkspace/xcuserdata/kaipeng.xcuserdatad/UserInterfaceState.xcuserstate


+ 5 - 0
KXCardHelp.xcworkspace/xcuserdata/kaipeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<Bucket
3
+   type = "0"
4
+   version = "2.0">
5
+</Bucket>

BIN
KXCardHelp/Assets.xcassets/base/noData.imageset/4001531881657_.pic.jpg


BIN
KXCardHelp/Assets.xcassets/base/noData.imageset/4011531881660_.pic.jpg


BIN
KXCardHelp/Assets.xcassets/base/noData.imageset/4021531881661_.pic.jpg


+ 3 - 3
KXCardHelp/Assets.xcassets/base/noData.imageset/Contents.json

@@ -2,17 +2,17 @@
2 2
   "images" : [
3 3
     {
4 4
       "idiom" : "universal",
5
-      "filename" : "4021531881661_.pic.jpg",
5
+      "filename" : "您还没有优惠券.png",
6 6
       "scale" : "1x"
7 7
     },
8 8
     {
9 9
       "idiom" : "universal",
10
-      "filename" : "4011531881660_.pic.jpg",
10
+      "filename" : "您还没有优惠券@2x.png",
11 11
       "scale" : "2x"
12 12
     },
13 13
     {
14 14
       "idiom" : "universal",
15
-      "filename" : "4001531881657_.pic.jpg",
15
+      "filename" : "您还没有优惠券@3x.png",
16 16
       "scale" : "3x"
17 17
     }
18 18
   ],

BIN
KXCardHelp/Assets.xcassets/base/noData.imageset/您还没有优惠券.png


BIN
KXCardHelp/Assets.xcassets/base/noData.imageset/您还没有优惠券@2x.png


BIN
KXCardHelp/Assets.xcassets/base/noData.imageset/您还没有优惠券@3x.png


BIN
KXCardHelp/Assets.xcassets/main/person/.DS_Store


+ 23 - 0
KXCardHelp/Assets.xcassets/main/person/main/mine_appstore.imageset/Contents.json

@@ -0,0 +1,23 @@
1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "去评分.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "去评分@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "去评分@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_appstore.imageset/去评分.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_appstore.imageset/去评分@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_appstore.imageset/去评分@3x.png


+ 23 - 0
KXCardHelp/Assets.xcassets/main/person/main/mine_coupon.imageset/Contents.json

@@ -0,0 +1,23 @@
1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "我的优惠券.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "我的优惠券@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "我的优惠券@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_coupon.imageset/我的优惠券.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_coupon.imageset/我的优惠券@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_coupon.imageset/我的优惠券@3x.png


+ 23 - 0
KXCardHelp/Assets.xcassets/main/person/main/mine_feedback.imageset/Contents.json

@@ -0,0 +1,23 @@
1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "意见反馈.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "意见反馈@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "意见反馈@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_feedback.imageset/意见反馈.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_feedback.imageset/意见反馈@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_feedback.imageset/意见反馈@3x.png


+ 23 - 0
KXCardHelp/Assets.xcassets/main/person/main/mine_privacy.imageset/Contents.json

@@ -0,0 +1,23 @@
1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "隐私政策.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "隐私政策@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "隐私政策@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_privacy.imageset/隐私政策.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_privacy.imageset/隐私政策@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_privacy.imageset/隐私政策@3x.png


+ 23 - 0
KXCardHelp/Assets.xcassets/main/person/main/mine_vip.imageset/Contents.json

@@ -0,0 +1,23 @@
1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "我的会员卡.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "我的会员卡@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "我的会员卡@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_vip.imageset/我的会员卡.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_vip.imageset/我的会员卡@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/main/mine_vip.imageset/我的会员卡@3x.png


+ 23 - 0
KXCardHelp/Assets.xcassets/main/person/person_QQ_group.imageset/Contents.json

@@ -0,0 +1,23 @@
1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "qq群.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "qq群@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "qq群@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

BIN
KXCardHelp/Assets.xcassets/main/person/person_QQ_group.imageset/qq群.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_QQ_group.imageset/qq群@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_QQ_group.imageset/qq群@3x.png


+ 23 - 0
KXCardHelp/Assets.xcassets/main/person/person_QQ_service.imageset/Contents.json

@@ -0,0 +1,23 @@
1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "qq客服.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "qq客服@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "qq客服@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

BIN
KXCardHelp/Assets.xcassets/main/person/person_QQ_service.imageset/qq客服.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_QQ_service.imageset/qq客服@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_QQ_service.imageset/qq客服@3x.png


+ 23 - 0
KXCardHelp/Assets.xcassets/main/person/person_email.imageset/Contents.json

@@ -0,0 +1,23 @@
1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "电子邮箱.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "电子邮箱@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "电子邮箱@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

BIN
KXCardHelp/Assets.xcassets/main/person/person_email.imageset/电子邮箱.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_email.imageset/电子邮箱@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_email.imageset/电子邮箱@3x.png


+ 3 - 3
KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/Contents.json

@@ -2,17 +2,17 @@
2 2
   "images" : [
3 3
     {
4 4
       "idiom" : "universal",
5
-      "filename" : "Rectangle 28.png",
5
+      "filename" : "头像.png",
6 6
       "scale" : "1x"
7 7
     },
8 8
     {
9 9
       "idiom" : "universal",
10
-      "filename" : "Rectangle 28@2x.png",
10
+      "filename" : "头像@2x.png",
11 11
       "scale" : "2x"
12 12
     },
13 13
     {
14 14
       "idiom" : "universal",
15
-      "filename" : "Rectangle 28@3x.png",
15
+      "filename" : "头像@3x.png",
16 16
       "scale" : "3x"
17 17
     }
18 18
   ],

BIN
KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/Rectangle 28.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/Rectangle 28@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/Rectangle 28@3x.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/头像.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/头像@2x.png


BIN
KXCardHelp/Assets.xcassets/main/person/person_header_top_img.imageset/头像@3x.png


+ 1 - 0
KXCardHelp/Base/Tab/LVKBBaseTabBarViewController.m

@@ -38,6 +38,7 @@
38 38
     self.tabBar.layer.shadowOffset = CGSizeMake(0, -2);
39 39
 //    self.tabBar.layer.shadowRadius=7;
40 40
     self.tabBar.layer.shadowOpacity =0.1f;
41
+    self.tabBar.translucent = NO;
41 42
 }
42 43
 
43 44
 #pragma mark ------------------ 版本更新检测 ------

+ 1 - 1
KXCardHelp/Main/Person/DiscountCoupon/VC/LVKBPersonDiscountCouponViewController.m

@@ -36,7 +36,7 @@ static NSString *tabelCell = @"tabelCell";
36 36
     self.haveIdentity=@(-1);
37 37
     self.haveIcard=@(-1);
38 38
     self.haveOpen=@(-1);
39
-    [self.navigationBar setNavTitle:@"优惠券"];
39
+    [self.navigationBar setNavTitle:@"我的优惠券"];
40 40
     self.navigationBar.showNavigationBarBottomLine=YES;
41 41
     self.page=1;
42 42
     [self backBtnShow];

+ 1 - 1
KXCardHelp/Main/Person/Model/LVKBPersonModel.m

@@ -31,7 +31,7 @@
31 31
     LVKBPersonModel *model31=[[LVKBPersonModel alloc] init];
32 32
     model31.img=@"person_main_server";
33 33
     model31.title=@"联系我们";
34
-    NSArray *arr3=@[model31];
34
+    NSArray *arr3=@[];
35 35
     [arr addObjectsFromArray:@[arr0,arr1,arr2,arr3]];
36 36
     
37 37
     return arr;

+ 118 - 11
KXCardHelp/Main/Person/Setting/AboutUs/VC/LVKBPersonAboutUsViewController.m

@@ -24,22 +24,129 @@
24 24
 
25 25
 -(void)setupUI
26 26
 {
27
-    float moveHight=10+15+100-30-NavBarHeight;
28
-    UIImageView *imageView=[[UIImageView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH/2-79.0f/2, 120*SCREEN_MUTI+moveHight, 79, 38)];
27
+    UIView *topView = [[UIView alloc] init];
28
+    topView.backgroundColor = [UIColor whiteColor];
29
+    topView.layer.cornerRadius = 8;
30
+    topView.layer.masksToBounds = YES;
31
+    [self.view addSubview:topView];
32
+    
33
+    UIImageView *imageView = [[UIImageView alloc] init];
34
+    imageView.layer.cornerRadius = 14;
29 35
     imageView.image=[UIImage imageNamed:@"app_icon"];
30
-    imageView.backgroundColor=[UIColor clearColor];
31
-    imageView.layer.cornerRadius=10;
32
-    imageView.layer.masksToBounds=YES;
33
-    [self.view addSubview:imageView];
34
-    NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
36
+    imageView.layer.masksToBounds = YES;
37
+    imageView.contentMode = UIViewContentModeScaleAspectFit;
38
+    [topView addSubview:imageView];
39
+    
40
+    UILabel *vertion=[[UILabel alloc]init];
35 41
     // app版本
42
+    NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
36 43
     NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
37
-    UILabel *vertion=[[UILabel alloc]initWithFrame:CGRectMake(0, 255*SCREEN_MUTI+moveHight, SCREEN_WIDTH, 20)];
38 44
     vertion.text=[NSString stringWithFormat:@"当前版本:%@",app_Version];
39
-    vertion.textColor=[UIColor CHColorWithHex:0x777777];
45
+    vertion.textColor=[UIColor CHColorWithHex:0xFF903C];
40 46
     vertion.textAlignment=NSTextAlignmentCenter;
41
-    vertion.font=FONT_SYS(14);
42
-    [self.view addSubview:vertion];
47
+    vertion.font=FONT_SYS(20);
48
+    [topView addSubview:vertion];
49
+    [topView mas_makeConstraints:^(MASConstraintMaker *make) {
50
+        make.top.equalTo(self.view).offset(NavBarHeight + 10);
51
+        make.size.mas_equalTo(CGSizeMake(351, 127));
52
+        make.centerX.equalTo(self.view.mas_centerX);
53
+    }];
54
+    [imageView mas_makeConstraints:^(MASConstraintMaker *make) {
55
+        make.top.equalTo(topView.mas_top).offset(18);
56
+        make.size.mas_equalTo(CGSizeMake(62, 62));
57
+        make.centerX.equalTo(topView.mas_centerX);
58
+    }];
59
+    [vertion mas_makeConstraints:^(MASConstraintMaker *make) {
60
+        make.top.equalTo(imageView.mas_bottom).offset(9);
61
+        make.centerX.equalTo(topView.mas_centerX);
62
+    }];
63
+    
64
+    UIView *bottomView = [[UIView alloc] init];
65
+    bottomView.backgroundColor = [UIColor whiteColor];
66
+    bottomView.layer.cornerRadius = 8;
67
+    bottomView.layer.masksToBounds = YES;
68
+    bottomView.tag = 2000;
69
+    [self.view addSubview:bottomView];
70
+    [bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
71
+        make.top.equalTo(topView.mas_bottom).offset(6);
72
+        make.size.mas_equalTo(CGSizeMake(351, 174));
73
+        make.centerX.equalTo(self.view.mas_centerX);
74
+    }];
75
+    
76
+    NSArray *imageNames = @[@"person_QQ_service",@"person_QQ_group",@"person_email"];
77
+    NSArray *titleNames = @[@"QQ客服",@"QQ交流群",@"电子邮箱"];
78
+    
79
+    for (NSInteger i = 0; i < 3; i++) {
80
+        UIImageView *image = [[UIImageView alloc] initWithFrame:CGRectMake(24, 16.5+i*58, 25, 25)];
81
+        image.image = [UIImage imageNamed:imageNames[i]];
82
+        [bottomView addSubview:image];
83
+        UILabel *titleLabel = [[UILabel alloc] init];
84
+        titleLabel.textColor = [UIColor CHColorWithHex:0x444444];
85
+        titleLabel.font = FONT_SYS(15);
86
+        titleLabel.text = titleNames[i];
87
+        [bottomView addSubview:titleLabel];
88
+        [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
89
+            make.left.equalTo(image.mas_right).offset(22);
90
+            make.centerY.equalTo(image.mas_centerY);
91
+        }];
92
+        if (i == 2) {
93
+            UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
94
+            button.layer.cornerRadius = 4;
95
+            button.layer.masksToBounds = YES;
96
+            button.layer.borderWidth = 1;
97
+            button.layer.borderColor = [UIColor CHColorWithHex:0xFF903C].CGColor;
98
+            NSAttributedString *attibute = [[NSAttributedString alloc] initWithString:@"复制" attributes:@{NSForegroundColorAttributeName:[UIColor CHColorWithHex:0xFF903C],NSFontAttributeName:FONT_SYS(13)}];
99
+            [button setAttributedTitle:attibute forState:UIControlStateNormal];
100
+            [button addTarget:self action:@selector(buttonClick) forControlEvents:UIControlEventTouchUpInside];
101
+            [bottomView addSubview:button];
102
+            [button mas_makeConstraints:^(MASConstraintMaker *make) {
103
+                make.right.equalTo(bottomView.mas_right).offset(-29);
104
+                make.size.mas_equalTo(CGSizeMake(40, 20));
105
+                make.centerY.equalTo(image.mas_centerY);
106
+            }];
107
+        } else{
108
+        UIView *lineView = [[UIView alloc] initWithFrame:CGRectMake(19, 57*(i+1), 313, 1)];
109
+        lineView.backgroundColor = [UIColor CHColorWithHex:0xE9E9E9];
110
+        [bottomView addSubview:lineView];
111
+        UIImageView *arrImage = [[UIImageView alloc] init];
112
+            arrImage.tag = 1000+i;
113
+        arrImage.image = [UIImage imageNamed:@"right_gray"];
114
+            UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init];
115
+            tap.numberOfTapsRequired = 1;
116
+            [tap addTarget:self action:@selector(tapAction:)];
117
+            arrImage.userInteractionEnabled = YES;
118
+            [arrImage addGestureRecognizer:tap];
119
+        [bottomView addSubview:arrImage];
120
+        [arrImage mas_makeConstraints:^(MASConstraintMaker *make) {
121
+            make.right.equalTo(bottomView.mas_right).offset(-29);
122
+            make.size.mas_equalTo(CGSizeMake(15, 15));
123
+            make.centerY.equalTo(image.mas_centerY);
124
+        }];
125
+        }
126
+    }
127
+}
128
+
129
+
130
+- (void)buttonClick{
131
+    [MBProgressHUD showSuccess:@"复制邮箱成功!"];
132
+    UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
133
+    pasteboard.string = @"vip@lanjiekuan.com";
134
+}
135
+
136
+- (void)tapAction:(UITapGestureRecognizer *)tap{
137
+    UIView *bottomView = [self.view viewWithTag:2000];
138
+    UIImageView *imageView = [bottomView viewWithTag:1000];
139
+    CGPoint point = [tap locationInView:imageView];
140
+    if (point.y < 10) {
141
+        [MBProgressHUD showSuccess:@"复制QQ客服成功!"];
142
+        UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
143
+        pasteboard.string = @"1424178866";
144
+    } else{
145
+        [MBProgressHUD showSuccess:@"复制QQ群成功!"];
146
+        UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
147
+        pasteboard.string = @"858896925";
148
+    }
149
+
43 150
 }
44 151
 
45 152
 

+ 0 - 21
KXCardHelp/Main/Person/Setting/VC/LVKBPersonSettingViewController.m

@@ -123,18 +123,6 @@ static NSString *tabelCell = @"tabelCell";
123 123
             break;
124 124
         case 3:
125 125
         {
126
-            LVKBPersonFeedbackViewController *vc=[[LVKBPersonFeedbackViewController alloc]init];
127
-            [self.navigationController pushViewController:vc animated:YES];
128
-        }
129
-            break;
130
-        case 4:
131
-        {
132
-            NSString *str = [NSString stringWithFormat:  @"itms-apps://itunes.apple.com/cn/app/id%@?mt=8",APPLE_APP_ID];
133
-            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:str]];
134
-        }
135
-            break;
136
-        case 5:
137
-        {
138 126
             LVKBPersonAboutUsViewController *vc=[[LVKBPersonAboutUsViewController alloc]init];
139 127
             [self.navigationController pushViewController:vc animated:YES];
140 128
         }
@@ -300,15 +288,6 @@ static NSString *tabelCell = @"tabelCell";
300 288
                          @"title":@"手势锁",
301 289
                          @"content":@""
302 290
                          },
303
-                     
304
-                     @{
305
-                         @"title":@"意见反馈",
306
-                         @"content":@""
307
-                         },
308
-                     @{
309
-                         @"title":@"去评价",
310
-                         @"content":@""
311
-                         },
312 291
                      @{
313 292
                          @"title":@"关于我们",
314 293
                          @"content":@""

+ 53 - 43
KXCardHelp/Main/Person/VC/LVKBPersonViewController.m

@@ -45,10 +45,11 @@ static NSString *tabelCell = @"tabelCell";
45 45
         self.automaticallyAdjustsScrollViewInsets = NO;
46 46
     }
47 47
     [self initUI];
48
-    [self adjustUI];
48
+//    [self adjustUI];
49 49
 }
50 50
 
51 51
 -(void)initUI{
52
+    [self.view addSubview:self.tableViewHeader];
52 53
     [self.view addSubview:self.tableView];
53 54
 }
54 55
 -(void)viewWillAppear:(BOOL)animated{
@@ -67,7 +68,7 @@ static NSString *tabelCell = @"tabelCell";
67 68
 #pragma mark -代理 UITableViewDelegate
68 69
 
69 70
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
70
-    return 64;
71
+    return 70;
71 72
 }
72 73
 
73 74
 
@@ -120,20 +121,25 @@ static NSString *tabelCell = @"tabelCell";
120 121
         case 3:
121 122
         {
122 123
             switch (indexPath.row) {
123
-                case 0://联系我们
124
+                case 0://我的优惠券
124 125
                 {
125
-                    LVKBContactUsViewController  *vc=[[LVKBContactUsViewController alloc]init];
126
+                    LVKBPersonDiscountCouponViewController *vc = [[LVKBPersonDiscountCouponViewController alloc] init];
126 127
                     [self.navigationController pushViewController:vc animated:YES];
127 128
                 }
128 129
                     break;
129
-                case 3://意见反馈
130
+                case 1://我的会员卡
131
+                {
132
+                    
133
+
134
+                }
135
+                    break;
136
+                case 2: // 意见反馈
130 137
                 {
131 138
                     LVKBPersonFeedbackViewController *vc=[[LVKBPersonFeedbackViewController alloc]init];
132 139
                     [self.navigationController pushViewController:vc animated:YES];
133
-
134 140
                 }
135 141
                     break;
136
-                case 4://去评分
142
+                case 3://去评分
137 143
                 {
138 144
                     
139 145
                     NSString *str = [NSString stringWithFormat:  @"itms-apps://itunes.apple.com/cn/app/id%@?mt=8",APPLE_APP_ID];
@@ -143,24 +149,24 @@ static NSString *tabelCell = @"tabelCell";
143 149
                     break;
144 150
                     
145 151
                     
146
-                case 5: {
147
-                        NSString *cardName = @"卡包 - 奥东";
148
-                        UIImage *avatar = [UIImage imageNamed:@"handle_card_comimg_soon"];
149
-            
150
-                        // 实例化扫描控制器
151
-                        HMScannerController *scanner = [HMScannerController scannerWithCardName:cardName avatar:avatar completion:^(NSString *stringValue) {
152
-            
153
-                            //        self.scanResultLabel.text = stringValue;
154
-                        }];
155
-            
156
-                        // 展现扫描控制器
157
-                        [self showDetailViewController:scanner sender:nil];
158
-                    
159
-//                    XJCustomWebViewController *webVC = [[XJCustomWebViewController alloc] init];
160
-//                    webVC.webStr = @"http://m.henhaojie.com/agreement-bnd.html?name=卡帮";
161
-//                    webVC.title = @"隐私权政策";
152
+                case 4: {
153
+//                        NSString *cardName = @"卡包 - 奥东";
154
+//                        UIImage *avatar = [UIImage imageNamed:@"handle_card_comimg_soon"];
162 155
 //
163
-//                    [self.navigationController pushViewController:webVC animated:YES];
156
+//                        // 实例化扫描控制器
157
+//                        HMScannerController *scanner = [HMScannerController scannerWithCardName:cardName avatar:avatar completion:^(NSString *stringValue) {
158
+//
159
+//                            //        self.scanResultLabel.text = stringValue;
160
+//                        }];
161
+//
162
+//                        // 展现扫描控制器
163
+//                        [self showDetailViewController:scanner sender:nil];
164
+                    
165
+                    XJCustomWebViewController *webVC = [[XJCustomWebViewController alloc] init];
166
+                    webVC.webStr = @"http://m.henhaojie.com/agreement-bnd.html?name=卡帮";
167
+                    webVC.title = @"隐私权政策";
168
+
169
+                    [self.navigationController pushViewController:webVC animated:YES];
164 170
                 }
165 171
                     break;
166 172
             }
@@ -197,6 +203,7 @@ static NSString *tabelCell = @"tabelCell";
197 203
     }
198 204
     return arr.count+5;
199 205
 }
206
+
200 207
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
201 208
   
202 209
      LVKBPersonTableViewCell *cell=[tableView dequeueReusableCellWithIdentifier:tabelCell];
@@ -204,45 +211,45 @@ static NSString *tabelCell = @"tabelCell";
204 211
     if (!cell) {
205 212
         cell = [[LVKBPersonTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"LVKBPersonTableViewCell"];
206 213
     }
214
+//    if (indexPath.row == 0) {
215
+//
216
+//        LVKBPersonModel *model=self.dataArray[indexPath.section][indexPath.row];
217
+//        cell.model=model;
218
+//    }
207 219
     if (indexPath.row == 0) {
208
-       
209
-        LVKBPersonModel *model=self.dataArray[indexPath.section][indexPath.row];
210
-        cell.model=model;
211
-    }
212
-    if (indexPath.row == 1) {
213 220
         LVKBPersonModel *model = [[LVKBPersonModel alloc] init];
214
-        model.img = @"";
221
+        model.img = @"mine_coupon";
215 222
         model.title = @"我的优惠券";
216 223
         model.showLine = YES;
217 224
         cell.model = model;
218 225
     }
219
-    if (indexPath.row == 2) {
226
+    if (indexPath.row == 1) {
220 227
         LVKBPersonModel *model = [[LVKBPersonModel alloc] init];
221
-        model.img = @"";
228
+        model.img = @"mine_vip";
222 229
         model.title = @"我的会员卡";
223 230
         model.showLine = YES;
224 231
         cell.model = model;
225 232
     }
226 233
     
227
-    if (indexPath.row == 3) {
234
+    if (indexPath.row == 2) {
228 235
         LVKBPersonModel *model = [[LVKBPersonModel alloc] init];
229
-        model.img = @"";
236
+        model.img = @"mine_feedback";
230 237
         model.title = @"意见反馈";
231 238
         model.showLine = YES;
232 239
         cell.model = model;
233 240
     }
234 241
     
235
-    if (indexPath.row == 4) {
242
+    if (indexPath.row == 3) {
236 243
         LVKBPersonModel *model = [[LVKBPersonModel alloc] init];
237
-        model.img = @"";
244
+        model.img = @"mine_appstore";
238 245
         model.title = @"去AppStore评分";
239 246
         model.showLine = YES;
240 247
         cell.model = model;
241 248
     }
242 249
     
243
-    if (indexPath.row == 5) {
250
+    if (indexPath.row == 4) {
244 251
         LVKBPersonModel *model = [[LVKBPersonModel alloc] init];
245
-        model.img = @"";
252
+        model.img = @"mine_privacy";
246 253
         model.title = @"隐私权政策";
247 254
         model.showLine = YES;
248 255
         cell.model = model;
@@ -287,15 +294,18 @@ static NSString *tabelCell = @"tabelCell";
287 294
 #pragma mark -懒加载
288 295
 - (UITableView *)tableView{
289 296
     if (!_tableView) {
290
-        _tableView=[[UITableView alloc]initWithFrame:CGRectZero style:UITableViewStyleGrouped];
297
+        _tableView=[[UITableView alloc]initWithFrame:CGRectMake(12, 114+NavSafeBarHeight, SCREEN_WIDTH-24, SCREEN_HEIGHT - NavSafeBarHeight - 114 - TabHeight) style:UITableViewStyleGrouped];
291 298
         [_tableView registerNib:[UINib nibWithNibName:@"LVKBPersonTableViewCell" bundle:nil] forCellReuseIdentifier:tabelCell];
292
-        _tableView.backgroundColor=[UIColor CHColorWithHex:0xF6F7F9];
299
+        _tableView.backgroundColor=[UIColor clearColor];
293 300
         _tableView.delegate=self;
294 301
         _tableView.dataSource=self;
295
-        _tableView.sectionHeaderHeight = 6.5;
296
-        _tableView.sectionFooterHeight = 0;
302
+        _tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 0.1f)];
303
+        _tableView.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 0.1f)];
304
+        _tableView.sectionHeaderHeight = 0.01;
305
+        _tableView.sectionFooterHeight = 0.01;
306
+        _tableView.layer.cornerRadius = 10;
307
+        _tableView.layer.masksToBounds = YES;
297 308
         _tableView.showsVerticalScrollIndicator = NO;
298
-        _tableView.tableHeaderView=self.tableViewHeader;
299 309
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
300 310
     }
301 311
     return _tableView;

+ 1 - 1
KXCardHelp/Main/Person/View/LVKBPersonHeader.m

@@ -44,7 +44,7 @@
44 44
 -(void)adjustUI{
45 45
     [self.headImageView mas_makeConstraints:^(MASConstraintMaker *make) {
46 46
         make.left.mas_equalTo(FITSIZE(18));
47
-        make.bottom.mas_equalTo(-FITSIZE(20));
47
+        make.bottom.mas_equalTo(-FITSIZE(30));
48 48
         make.width.height.mas_equalTo(56);
49 49
     }];
50 50
     [self.settingBtn mas_makeConstraints:^(MASConstraintMaker *make) {

+ 4 - 4
KXCardHelp/Main/Person/View/LVKBPersonTableViewCell.m

@@ -10,8 +10,7 @@
10 10
 @interface LVKBPersonTableViewCell()
11 11
 @property (weak, nonatomic) IBOutlet UIImageView *imgView;
12 12
 @property (weak, nonatomic) IBOutlet UILabel *titleLabel;
13
-@property (weak, nonatomic) IBOutlet UIView *bottomLine;
14
-
13
+@property (weak, nonatomic) IBOutlet UIView *baseContentView;
15 14
 
16 15
 @end
17 16
 @implementation LVKBPersonTableViewCell
@@ -19,7 +18,9 @@
19 18
 - (void)awakeFromNib {
20 19
     [super awakeFromNib];
21 20
     // Initialization code
22
-    self.selectionStyle = UITableViewCellSelectionStyleNone;  
21
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
22
+    self.baseContentView.layer.cornerRadius = 10;
23
+    self.baseContentView.layer.masksToBounds = YES;
23 24
 }
24 25
 
25 26
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
@@ -30,7 +31,6 @@
30 31
 - (void)setModel:(LVKBPersonModel *)model{
31 32
     [self.imgView setImage:[UIImage imageNamed:model.img]];
32 33
     self.titleLabel.text=model.title;
33
-    self.bottomLine.hidden=!model.showLine;
34 34
 }
35 35
 
36 36
 @end

+ 44 - 39
KXCardHelp/Main/Person/View/LVKBPersonTableViewCell.xib

@@ -1,68 +1,73 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
2
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
3 3
     <device id="retina4_7" orientation="portrait">
4 4
         <adaptation id="fullscreen"/>
5 5
     </device>
6 6
     <dependencies>
7 7
         <deployment identifier="iOS"/>
8
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
8
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
9 9
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
10 10
     </dependencies>
11 11
     <objects>
12 12
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
13 13
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
14
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="LVKBPersonTableViewCell">
15
-            <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
14
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="141" id="KGk-i7-Jjw" customClass="LVKBPersonTableViewCell">
15
+            <rect key="frame" x="0.0" y="0.0" width="540" height="141"/>
16 16
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
17 17
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
18
-                <rect key="frame" x="0.0" y="0.0" width="320" height="63.5"/>
18
+                <rect key="frame" x="0.0" y="0.0" width="540" height="140.5"/>
19 19
                 <autoresizingMask key="autoresizingMask"/>
20 20
                 <subviews>
21
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Hl-fb-lWz">
22
-                        <rect key="frame" x="18" y="22" width="24" height="24"/>
21
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Swi-81-7Da">
22
+                        <rect key="frame" x="0.0" y="0.0" width="540" height="134.5"/>
23
+                        <subviews>
24
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人中心" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bh6-BD-AwH">
25
+                                <rect key="frame" x="60" y="59" width="57.5" height="17"/>
26
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
27
+                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
28
+                                <nil key="highlightedColor"/>
29
+                            </label>
30
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Hl-fb-lWz">
31
+                                <rect key="frame" x="18" y="55.5" width="24" height="24"/>
32
+                                <constraints>
33
+                                    <constraint firstAttribute="width" constant="24" id="H13-n4-i7i"/>
34
+                                    <constraint firstAttribute="height" constant="24" id="d8B-A0-rRo"/>
35
+                                </constraints>
36
+                            </imageView>
37
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right_gray" translatesAutoresizingMaskIntoConstraints="NO" id="3iZ-zc-ylH">
38
+                                <rect key="frame" x="504" y="57.5" width="20" height="20"/>
39
+                                <constraints>
40
+                                    <constraint firstAttribute="height" constant="20" id="FsF-jo-YTZ"/>
41
+                                    <constraint firstAttribute="width" constant="20" id="Sxf-dl-to7"/>
42
+                                </constraints>
43
+                            </imageView>
44
+                        </subviews>
45
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
23 46
                         <constraints>
24
-                            <constraint firstAttribute="height" constant="24" id="cVN-mm-mUQ"/>
25
-                            <constraint firstAttribute="width" constant="24" id="faM-Cz-O5R"/>
26
-                        </constraints>
27
-                    </imageView>
28
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人中心" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bh6-BD-AwH">
29
-                        <rect key="frame" x="54" y="26" width="57.5" height="17"/>
30
-                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
31
-                        <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
32
-                        <nil key="highlightedColor"/>
33
-                    </label>
34
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right_gray" translatesAutoresizingMaskIntoConstraints="NO" id="3iZ-zc-ylH">
35
-                        <rect key="frame" x="286" y="24.5" width="20" height="20"/>
36
-                        <constraints>
37
-                            <constraint firstAttribute="width" constant="20" id="bwQ-Gg-YIE"/>
38
-                            <constraint firstAttribute="height" constant="20" id="pap-i9-Bsj"/>
39
-                        </constraints>
40
-                    </imageView>
41
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LOh-vU-iZd">
42
-                        <rect key="frame" x="49" y="62.5" width="257" height="1"/>
43
-                        <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
44
-                        <constraints>
45
-                            <constraint firstAttribute="height" constant="1" id="xTh-bb-cJP"/>
47
+                            <constraint firstItem="7Hl-fb-lWz" firstAttribute="leading" secondItem="Swi-81-7Da" secondAttribute="leading" constant="18" id="32u-sI-cVg"/>
48
+                            <constraint firstItem="bh6-BD-AwH" firstAttribute="centerY" secondItem="7Hl-fb-lWz" secondAttribute="centerY" id="I8A-ns-ccr"/>
49
+                            <constraint firstItem="bh6-BD-AwH" firstAttribute="leading" secondItem="7Hl-fb-lWz" secondAttribute="trailing" constant="18" id="U5f-Sf-09R"/>
50
+                            <constraint firstAttribute="trailing" secondItem="3iZ-zc-ylH" secondAttribute="trailing" constant="16" id="dYn-tJ-eaP"/>
51
+                            <constraint firstItem="7Hl-fb-lWz" firstAttribute="centerY" secondItem="Swi-81-7Da" secondAttribute="centerY" id="gdw-Kl-k0d"/>
52
+                            <constraint firstItem="3iZ-zc-ylH" firstAttribute="centerY" secondItem="Swi-81-7Da" secondAttribute="centerY" id="hlT-yJ-wY5"/>
46 53
                         </constraints>
47 54
                     </view>
48 55
                 </subviews>
56
+                <color key="backgroundColor" red="0.96470588239999999" green="0.96862745100000003" blue="0.97647058819999999" alpha="1" colorSpace="calibratedRGB"/>
57
+                <color key="tintColor" red="0.96470588239999999" green="0.96862745100000003" blue="0.97647058819999999" alpha="1" colorSpace="calibratedRGB"/>
49 58
                 <constraints>
50
-                    <constraint firstItem="3iZ-zc-ylH" firstAttribute="centerY" secondItem="bh6-BD-AwH" secondAttribute="centerY" id="36b-oV-2rr"/>
51
-                    <constraint firstItem="7Hl-fb-lWz" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="18" id="INZ-j8-rxd"/>
52
-                    <constraint firstItem="bh6-BD-AwH" firstAttribute="centerY" secondItem="7Hl-fb-lWz" secondAttribute="centerY" id="Mmw-mn-K2Z"/>
53
-                    <constraint firstItem="LOh-vU-iZd" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="49" id="aAa-km-eFU"/>
54
-                    <constraint firstItem="bh6-BD-AwH" firstAttribute="leading" secondItem="7Hl-fb-lWz" secondAttribute="trailing" constant="12" id="gTG-0U-seI"/>
55
-                    <constraint firstItem="7Hl-fb-lWz" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="22" id="h2X-Y0-ql4"/>
56
-                    <constraint firstAttribute="trailing" secondItem="3iZ-zc-ylH" secondAttribute="trailing" constant="14" id="oeD-Jx-Kmr"/>
57
-                    <constraint firstAttribute="trailing" secondItem="LOh-vU-iZd" secondAttribute="trailing" constant="14" id="pff-vB-Cpw"/>
58
-                    <constraint firstAttribute="bottom" secondItem="LOh-vU-iZd" secondAttribute="bottom" id="qlz-XO-jOq"/>
59
+                    <constraint firstAttribute="trailing" secondItem="Swi-81-7Da" secondAttribute="trailing" id="HbD-PU-GOP"/>
60
+                    <constraint firstAttribute="bottom" secondItem="Swi-81-7Da" secondAttribute="bottom" constant="6" id="Obj-iU-wtB"/>
61
+                    <constraint firstItem="Swi-81-7Da" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="R9m-IU-Spx"/>
62
+                    <constraint firstItem="Swi-81-7Da" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Zf7-HI-x5R"/>
59 63
                 </constraints>
60 64
             </tableViewCellContentView>
61 65
             <connections>
62
-                <outlet property="bottomLine" destination="LOh-vU-iZd" id="hyT-57-ERe"/>
66
+                <outlet property="baseContentView" destination="Swi-81-7Da" id="ceS-II-UV8"/>
63 67
                 <outlet property="imgView" destination="7Hl-fb-lWz" id="O68-60-OmE"/>
64 68
                 <outlet property="titleLabel" destination="bh6-BD-AwH" id="lyg-sw-DLy"/>
65 69
             </connections>
70
+            <point key="canvasLocation" x="155.19999999999999" y="-106.59670164917542"/>
66 71
         </tableViewCell>
67 72
     </objects>
68 73
     <resources>

+ 84 - 0
Pods/Pods.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,84 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+<plist version="1.0">
4
+<dict>
5
+	<key>SchemeUserState</key>
6
+	<dict>
7
+		<key>AFNetworking.xcscheme</key>
8
+		<dict>
9
+			<key>orderHint</key>
10
+			<integer>1</integer>
11
+		</dict>
12
+		<key>FLAnimatedImage.xcscheme</key>
13
+		<dict>
14
+			<key>orderHint</key>
15
+			<integer>2</integer>
16
+		</dict>
17
+		<key>FMDB.xcscheme</key>
18
+		<dict>
19
+			<key>orderHint</key>
20
+			<integer>3</integer>
21
+		</dict>
22
+		<key>IQKeyboardManager.xcscheme</key>
23
+		<dict>
24
+			<key>orderHint</key>
25
+			<integer>4</integer>
26
+		</dict>
27
+		<key>MBProgressHUD.xcscheme</key>
28
+		<dict>
29
+			<key>orderHint</key>
30
+			<integer>6</integer>
31
+		</dict>
32
+		<key>MJExtension.xcscheme</key>
33
+		<dict>
34
+			<key>orderHint</key>
35
+			<integer>7</integer>
36
+		</dict>
37
+		<key>MJRefresh.xcscheme</key>
38
+		<dict>
39
+			<key>orderHint</key>
40
+			<integer>8</integer>
41
+		</dict>
42
+		<key>Masonry.xcscheme</key>
43
+		<dict>
44
+			<key>orderHint</key>
45
+			<integer>5</integer>
46
+		</dict>
47
+		<key>PPBadgeView.xcscheme</key>
48
+		<dict>
49
+			<key>orderHint</key>
50
+			<integer>10</integer>
51
+		</dict>
52
+		<key>Pods-KXCardHelp.xcscheme</key>
53
+		<dict>
54
+			<key>orderHint</key>
55
+			<integer>9</integer>
56
+		</dict>
57
+		<key>ReactiveCocoa.xcscheme</key>
58
+		<dict>
59
+			<key>orderHint</key>
60
+			<integer>11</integer>
61
+		</dict>
62
+		<key>SDWebImage.xcscheme</key>
63
+		<dict>
64
+			<key>orderHint</key>
65
+			<integer>12</integer>
66
+		</dict>
67
+		<key>XHLaunchAd.xcscheme</key>
68
+		<dict>
69
+			<key>orderHint</key>
70
+			<integer>13</integer>
71
+		</dict>
72
+		<key>YYCategories.xcscheme</key>
73
+		<dict>
74
+			<key>orderHint</key>
75
+			<integer>14</integer>
76
+		</dict>
77
+		<key>YYModel.xcscheme</key>
78
+		<dict>
79
+			<key>orderHint</key>
80
+			<integer>15</integer>
81
+		</dict>
82
+	</dict>
83
+</dict>
84
+</plist>