Merge pull request #2 from jpush/dev

ios完成功能

Author: skill20

example/ios/Flutter/Flutter.podspec

@@ -0,0 +1,18 @@
+#
+# NOTE: This podspec is NOT to be published. It is only used as a local source!
+#
+
+Pod::Spec.new do |s|
+  s.name             = 'Flutter'
+  s.version          = '1.0.0'
+  s.summary          = 'High-performance, high-fidelity mobile apps.'
+  s.description      = <<-DESC
+Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
+                       DESC
+  s.homepage         = 'https://flutter.io'
+  s.license          = { :type => 'MIT' }
+  s.author           = { 'Flutter Dev Team' => '[email protected]' }
+  s.source           = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
+  s.ios.deployment_target = '8.0'
+  s.vendored_frameworks = 'Flutter.framework'
+end

example/ios/Flutter/flutter_export_environment.sh

@@ -1,10 +1,11 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Applications/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/raoxudong/JPush/jpush-github/jverify-flutter-plugin/example"
-export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_ROOT=/Users/allan/Documents/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/allan/Documents/GitHub/jverify-flutter-plugin/example"
+export "FLUTTER_TARGET=/Users/allan/Documents/GitHub/jverify-flutter-plugin/example/lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
-export "FLUTTER_FRAMEWORK_DIR=/Applications/flutter/bin/cache/artifacts/engine/ios"
+export "FLUTTER_FRAMEWORK_DIR=/Users/allan/Documents/flutter/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
+export "TRACK_WIDGET_CREATION=true"

example/ios/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
   - Flutter (1.0.0)
   - JCore (2.1.8)
-  - JVerification (2.5.3):
-    - JCore (< 3.0.0, >= 1.2.6)
+  - JVerification (2.6.0):
+    - JCore (< 3.0.0, >= 2.1.6)
   - jverify (0.0.1):
     - Flutter
-    - JCore
-    - JVerification
+    - JCore (~> 2.1.6)
+    - JVerification (~> 2.6.0)
 
 DEPENDENCIES:
   - Flutter (from `.symlinks/flutter/ios`)
@@ -26,9 +26,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   JCore: a7f1dead960d77a97717c73ea8b0aa5b33706491
-  JVerification: 0d0b4474a250f19ef2bc45da7bd0d0e151350012
-  jverify: 39f3e355cdb0d7c03fd2f8497ea11b273339547f
+  JVerification: c2b96de0379b9e6f9ec2f91f2ba5fc9499ddc203
+  jverify: b7e7417c622468c2fcf7483c3a2bb82f1ef5a9b2
 
 PODFILE CHECKSUM: aff02bfeed411c636180d6812254b2daeea14d09
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.1

example/ios/Runner.xcodeproj/project.pbxproj

@@ -178,7 +178,7 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				000280B1279B4171F5DDD7DA /* [CP] Embed Pods Frameworks */,
+				D166C758B9692330C07C5D0D /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -240,24 +240,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		000280B1279B4171F5DDD7DA /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -308,6 +290,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		D166C758B9692330C07C5D0D /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -412,7 +412,7 @@
 					"$(PROJECT_DIR)/Flutter",
 					"$(PROJECT_DIR)/Runner",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.jiguang.xxx;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jiguang.verification;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = JVerificationDemo_dev;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -543,7 +543,7 @@
 					"$(PROJECT_DIR)/Flutter",
 					"$(PROJECT_DIR)/Runner",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.jiguang.xxx;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jiguang.verification;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = JVerificationDemo_dev;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -571,7 +571,7 @@
 					"$(PROJECT_DIR)/Flutter",
 					"$(PROJECT_DIR)/Runner",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.jiguang.xxx;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jiguang.verification;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = JVerificationDemo_dev;
 				VERSIONING_SYSTEM = "apple-generic";

example/ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleDisplayName</key>
+	<string></string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -45,6 +47,6 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<true/>
 </dict>
 </plist>

example/lib/main.dart

@@ -138,7 +138,19 @@ class _MyAppState extends State<MyApp> {
               width: double.infinity,
             ),
             margin: EdgeInsets.fromLTRB(40, 5, 40, 5),
-          )
+          ),
+          new Container(
+            child: SizedBox(
+              child: new CustomButton(
+                onPressed: () {
+                  getSMSCode();
+                },
+                title: "获取验证码",
+              ),
+              width: double.infinity,
+            ),
+            margin: EdgeInsets.fromLTRB(40, 5, 40, 5),
+          ),
         ],
         mainAxisAlignment: MainAxisAlignment.start,
       ),
@@ -200,15 +212,18 @@ class _MyAppState extends State<MyApp> {
     });
   }
   /// 获取短信验证码
-  void getSMSCode(String phoneNum,{String signId,String tempId}){
+  void getSMSCode(){
     setState(() {
       _loading = true;
     });
-
+    String phoneNum = controllerPHone.text;
+    if(phoneNum == null){
+    //TODO: 提示
+    }
     jverify.checkVerifyEnable().then((map) {
       bool result = map[f_result_key];
       if (result) {
-        jverify.getSMSCode(phoneNum,signId,tempId).then((map) {
+        jverify.getSMSCode(phoneNum: phoneNum).then((map) {
           print("获取短信验证码：${map.toString()}");
           int code = map[f_code_key];
           String message = map[f_msg_key];
@@ -231,7 +246,6 @@ class _MyAppState extends State<MyApp> {
     setState(() {
       _loading = true;
     });
-
     jverify.checkVerifyEnable().then((map) {
       bool result = map[f_result_key];
       if (result) {
@@ -258,7 +272,6 @@ class _MyAppState extends State<MyApp> {
     setState(() {
       _loading = true;
     });
-
     jverify.checkVerifyEnable().then((map) {
       bool result = map[f_result_key];
       if (result) {
@@ -282,7 +295,7 @@ class _MyAppState extends State<MyApp> {
         uiConfig.navReturnImgPath = "return_bg";//图片必须存在
 
         uiConfig.logoWidth = 100;
-        uiConfig.logoHeight = 100;
+        uiConfig.logoHeight = 80;
         //uiConfig.logoOffsetX = isiOS ? 0 : null;//(screenWidth/2 - uiConfig.logoWidth/2).toInt();
         uiConfig.logoOffsetY = 10;
         uiConfig.logoVerticalLayoutItem = JVIOSLayoutItem.ItemSuper;
@@ -301,6 +314,7 @@ class _MyAppState extends State<MyApp> {
         uiConfig.sloganVerticalLayoutItem = JVIOSLayoutItem.ItemNumber;
         uiConfig.sloganTextColor = Colors.black.value;
         uiConfig.sloganTextSize = 15;
+//        uiConfig.slogan
         //uiConfig.sloganHidden = 0;
 
         uiConfig.logBtnWidth = 220;
@@ -336,7 +350,8 @@ class _MyAppState extends State<MyApp> {
         uiConfig.privacyTextSize = 13;
         //uiConfig.privacyWithBookTitleMark = true;
         //uiConfig.privacyTextCenterGravity = false;
-
+        uiConfig.authStatusBarStyle =  JVIOSBarStyle.StatusBarStyleDarkContent;
+        uiConfig.privacyStatusBarStyle = JVIOSBarStyle.StatusBarStyleDefault;
 
         uiConfig.statusBarColorWithNav = true;
         uiConfig.virtualButtonTransparent = true;
@@ -508,4 +523,6 @@ class CustomButton extends StatelessWidget {
       padding: EdgeInsets.fromLTRB(10, 5, 10, 5),
     );
   }
-}
+}
+
+