1、添加判断是否设置过支付密码接口

2、添加跳转到设置支付密码页面页面

1、添加判断是否设置过支付密码接口
2、添加跳转到设置支付密码页面页面
王琳
1 parent edda399f
Showing 8 changed files with 115 additions and 16 deletions
.idea/gradle.xml
.idea/misc.xml
.idea/vcs.xml
README.md
app/build.gradle
app/src/main/java/com/cnlive/test/wjjpayutil/MainActivity.java
app/src/main/res/layout/activity_main.xml
build.gradle
@@ -3,11 +3,14 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
@@ -5,6 +5,30 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
 \ No newline at end of file
@@ -4,6 +4,14 @@
 版本更新说明
 ---------
 ----------------
+
+**`v1.0.4`**
+
+**增加功能**
+
+> 1.增加判断是否设置过支付密码接口
+
+
 **`v1.0.3`**
 **增加功能**
 apply plugin: 'com.android.application'
+apply plugin: 'com.alibaba.arouter'
 static def stringValue(def value) {
     return "\"${value}\""
@@ -14,6 +15,12 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName(), AROUTER_GENERATE_DOC: "enable"]
+            }
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -42,7 +49,11 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation "com.cnlive.libs:wjjpay:1.0.3"
+    implementation "com.cnlive.libs:wjjpay:1.0.4"
     implementation "com.cnlive.libs:base:1.0.7"
     implementation "com.cnlive:lib_network:1.0.12"
+
+    //ARouter
+    implementation 'com.alibaba:arouter-api:1.4.0'
+    annotationProcessor 'com.alibaba:arouter-compiler:1.2.1'
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.libs.wjjpay.pay.WjjPay;
 import com.cnlive.strike.BuildConfig;
@@ -28,6 +29,12 @@ public class MainActivity extends AppCompatActivity {
         commitPaymentOrder(this, "uid", "preId", "password");
         setPassword(this, "uid", "");
+
+        passwordExisting(this, "uid");
+
+        findViewById(R.id.setting).setOnClickListener(view -> settingPaySecret());
+
+        findViewById(R.id.modify).setOnClickListener(view -> modifyPaySecret());
     }
     /**
@@ -76,4 +83,41 @@ public class MainActivity extends AppCompatActivity {
                 .setSuccessCallback(data -> Log.e("DemoView", "成功"))
                 .start();
     }
+
+    /**
+     * 判断是设置 过支付密码
+     *
+     * @param context
+     * @param userId
+     */
+    public static void passwordExisting(Context context, String userId) {
+        WjjPay.passwordIsExisting(context, userId)
+                .setFailureCallback((i, s) -> {
+                    if (i == 402) {
+                        Log.e("DemoView 1", "没有设置支付密码");
+                    } else {
+                        Log.e("DemoView 1", s);
+                    }
+                })
+                .setSuccessCallback(groupBalanceInfoPayBaseInfo -> Log.e("DemoView 1", "成功"))
+                .start();
+    }
+
+    /**
+     * 跳转到第一次设置支付密码页面
+     */
+    public static void settingPaySecret() {
+        ARouter.getInstance().build("/paysecret/PaySecretActivity")
+                .withString("type", "set_pay_secret")//设置支付密码
+                .navigation();
+    }
+
+    /**
+     * 跳转到修改支付密码页面
+     */
+    public static void modifyPaySecret() {
+        ARouter.getInstance().build("/paysecret/PaySecretActivity")
+                .withString("type", "modify_pay_secret")//修改支付密码
+                .navigation();
+    }
 }
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    android:layout_height="match_parent">
-    <TextView
+    <Button
+        android:id="@+id/setting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_gravity="center_horizontal"
+        android:text="设置支付密码" />
-</android.support.constraint.ConstraintLayout>
 \ No newline at end of file
+
+    <Button
+        android:id="@+id/modify"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="修改支付密码" />
+</LinearLayout>
 \ No newline at end of file
@@ -11,6 +11,7 @@ buildscript {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        classpath "com.alibaba:arouter-register:1.0.2"
     }
 }