update to 1.3.2

Author: CodeGather

CHANGELOG-zh.md

@@ -1,5 +1,16 @@
 #  
 
+## 1.3.2
+* 更新android sdk 为 2.14.7
+* 更新ios sdk 为 2.14.6
+* 更新web sdk 为 2.1.12
+* 添加方法：queryCheckBoxIsChecked
+* 添加Android字段：fullScreen
+* 添加Android字段：authPageUseDayLight
+* 添加Android字段：keepAllPageHideNavigationBar
+* 添加Android字段：closeAuthPageReturnBack
+
+
 ## 1.3.1
 * 更新android sdk 为 2.14.5
 * 更新ios sdk 为 2.14.5

CHANGELOG.md

@@ -1,5 +1,15 @@
 #  
 
+## 1.3.2
+* Update Android SDK to 2.14.7
+* Update iOS SDK to 2.14.6
+* Update Web SDK to 2.1.12
+* Add method：queryCheckBoxIsChecked
+* Android fields：fullScreen
+* Android fields：authPageUseDayLight
+* Android fields：keepAllPageHideNavigationBar
+* Android fields：closeAuthPageReturnBack
+
 ## 1.3.1
 * Update Android SDK to 2.14.5
 * Update iOS SDK to 2.14.5

android/build-clone.gradle

@@ -0,0 +1,95 @@
+apply plugin: 'com.android.library'
+group 'com.sean.rao.ali_auth'
+version '1.3.1'
+
+buildscript {
+    repositories {
+        mavenLocal()
+//        google()
+//        jcenter()
+        // JitPack 远程仓库：https://jitpack.io
+        maven { url 'https://jitpack.io' }
+        maven { url 'https://download.flutter.io'}
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.1.3'
+    }
+}
+
+rootProject.allprojects {
+    repositories {
+        mavenLocal()
+//        google()
+//        jcenter()
+        // JitPack 远程仓库：https://jitpack.io
+        maven { url 'https://jitpack.io' }
+        maven { url 'https://download.flutter.io'}
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+    }
+}
+
+android {
+    if (project.android.hasProperty("namespace")) {
+        namespace = "com.sean.rao.ali_auth"
+    }
+
+    compileSdkVersion 34
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
+
+    defaultConfig {
+        minSdkVersion 21
+    }
+
+    aaptOptions {
+        noCompress "mov"  //表示不让aapt压缩的文件后缀
+    }
+
+    buildTypes {
+        release {
+            debuggable false
+            // minifyEnabled true
+            proguardFile file('proguard-rules.pro')
+            zipAlignEnabled false
+            multiDexEnabled true
+        }
+
+        debug {
+            // minifyEnabled false
+            zipAlignEnabled false
+            multiDexEnabled true
+        }
+    }
+
+    dependencies {
+        implementation "androidx.appcompat:appcompat:1.7.1"
+
+        // 兼容安卓版本的fastjson库
+        implementation 'com.alibaba.fastjson2:fastjson2:2.0.51.android5'
+        //    implementation 'com.google.code.gson:gson:2.10.1'
+        //    implementation 'com.alibaba:fastjson:1.2.83'
+
+        implementation files("libs/auth_number_product-${authLibVersion}-release.aar")
+        implementation files("libs/logger-${loggerVersion}-release.aar")
+        implementation files("libs/main-${mainVersion}-release.aar")
+
+        // 吐司框架：https://github.com/getActivity/Toaster
+        implementation 'com.github.getActivity:Toaster:12.2'
+
+        // uc的crash收集库，客户可自行选择是否需要集成
+        // implementation 'com.ucweb.wpk:crashsdk:3.2.2.2'
+    }
+}

android/gradle.properties

@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 android.injected.testOnly=false
 
-authLibVersion=2.14.5
+authLibVersion=2.14.7
 loggerVersion=2.2.2
 mainVersion=2.2.3

android/libs/auth_number_product-2.14.5-release.aar

