Merge remote-tracking branch 'origin/1.22.0_master' into 1.22.0_master

example/android/app/build.gradle

@@ -53,8 +53,8 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             //选择要添加的对应cpu类型的.so库。
-           // abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64', 'arm64-v8a'
-            abiFilters  'armeabi-v7a','x86_64'
+            abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64', 'arm64-v8a'
+           // abiFilters  'armeabi-v7a','x86_64'
         }
     }
 
@@ -109,33 +109,33 @@ android {
 
 
     // 应用信息配置
-    productFlavors {
-        // 智夜生活
-        zhiying {
-            applicationId "cn.zhios.zhiying"
-            versionCode 60
-            dimension "app"
-            versionName '1.3.20'
-            // 签名信息
-            signingConfig signingConfigs.zhiying
-        }
-    }
-
-    // 打包脚本
-    android.applicationVariants.all { variant ->
-        if (variant.buildType.name != "debug") {
-            variant.getPackageApplicationProvider().get().outputDirectory = new File(project.rootDir.absolutePath + "/app/build/outputs/apk")
-        }
-
-        variant.outputs.all { output ->
-            def outputFile = output.outputFile
-            if (outputFile != null && outputFile.name.endsWith('.apk')) {
-                //这里修改apk文件名
-                def fileName = "${variant.productFlavors[0].name}_${releaseTime()}01_&V${variant.productFlavors[0].versionCode}.apk"
-                outputFileName = fileName
-            }
-        }
-    }
+//    productFlavors {
+//        // 智夜生活
+//        zhiying {
+//            applicationId "cn.zhios.zhiying"
+//            versionCode 60
+//            dimension "app"
+//            versionName '1.3.20'
+//            // 签名信息
+//            signingConfig signingConfigs.zhiying
+//        }
+//    }
+//
+//    // 打包脚本
+//    android.applicationVariants.all { variant ->
+//        if (variant.buildType.name != "debug") {
+//            variant.getPackageApplicationProvider().get().outputDirectory = new File(project.rootDir.absolutePath + "/app/build/outputs/apk")
+//        }
+//
+//        variant.outputs.all { output ->
+//            def outputFile = output.outputFile
+//            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+//                //这里修改apk文件名
+//                def fileName = "${variant.productFlavors[0].name}_${releaseTime()}01_&V${variant.productFlavors[0].versionCode}.apk"
+//                outputFileName = fileName
+//            }
+//        }
+//    }
 
     configurations.all {
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->

example/android/app/src/main/java/cn/zhios/zhiying_base_widget_example/MainActivity.java

@@ -154,15 +154,15 @@ public class MainActivity extends FlutterActivity implements ZhiyingFlutterCommN
     @Override
     public Map getSetting() {
         Map map = new HashMap();
-//        ///测试
-//        map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989");http://47.114.51.254:80   http://inapi.izhyin.cn/
-//        map.put("master_id", "123456");
-//        map.put("secret_key", "123456");
+        ///测试
+        map.put("domain", "http://inapi.izhyin.cn/");//"http://120.76.175.204:8989");http://47.114.51.254:80   http://inapi.izhyin.cn/
+        map.put("master_id", "123456");
+        map.put("secret_key", "123456");
 
         ///正式
-        map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689
-        map.put("master_id", "99813608");
-        map.put("secret_key", "123456");
+//        map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689
+//        map.put("master_id", "99813608");
+//        map.put("secret_key", "123456");
 
         //客户测试
 //        map.put("domain", "http://api.zhios.cn/");//45678910，api.zhios.cn84198689

lib/pages/home_page/home_page.dart

@@ -47,7 +47,7 @@ class HomePage extends StatefulWidget {
   _HomePageState createState() => _HomePageState();
 }
 
-class _HomePageState extends LifeState<HomePage> with WidgetsBindingObserver, TickerProviderStateMixin {
+class _HomePageState extends LifeState<HomePage> with WidgetsBindingObserver, TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
   int _currentIndex = 0;
   List<Map<String, dynamic>> _data = List();
   static const EventChannel _eventChannel = const EventChannel('JAVA_TO_FLUTTER');
@@ -58,7 +58,7 @@ class _HomePageState extends LifeState<HomePage> with WidgetsBindingObserver, Ti
   StreamSubscription logOutSubscription;
   StreamSubscription loginSubscription;
 
-  StreamSubscription  eventChannelSubscription;
+  StreamSubscription eventChannelSubscription;
 
   @override
   void initState() {
@@ -114,7 +114,7 @@ class _HomePageState extends LifeState<HomePage> with WidgetsBindingObserver, Ti
       //app后台杀死时候的还原
       Moblink.restoreScene(_restore);
       // 监听开始(传递监听到原生端，用户监听场景还原的数据回传回来)
-      eventChannelSubscription=  _eventChannel.receiveBroadcastStream().listen(_onEvent, onError: _onError);
+      eventChannelSubscription = _eventChannel.receiveBroadcastStream().listen(_onEvent, onError: _onError);
 
       MobPushUtil.addPushReceiver();
       aliasSubscription = EventUtil.instance.on<LoginSuccessEvent>().listen((event) async {
@@ -141,13 +141,10 @@ class _HomePageState extends LifeState<HomePage> with WidgetsBindingObserver, Ti
           MobPushUtil.setAlias(masterId + "_" + userInfo.userId);
         }
       });
-
-
     } catch (e, s) {
       print(e);
       print(s);
     }
-
   }
 
   initBaseSet() {
@@ -182,6 +179,11 @@ class _HomePageState extends LifeState<HomePage> with WidgetsBindingObserver, Ti
     super.didChangeAppLifecycleState(state);
   }
 
+  @override
+  void didUpdateWidget(covariant HomePage oldWidget) {
+    super.didUpdateWidget(oldWidget);
+  }
+
   @override
   Widget build(BuildContext context) {
     ScreenUtil.init(context, width: 750, height: 1334);
@@ -441,12 +443,15 @@ class _HomePageState extends LifeState<HomePage> with WidgetsBindingObserver, Ti
     print("首页调用可见");
     IntellectCreate.setCheck(true);
   }
+
+  @override
+  // TODO: implement wantKeepAlive
+  bool get wantKeepAlive => true;
 }
 
 final RouteObserver<Route> lifeObserver = RouteObserver();
 
-abstract class LifeState<T extends StatefulWidget> extends State<T>
-    with  RouteAware {
+abstract class LifeState<T extends StatefulWidget> extends State<T> with RouteAware {
   @override
   void initState() {
     super.initState();
@@ -464,13 +469,14 @@ abstract class LifeState<T extends StatefulWidget> extends State<T>
     super.dispose();
   }
 
-
   void didPop() {
     onPaused();
   }
 
   void didPopNext() {
     onResume();
+    print("回到首页");
+    setState(() {});
   }
 
   void didPush() {

lib/pages/security_page/security_bind_alipay/security_bind_alipay_page.dart

@@ -80,7 +80,7 @@ class _SecurityBindAlipayContainerState
   void _verifiy() {
     bool canConfirm = _nameController.text.length > 0 &&
         _accountController.text.length > 0 &&
-        _codeController.text.length >= 4 && _codeController.text.length <= 4;
+        _codeController.text.length >= 4 && _codeController.text.length <= 6;
     if (canConfirm != _canConfirm) {
       setState(() {
         _canConfirm = canConfirm;