ACSION.xcodeproj/project.pbxproj

@@ -36,6 +36,15 @@
 		492D33092270462A007EE8E9 /* ASOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 492D33082270462A007EE8E9 /* ASOrderModel.m */; };
 		C09669A8CB4ED2080074CBBD /* libPods-ACSION.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 56C595EB87A74D62D45FA078 /* libPods-ACSION.a */; };
 		E113FD702270154000886A71 /* NSObject+ASToDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = E113FD6F2270154000886A71 /* NSObject+ASToDictionary.m */; };
+		E113FD742270308200886A71 /* libMiPushSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD732270308200886A71 /* libMiPushSDK.a */; };
+		E113FD762270468C00886A71 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD752270468B00886A71 /* UserNotifications.framework */; };
+		E113FD78227046AC00886A71 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD77227046AC00886A71 /* SystemConfiguration.framework */; };
+		E113FD7A227046BA00886A71 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD79227046BA00886A71 /* MobileCoreServices.framework */; };
+		E113FD7C227046C400886A71 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD7B227046C400886A71 /* CFNetwork.framework */; };
+		E113FD7E227046D000886A71 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD7D227046D000886A71 /* CoreTelephony.framework */; };
+		E113FD80227046D900886A71 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD7F227046D900886A71 /* libz.tbd */; };
+		E113FD82227046E200886A71 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD81227046E200886A71 /* libxml2.tbd */; };
+		E113FD84227046EE00886A71 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E113FD83227046EE00886A71 /* libresolv.tbd */; };
 		E13E389A226D89DA00792451 /* ASHomeViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E13E3899226D89DA00792451 /* ASHomeViewModel.m */; };
 		E13E389E226D95CF00792451 /* ASHomeLoanTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E13E389D226D95CF00792451 /* ASHomeLoanTableViewCell.m */; };
 		E13E38A1226D962A00792451 /* ASHomeAnnounceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E13E38A0226D962A00792451 /* ASHomeAnnounceTableViewCell.m */; };
@@ -128,6 +137,16 @@
 		5A1FFFC5DC9C674CA851D087 /* Pods-ACSION.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ACSION.release.xcconfig"; path = "Target Support Files/Pods-ACSION/Pods-ACSION.release.xcconfig"; sourceTree = "<group>"; };
 		E113FD6E2270154000886A71 /* NSObject+ASToDictionary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+ASToDictionary.h"; sourceTree = "<group>"; };
 		E113FD6F2270154000886A71 /* NSObject+ASToDictionary.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSObject+ASToDictionary.m"; sourceTree = "<group>"; };
+		E113FD722270308000886A71 /* MiPushSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MiPushSDK.h; sourceTree = "<group>"; };
+		E113FD732270308200886A71 /* libMiPushSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMiPushSDK.a; sourceTree = "<group>"; };
+		E113FD752270468B00886A71 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
+		E113FD77227046AC00886A71 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		E113FD79227046BA00886A71 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+		E113FD7B227046C400886A71 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+		E113FD7D227046D000886A71 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
+		E113FD7F227046D900886A71 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		E113FD81227046E200886A71 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; };
+		E113FD83227046EE00886A71 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
 		E13E3898226D89DA00792451 /* ASHomeViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASHomeViewModel.h; sourceTree = "<group>"; };
 		E13E3899226D89DA00792451 /* ASHomeViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASHomeViewModel.m; sourceTree = "<group>"; };
 		E13E389C226D95CF00792451 /* ASHomeLoanTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASHomeLoanTableViewCell.h; sourceTree = "<group>"; };
@@ -202,6 +221,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E113FD84227046EE00886A71 /* libresolv.tbd in Frameworks */,
+				E113FD82227046E200886A71 /* libxml2.tbd in Frameworks */,
+				E113FD80227046D900886A71 /* libz.tbd in Frameworks */,
+				E113FD7E227046D000886A71 /* CoreTelephony.framework in Frameworks */,
+				E113FD7C227046C400886A71 /* CFNetwork.framework in Frameworks */,
+				E113FD7A227046BA00886A71 /* MobileCoreServices.framework in Frameworks */,
+				E113FD78227046AC00886A71 /* SystemConfiguration.framework in Frameworks */,
+				E113FD762270468C00886A71 /* UserNotifications.framework in Frameworks */,
+				E113FD742270308200886A71 /* libMiPushSDK.a in Frameworks */,
 				C09669A8CB4ED2080074CBBD /* libPods-ACSION.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -212,6 +240,14 @@
 		469AE2F8DD2A387478EABBF9 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				E113FD83227046EE00886A71 /* libresolv.tbd */,