@@ -177,6 +177,10 @@ public IToast createToast(IToastStyle<?> style) {
       case "checkEnvAvailable":
         oneKeyLoginPublic.checkEnvAvailable(2);
         break;
+      case "queryCheckBoxIsChecked":
+        boolean status = oneKeyLoginPublic.queryCheckBoxIsChecked();
+        result.success(status);
+        break;
       case "checkCellularDataEnable":
         isNetEnabled(mContext, result);
         break;
@@ -304,7 +308,6 @@ public void isNetEnabled(Context context, @NonNull Result result) {
   }
 
   // 注册回调
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   private void registerNetworkCallback(Context context) {
     ConnectivityManager cm = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
     NetworkRequest.Builder builder = new NetworkRequest.Builder();
@@ -314,7 +317,6 @@ private void registerNetworkCallback(Context context) {
   }
 
   // 注销回调
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   private void unregisterNetworkCallback(Context context) {
     ConnectivityManager cm = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
     cm.unregisterNetworkCallback(callback);
@@ -329,7 +331,7 @@ private void unregisterNetworkCallback(Context context) {
   public boolean isNetContected(Context context) {
     ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
     NetworkInfo info = cm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-    if (cm != null && info != null && info.isConnected()) {
+    if (info != null && info.isConnected()) {
       Log.i(TAG, "移动网络连接成功");
       return true;
     }

android/libs/auth_number_product-2.14.7-release.aar

@@ -44,12 +44,10 @@ public void onClick(String code, Context context, String jsonString) {
       //点击授权页默认样式的返回按钮
       case ResultCode.CODE_ERROR_USER_CANCEL:
         Log.e(TAG, "点击了授权页默认返回按钮");
-        mAuthHelper.quitLoginPage();
         break;
       //点击授权页默认样式的切换其他登录方式 会关闭授权页
       //如果不希望关闭授权页那就setSwitchAccHidden(true)隐藏默认的  通过自定义view添加自己的
       case ResultCode.CODE_ERROR_USER_SWITCH:
-        mAuthHelper.quitLoginPage();
         Log.e(TAG, "点击了授权页默认切换其他登录方式");
         break;
       //点击一键登录按钮会发出此回调

android/src/main/java/com/sean/rao/ali_auth/AliAuthPlugin.java

@@ -69,9 +69,6 @@ public void onTokenSuccess(String s) {
                     if (ResultCode.CODE_SUCCESS.equals(tokenRet.getCode())) {
                         Log.i("TAG", "获取token成功：" + s);
                         mAuthHelper.setAuthListener(null);
-                        if (jsonObject.getBooleanValue("autoQuitPage")) {
-                            mAuthHelper.quitLoginPage();
-                        }
                     }
                     showResult(tokenRet.getCode(), null, tokenRet.getToken());
                 } catch (Exception e) {
@@ -100,7 +97,22 @@ public void onTokenFailed(String s) {
         mAuthHelper.getReporter().setLoggerEnable(jsonObject.getBooleanValue("isDebug"));
         mAuthHelper.setAuthSDKInfo(jsonObject.getString("androidSk"));
 
+        // 授权页是否跟随系统深色模式
+        mAuthHelper.setAuthPageUseDayLight(jsonObject.getBooleanValue("authPageUseDayLight", false));
+        // 横屏水滴屏全屏适配
+        mAuthHelper.keepAuthPageLandscapeFullSreen(jsonObject.getBooleanValue("autoQuitPage", false));
+        // 用户控制返回键及左上角返回按钮效果, 是否自动退出授权页面，false时由用户自己控制
+        if (!jsonObject.getBooleanValue("autoQuitPage", false)) {
+            mAuthHelper.userControlAuthPageCancel();
+        }
+        // SDK内置所有界面隐藏底部导航栏
+        if (jsonObject.getBooleanValue("keepAllPageHideNavigationBar", false)) {
+            mAuthHelper.keepAllPageHideNavigationBar();
+        }
+        // 授权页物理返回键禁用
+        mAuthHelper.closeAuthPageReturnBack(jsonObject.getBooleanValue("closeAuthPageReturnBack", false));
         /// 延时的情况下进行预取号，加快拉取授权页面
+
         if (jsonObject.getBooleanValue("isDelay")) {
             mAuthHelper.checkEnvAvailable(PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN);
         }
@@ -132,8 +144,6 @@ public String getCurrentCarrierName(){
      * 进入app就需要登录的场景使用
      */
     private void oneKeyLogin() {
-        mAuthHelper = PhoneNumberAuthHelper.getInstance(mActivity.getApplicationContext(), mTokenResultListener);
-        mAuthHelper.checkEnvAvailable(2);
         mUIConfig.configAuthPage();
         mAuthHelper.getLoginToken(mContext, 5000);
     }
@@ -180,9 +190,6 @@ public void onTokenSuccess(String s) {
                     if (ResultCode.CODE_SUCCESS.equals(tokenRet.getCode())) {
                         Log.i(TAG, "获取token成功：" + s);
                         mAuthHelper.setAuthListener(null);
-                        if (jsonObject.getBooleanValue("autoQuitPage")) {
-                            mAuthHelper.quitLoginPage();
-                        }
                     }
                 } catch (Exception e) {
                     e.fillInStackTrace();
@@ -201,9 +208,6 @@ public void onTokenFailed(String s) {
                 }
                 // 失败时也不关闭
                 mAuthHelper.setAuthListener(null);
-                if (jsonObject.getBooleanValue("autoQuitPage")) {
-                    mAuthHelper.quitLoginPage();
-                }
             }
         };
         mAuthHelper.setAuthListener(mTokenResultListener);
@@ -218,7 +222,15 @@ public void onTokenFailed(String s) {
      * 600013 系统维护，功能不可⽤
      */
     public void checkEnvAvailable(@IntRange(from = 1, to = 2) int type){
-        mAuthHelper.checkEnvAvailable(PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN);
+        mAuthHelper.checkEnvAvailable(type);
+    }
+
+
+    /**
+     * 获取授权页协议勾选框选中状态
+     */
+    public boolean queryCheckBoxIsChecked(){
+        return mAuthHelper.queryCheckBoxIsChecked();
     }
 
     /**

android/src/main/java/com/sean/rao/ali_auth/common/CustomAuthUIControlClickListener.java

@@ -5,10 +5,16 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+// 添加签名信息
+def keystorePropertiesFile = rootProject.file("key.properties")
+def keystoreProperties = new Properties()
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+// end
+
 android {
     namespace = "com.sean.rao.aliAuth"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = "27.0.12077973"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -29,30 +35,39 @@ android {
         versionName "1.0.0"
     }
 
+    // 添加签名信息
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+    // end
 
     buildTypes {
         debug {
             ndk {
-                abiFilters "armeabi", "armeabi-v7a","arm64-v8a", "x86", "arm64"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
             }
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
         release {
             ndk{
                 //这里其实我觉可以直接是用"armeabi-v7a"，但国内几个大哥之前使用的都是"armeabi"
-                abiFilters "armeabi", "armeabi-v7a"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86_64"
                 // abiFilters "armeabi", "armeabi-v7a","arm64-v8a", "x86", "arm64"
             }
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 }
 
-
 dependencies {
-    implementation "androidx.appcompat:appcompat:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.7.1"
 }
 
 flutter {