💦 improve plugin logic and demo

fluttercandies · Jan 10, 2023 · 986f1ab · 986f1ab
1 parent 705abb2
commit 986f1ab
Show file tree

Hide file tree

Showing 6 changed files with 380 additions and 375 deletions.
diff --git a/android/src/main/java/com/fluttercandies/flutter_ali_auth/AuthClient.java b/android/src/main/java/com/fluttercandies/flutter_ali_auth/AuthClient.java
@@ -57,10 +57,10 @@ private AuthClient() {
 
     }
 
-    public static AuthClient getInstance(){
-        if (instance == null){
-            synchronized (AuthClient.class){
-                if (instance  == null){
+    public static AuthClient getInstance() {
+        if (instance == null) {
+            synchronized (AuthClient.class) {
+                if (instance == null) {
                     instance = new AuthClient();
                 }
             }
@@ -81,15 +81,17 @@ public void initSdk(Object arguments) {
             eventSink.success(authResponseModel.toJson());
             return;
         }
+
         tokenResultListener = new TokenResultListener() {
             @Override
             public void onTokenSuccess(String s) {
                 TokenRet tokenRet;
                 try {
                     tokenRet = TokenRet.fromJson(s);
-                     if(ResultCode.CODE_ERROR_ENV_CHECK_SUCCESS.equals(tokenRet.getCode())){
-                         //终端支持认证 当前环境可以进行一键登录 并且加速拉起授权页面
-                         accelerateLoginPage();
+
+                    if (ResultCode.CODE_ERROR_ENV_CHECK_SUCCESS.equals(tokenRet.getCode())) {
+                        //终端支持认证 当前环境可以进行一键登录 并且加速拉起授权页面
+                        accelerateLoginPage();
                     }
                     AuthResponseModel authResponseModel = AuthResponseModel.fromTokenRect(tokenRet);
                     eventSink.success(authResponseModel.toJson());
@@ -118,6 +120,7 @@ public void onTokenFailed(String s) {
         Context context = mActivity.get().getBaseContext();
         mAuthHelper = PhoneNumberAuthHelper.getInstance(context, tokenResultListener);
         mAuthHelper.getReporter().setLoggerEnable(authModel.getEnableLog());
+        ///开始初始化
         mAuthHelper.setAuthSDKInfo(authModel.getAndroidSdk());
         checkEnv();
     }
@@ -133,7 +136,6 @@ public void checkEnv() {
      * 在不是一进app就需要登录的场景 建议调用此接口 加速拉起一键登录页面
      * 等到用户点击登录的时候 授权页可以秒拉
      * 预取号的成功与否不影响一键登录功能，所以不需要等待预取号的返回。
-     *
      */
     public void accelerateLoginPage() {
         if (Objects.isNull(mAuthHelper) || !sdkAvailable) {
@@ -180,7 +182,7 @@ public void getLoginToken() {
         }
         Activity activity = mActivity.get();
         Context context = activity.getBaseContext();
-        baseUIConfig = BaseUIConfig.init(authModel.getAuthUIStyle(), activity, mAuthHelper, eventSink,flutterPluginBinding.getFlutterAssets());
+        baseUIConfig = BaseUIConfig.init(authModel.getAuthUIStyle(), activity, mAuthHelper, eventSink, flutterPluginBinding.getFlutterAssets());
         assert baseUIConfig != null;
         clearCached();
         baseUIConfig.configAuthPage(authModel.getAuthUIModel());
@@ -228,6 +230,7 @@ public void onTokenFailed(String s) {
         Intent intent = new Intent(context, DecoyMaskActivity.class);
         activity.startActivity(intent);
     }
+
     public void getLoginToken(Object arguments) {
         if (Objects.isNull(mAuthHelper) || !sdkAvailable) {
             AuthResponseModel authResponseModel = AuthResponseModel.initFailed(initFailedMsg);
@@ -238,11 +241,12 @@ public void getLoginToken(Object arguments) {
         Context context = activity.getBaseContext();
         try {
             authModel = AuthModel.Builder(arguments);
+            Log.i(TAG, authModel.toString());
         } catch (Exception e) {
             AuthResponseModel authResponseModel = AuthResponseModel.initFailed(errorArgumentsMsg);
             eventSink.success(authResponseModel.toJson());
         }
-        baseUIConfig = BaseUIConfig.init(authModel.getAuthUIStyle(), activity, mAuthHelper, eventSink,flutterPluginBinding.getFlutterAssets());
+        baseUIConfig = BaseUIConfig.init(authModel.getAuthUIStyle(), activity, mAuthHelper, eventSink, flutterPluginBinding.getFlutterAssets());
         assert baseUIConfig != null;
         clearCached();
         baseUIConfig.configAuthPage(authModel.getAuthUIModel());
@@ -300,15 +304,15 @@ public void onTokenFailed(String s) {
      * 关闭授权页loading
      * SDK完成回调之后不会关闭loading，需要开发者主动调用hideLoginLoading关闭loading
      */
-    public void hideLoginLoading(){
+    public void hideLoginLoading() {
         mAuthHelper.hideLoginLoading();
     }
 
     /**
      * 退出授权认证页
      * SDK完成回调之后不会关闭授权页，需要开发者主动调⽤quitLoginPage退出授权页
      */
-    public void quitLoginPage(){
+    public void quitLoginPage() {
         mAuthHelper.quitLoginPage();
     }
 

diff --git a/android/src/main/java/com/fluttercandies/flutter_ali_auth/FlutterAliAuthPlugin.java b/android/src/main/java/com/fluttercandies/flutter_ali_auth/FlutterAliAuthPlugin.java
@@ -61,6 +61,7 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
 
     @Override
     public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
+        Log.i(TAG,call.method);
         if (call.method.equals("getPlatformVersion")) {
             result.success("Android " + android.os.Build.VERSION.RELEASE);
             return;
@@ -72,12 +73,15 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
                 authClient.getEventSink().endOfStream();
             }
             result.success(null);
+            return;
         } else if (call.method.equals("hideLoginLoading")) {
             authClient.hideLoginLoading();
             result.success(null);
+            return;
         } else if (call.method.equals("quitLoginPage")) {
             authClient.quitLoginPage();
             result.success(null);
+            return;
         }
         if (Objects.isNull(authClient.getEventSink())) {
             AuthResponseModel authResponseModel = AuthResponseModel.initFailed(failedListeningMsg);