+				E113FD81227046E200886A71 /* libxml2.tbd */,
+				E113FD7F227046D900886A71 /* libz.tbd */,
+				E113FD7D227046D000886A71 /* CoreTelephony.framework */,
+				E113FD7B227046C400886A71 /* CFNetwork.framework */,
+				E113FD79227046BA00886A71 /* MobileCoreServices.framework */,
+				E113FD77227046AC00886A71 /* SystemConfiguration.framework */,
+				E113FD752270468B00886A71 /* UserNotifications.framework */,
 				56C595EB87A74D62D45FA078 /* libPods-ACSION.a */,
 			);
 			name = Frameworks;
@@ -372,6 +408,15 @@
 			path = Pods;
 			sourceTree = "<group>";
 		};
+		E113FD712270306700886A71 /* MI */ = {
+			isa = PBXGroup;
+			children = (
+				E113FD732270308200886A71 /* libMiPushSDK.a */,
+				E113FD722270308000886A71 /* MiPushSDK.h */,
+			);
+			path = MI;
+			sourceTree = "<group>";
+		};
 		E13E3897226D89C600792451 /* VM */ = {
 			isa = PBXGroup;
 			children = (
@@ -458,6 +503,7 @@
 		E14DE48D226D5B9D00B092CB /* Vendor */ = {
 			isa = PBXGroup;
 			children = (
+				E113FD712270306700886A71 /* MI */,
 			);
 			path = Vendor;
 			sourceTree = "<group>";
@@ -922,6 +968,7 @@
 			baseConfigurationReference = F91CB69C2B2FD829CC5349D7 /* Pods-ACSION.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_STYLE = Automatic;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/ACSION/ACSIONPrefixHeader.pch";
 				INFOPLIST_FILE = ACSION/Info.plist;
@@ -930,6 +977,10 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/ACSION/Vendor/MI",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.acsion.ACSION;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -941,6 +992,7 @@
 			baseConfigurationReference = 5A1FFFC5DC9C674CA851D087 /* Pods-ACSION.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_STYLE = Automatic;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/ACSION/ACSIONPrefixHeader.pch";
 				INFOPLIST_FILE = ACSION/Info.plist;
@@ -949,6 +1001,10 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/ACSION/Vendor/MI",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.acsion.ACSION;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";

ACSION/ACSIONHeader.h

@@ -9,8 +9,12 @@
 #ifndef ACSIONHeader_h
 #define ACSIONHeader_h
 
+<<<<<<< HEAD
+#define UMAPP_KEY       @"5cc003ab0cafb2f18d000033`"
+=======
 #define UMAPP_KEY       @""
 
+>>>>>>> bb11a83aa1d48b8f8f95e6cad6b50a000297b206
 #define CHANNEL_ID      @"20154"
 #define kRegularFont    @"PingFangSC-Regular"
 #define kMediumFont     @"PingFangSC-Medium"

ACSION/ACSIONPrefixHeader.pch

@@ -20,6 +20,7 @@
 #import "ASHttpTool.h"
 #import "XHToast.h"
 #import "NSObject+ASToDictionary.h"
+#import "MiPushSDK.h"
 
 #import <AFNetworking.h>
 #import <SDWebImage.h>

ACSION/AppDelegate.m

@@ -8,8 +8,9 @@
 
 #import "AppDelegate.h"
 #import "ASTabViewController.h"
+#import "MiPushSDK.h"
 
-@interface AppDelegate ()
+@interface AppDelegate () <MiPushSDKDelegate,UNUserNotificationCenterDelegate>
 
 @end
 
@@ -18,10 +19,43 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
+    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
+    [self regMI:launchOptions];
+    [self regUM];
     [self regRootController];
     return YES;
 }
 
+- (void)regMI:(NSDictionary *)launchOptions {
+    if (@available(iOS 10.0, *)) {
+        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+        [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert|UNAuthorizationOptionBadge|UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
+            if (granted) {
+                [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+                    
+                }];
+            }
+        }];
+        center.delegate = self;
+        [MiPushSDK registerMiPush:self type:0 connect:YES];
+    } else {
+        [MiPushSDK registerMiPush:self type:0 connect:YES];
+    }
+    NSDictionary *dic = [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+    if (dic) {
+        NSString *idStr = [dic objectForKey:@"_id_"];
+        if (idStr) {
+            [MiPushSDK openAppNotify:idStr];
+        }
+    }
+}
+
+- (void)regUM {
+    UMConfigInstance.appKey = UMAPP_KEY;
+    UMConfigInstance.channelId = @"App Store";
+    [MobClick startWithConfigure:UMConfigInstance];
+}
+
 
 - (void)regRootController {
     _window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
@@ -31,6 +65,53 @@
 }
 
 
+- (void)miPushRequestSuccWithSelector:(NSString *)selector data:(NSDictionary *)data {
+    
+}
+
+- (void)miPushRequestErrWithSelector:(NSString *)selector error:(int)error data:(NSDictionary *)data {
+    
+}
+
+
+- (void)miPushReceiveNotification:(NSDictionary *)data {
+    
+}
+
+
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
+    [MiPushSDK handleReceiveRemoteNotification:userInfo];
+}
+
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler  API_AVAILABLE(ios(10.0)){
+    NSDictionary *dic = notification.request.content.userInfo;
+    if ([notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
+        [MiPushSDK handleReceiveRemoteNotification:dic];
+    }
+    completionHandler(UNNotificationPresentationOptionAlert);
+}
+
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler  API_AVAILABLE(ios(10.0)){
+    NSDictionary *dic = response.notification.request.content.userInfo;
+    if ([response.notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
+        [MiPushSDK handleReceiveRemoteNotification:dic];
+    }
+    completionHandler();
+}
+
+
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+    [MiPushSDK bindDeviceToken:deviceToken];
+}
+
+
+- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
+    
+}
+
+
 - (void)applicationWillResignActive:(UIApplication *)application {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
     // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.

ACSION/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,93 +1,57 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "20@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "20@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "29@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "29@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "40@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "40@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "60@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "60@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "1024.png",
       "scale" : "1x"
     }
   ],

ACSION/Assets.xcassets/Home/register_agree.imageset/Contents.json

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

ACSION/Assets.xcassets/Home/register_agree_selected.imageset/Contents.json

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

ACSION/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -0,0 +1,92 @@
+{
+  "images" : [
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2688h",
+      "filename" : "1242.png",
+      "minimum-system-version" : "12.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "1792h",
+      "filename" : "828.png",
+      "minimum-system-version" : "12.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2436h",
+      "filename" : "1125.png",
+      "minimum-system-version" : "11.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "1242-1.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "667h",
+      "filename" : "750.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "640 copy-1.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "filename" : "640-1.png",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "320.png",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "640 copy.png",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "640.png",
+      "extent" : "full-screen",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ACSION/Info.plist

@@ -41,5 +41,11 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+    <key>MiSDKAppID</key>
+    <string>2882303761517605865</string>
+    <key>MiSDKAppKey</key>
+    <string>5181760590865</string>
+    <key>MiSDKRun</key>
+    <string>${MiSDKRun}</string>
 </dict>
 </plist>

ACSION/Main/Module/Home/V/ASApplyBigInputTableViewCell.m

@@ -81,7 +81,13 @@
 }
 
 - (void)textStopEditing {
-    if (self.inputTextField.text.floatValue > 0 && self.inputTextField.text.floatValue < 10001) {
+    if (self.inputTextField.text.floatValue > 10000) {
+        self.inputTextField.text = @"10000";
+        [SVProgressHUD showErrorWithStatus:@"最多可借10000元"];
+    } else if (self.inputTextField.text.floatValue < 100) {
+        self.inputTextField.text = @"100";
+        [SVProgressHUD showErrorWithStatus:@"最少可借100元"];
+    } else if (self.inputTextField.text.floatValue >= 100 && self.inputTextField.text.floatValue <= 10000) {
         if ([self.delegate respondsToSelector:@selector(asApplyBigInputTableViewCell:item:)]) {
             [self.delegate asApplyBigInputTableViewCell:self item:self.inputTextField.text];
         }

ACSION/Main/Module/User/C/ASRegisterViewController.m

@@ -17,6 +17,10 @@ static NSString * const kLoginInputCell = @"ASLoginInputTableViewCell";
 @property(nonatomic, strong) ASUserViewModel *userViewModel;
 @end
 
+static NSInteger const kAgreeTag = 100;
+static NSInteger const kRegisterTag = 101;
+static NSInteger const kHtmlTag = 102;
+
 @implementation ASRegisterViewController
 
 #pragma mark - Life Cycle Methods
@@ -68,6 +72,7 @@ static NSString * const kLoginInputCell = @"ASLoginInputTableViewCell";
     [self.view addSubview:_mainView];
     
     UIButton *nextBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    nextBtn.tag = kRegisterTag;
     nextBtn.backgroundColor = [UIColor baseColor];
     nextBtn.layer.cornerRadius = 20;
     nextBtn.titleLabel.font = [UIFont fontWithName:kMediumFont size:15];
@@ -81,6 +86,32 @@ static NSString * const kLoginInputCell = @"ASLoginInputTableViewCell";
         make.size.mas_equalTo(CGSizeMake(194, 40));
     }];
     
+    UIButton *htmlBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    htmlBtn.tag = kHtmlTag;
+    NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc] initWithString:@"同意《用户注册协议》"];
+    [attStr addAttributes:@{NSFontAttributeName:[UIFont fontWithName:kRegularFont size:12],NSForegroundColorAttributeName:[UIColor colorWithRGB:0x878787]} range:NSMakeRange(0, 2)];
+    [attStr addAttributes:@{NSFontAttributeName:[UIFont fontWithName:kRegularFont size:12],NSForegroundColorAttributeName:[UIColor colorWithRGB:0x3B86FC]} range:NSMakeRange(2, 8)];
+    [htmlBtn setAttributedTitle:attStr forState:UIControlStateNormal];
+    [htmlBtn addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:htmlBtn];
+    [htmlBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(0);
+        make.bottom.mas_equalTo(-kSafeBottomHeight-10);
+        make.size.mas_equalTo(CGSizeMake(130, 17));
+    }];
+    
+    UIButton *agreeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    agreeBtn.tag = kAgreeTag;
+    [agreeBtn setImage:[UIImage imageNamed:@"register_agree"] forState:UIControlStateNormal];
+    [agreeBtn setImage:[UIImage imageNamed:@"register_agree_selected"] forState:UIControlStateSelected];
+    agreeBtn.selected = YES;
+    [agreeBtn addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:agreeBtn];
+    [agreeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(htmlBtn);
+        make.right.mas_equalTo(htmlBtn.mas_left).offset(-4);
+    }];
+    
     __weak __typeof(self)weakSelf = self;
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
         [weakSelf.view endEditing:YES];
@@ -122,6 +153,7 @@ static NSString * const kLoginInputCell = @"ASLoginInputTableViewCell";
             [[NSUserDefaults standardUserDefaults] setObject:dic[@"id"] forKey:USER_ID];
             [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:@"ISPOP"];
             [[NSUserDefaults standardUserDefaults] synchronize];
+            [MiPushSDK setAccount:dic[@"user_token"]];
             [self.navigationController popToRootViewControllerAnimated:YES];
         } failure:^(NSError *error) {
             
@@ -196,8 +228,21 @@ static NSString * const kLoginInputCell = @"ASLoginInputTableViewCell";
 
 - (void)buttonAction:(UIButton *)sender {
     [self.view endEditing:YES];
-    if ([self.userViewModel checkRegisterOfUserViewModel]) {
-        [self requestRegister];
+    if (sender.tag == kRegisterTag) {
+        UIButton *btn = [self.view viewWithTag:kAgreeTag];
+        if (btn.isSelected) {
+            if ([self.userViewModel checkRegisterOfUserViewModel]) {
+                [self requestRegister];
+            }
+        } else {
+            [SVProgressHUD showErrorWithStatus:@"请勾选用户注册协议"];
+        }
+    } else if (sender.tag == kHtmlTag) {
+        NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
+        NSString *appName = [infoDict objectForKey:@"CFBundleDisplayName"];
+        NSString *urlStr = [NSString stringWithFormat:@"https://x.zhuadd.com/protocol.html?appName=%@",appName];
+    } else if (sender.tag == kAgreeTag) {
+        sender.selected = !sender.isSelected;
     }
 }
 

ACSION/Main/Module/User/C/ASUserLoginViewController.m

@@ -141,6 +141,7 @@ static NSInteger const kRegisterTag = 101;
         [[NSUserDefaults standardUserDefaults] setObject:dic[@"id"] forKey:USER_ID];
         [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:@"ISPOP"];
         [[NSUserDefaults standardUserDefaults] synchronize];
+        [MiPushSDK setAccount:dic[@"user_token"]];
         [self.navigationController popViewControllerAnimated:YES];
     } failure:^(NSError *error) {
         
@@ -158,6 +159,7 @@ static NSInteger const kRegisterTag = 101;
         [[NSUserDefaults standardUserDefaults] setObject:dic[@"id"] forKey:USER_ID];
         [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:@"ISPOP"];
         [[NSUserDefaults standardUserDefaults] synchronize];
+        [MiPushSDK setAccount:dic[@"user_token"]];
         [self.navigationController popViewControllerAnimated:YES];
     } failure:^(NSError *error) {
         

ACSION/Main/Module/User/V/ASLoginInputTableViewCell.m

@@ -112,7 +112,7 @@ NSString *const kCellSendCode = @"CellSendCode";
             }
             if (indexPath.row == 2) {
                 self.sendBtn.hidden = NO;
-                    _timer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(updateTime) userInfo:nil repeats:YES];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(startTime) name:kCellSendCode object:nil];
             }
             NSDictionary *dic = [viewModel registerParamsOfUserViewModel];
             NSDictionary *dict = [dic objectForKey:[NSString stringWithFormat:@"%ld",indexPath.row]];

ACSION/Vendor/MI/MiPushSDK.h

@@ -0,0 +1,177 @@
+//
+//  MiPushSDK.h
+//  MiPushSDK
+//
+//  Created by shen yang on 14-3-6.
+//  Copyright (c) 2014年 Xiaomi. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <UserNotifications/UserNotifications.h>
+
+@protocol MiPushSDKDelegate <NSObject>
+
+@optional
+
+/**
+ * MiPushSDK 请求结果回调
+ *
+ * MiPushSDK的所有请求的为异步操作, 用户需监听此方法.
+ *
+ * @param
+ *     selector: 请求的方法
+ *     data: 返回结果字典
+ */
+- (void)miPushRequestSuccWithSelector:(NSString *)selector data:(NSDictionary *)data;
+- (void)miPushRequestErrWithSelector:(NSString *)selector error:(int)error data:(NSDictionary *)data;
+
+
+/**
+ * 启用长连接后, 当收到消息是就会回调此方法
+ *
+ * @param
+ *     type: 消息类型
+ *     data: 返回结果字典, 跟apns的消息格式一样
+ */
+- (void)miPushReceiveNotification:(NSDictionary*)data;
+
+@end
+
+@interface MiPushSDK : NSObject
+
+/**
+ * 客户端注册设备
+ * @param 
+ *      delegate: 回调函数
+ *      type: apns推送类型. (Badge, Alert, Sound)
+ *      connect: 是否启动长连接, 它跟APNSs是不同的通道(不管是否启动系统推送, app在前台都可以收到在线或离线消息)
+ */
++ (void)registerMiPush:(id<MiPushSDKDelegate, UNUserNotificationCenterDelegate>)delegate;
++ (void)registerMiPush:(id<MiPushSDKDelegate, UNUserNotificationCenterDelegate>)delegate type:(UIRemoteNotificationType)type;
++ (void)registerMiPush:(id<MiPushSDKDelegate, UNUserNotificationCenterDelegate>)delegate type:(UIRemoteNotificationType)type connect:(BOOL)connect;
+
+/**
+ * 客户端设备注销
+ */
++ (void)unregisterMiPush;
+
+
+/**
+ * 绑定 PushDeviceToken
+ *
+ * NOTE: 有时Apple会重新分配token, 所以为保证消息可达,
+ * 必须在系统application:didRegisterForRemoteNotificationsWithDeviceToken:回调中,
+ * 重复调用此方法. SDK内部会处理是否重新上传服务器.
+ *
+ * @param 
+ *     deviceToken: AppDelegate中,PUSH注册成功后,
+ *                  系统回调didRegisterForRemoteNotificationsWithDeviceToken
+ */
++ (void)bindDeviceToken:(NSData *)deviceToken;
+
+/**
+ * 当同时启动APNs与内部长连接时, 把两处收到的消息合并. 通过miPushReceiveNotification返回
+ */
++ (void)handleReceiveRemoteNotification:(NSDictionary*)userInfo;
+
+/**
+ * 客户端设置别名
+ *
+ * @param
+ *     alias: 别名 (length:128)
+ */
++ (void)setAlias:(NSString *)alias;
+
+/**
+ * 客户端取消别名
+ *
+ * @param
+ *     alias: 别名 (length:128)
+ */
++ (void)unsetAlias:(NSString *)alias;
+
+
+/**
+ * 客户端设置帐号
+ * 多设备设置同一个帐号, 发送消息时多设备可以同时收到
+ *
+ * @param
+ *     account: 帐号 (length:128)
+ */
++ (void)setAccount:(NSString *)account;
+
+/**
+ * 客户端取消帐号
+ *
+ * @param
+ *     account: 帐号 (length:128)
+ */
++ (void)unsetAccount:(NSString *)account;
+
+
+/**
+ * 客户端设置主题
+ * 支持同时设置多个topic, 中间使用","分隔
+ *
+ * @param
+ *     subscribe: 主题类型描述
+ */
++ (void)subscribe:(NSString *)topics;
+
+/**
+ * 客户端取消主题
+ * 支持同时设置多个topic, 中间使用","分隔
+ *
+ * @param
+ *     subscribe: 主题类型描述
+ */
++ (void)unsubscribe:(NSString *)topics;
+
+
+/**
+ * 统计客户端 通过push开启app行为
+ * 如果, 你想使用服务器帮你统计你app的点击率请自行调用此方法
+ * 方法放到:application:didReceiveRemoteNotification:回调中.
+ * @param 
+ *      messageId:Payload里面对应的miid参数
+ */
++ (void)openAppNotify:(NSString *)messageId;
+
+
+/**
+ * NOTE 废弃. 请使用getAllAliasAsync替换
+ * 获取客户端所有设置的别名
+ */
++ (NSArray*)getAllAlias __deprecated;
+
+/**
+ * 获取客户端所有设置的别名
+ */
++ (void)getAllAliasAsync;
+
+/**
+ * NOTE 废弃. 请使用getAllTopicAsync替换
+ * 获取客户端所有订阅的主题
+ */
++ (NSArray*)getAllTopic __deprecated;
+
+/**
+ * 获取客户端所有订阅的主题
+ */
++ (void)getAllTopicAsync;
+
++ (void)getAllAccountAsync;
+
+
+/**
+ * 获取SDK版本号
+ */
++ (NSString*)getSDKVersion;
+
+/**
+ * 获取RegId
+ * 如果没有RegId返回nil
+ */
++ (NSString*)getRegId;
+@end