diff --git a/assets/images/empty/3.0x/empty.png b/assets/images/empty/3.0x/empty.png new file mode 100644 index 0000000..8f8a5f2 Binary files /dev/null and b/assets/images/empty/3.0x/empty.png differ diff --git a/assets/images/launch_image/launch_image.png b/assets/images/launch_image/launch_image.png new file mode 100644 index 0000000..a5f9062 Binary files /dev/null and b/assets/images/launch_image/launch_image.png differ diff --git a/assets/images/loading/loading.gif b/assets/images/loading/loading.gif new file mode 100644 index 0000000..ef1bf55 Binary files /dev/null and b/assets/images/loading/loading.gif differ diff --git a/assets/images/occupation_map/occupation_map.png b/assets/images/occupation_map/occupation_map.png new file mode 100644 index 0000000..d4f1fb6 Binary files /dev/null and b/assets/images/occupation_map/occupation_map.png differ diff --git a/assets/images/qrcode/default_qrcode.png b/assets/images/qrcode/default_qrcode.png new file mode 100644 index 0000000..948ced4 Binary files /dev/null and b/assets/images/qrcode/default_qrcode.png differ diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index d898097..c639228 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -108,33 +108,33 @@ android { // 应用信息配置 -// productFlavors { -// // 智夜生活 -// zhiying { -// applicationId "cn.zhios.zhiying" -// versionCode 22 -// dimension "app" -// versionName '1.2.2' -// // 签名信息 -// 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 26 + dimension "app" + versionName '1.2.26' + // 签名信息 + 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 -> diff --git a/lib/pages/home_page/home_page.dart b/lib/pages/home_page/home_page.dart index fd6234f..fe836d7 100644 --- a/lib/pages/home_page/home_page.dart +++ b/lib/pages/home_page/home_page.dart @@ -48,46 +48,13 @@ class _HomePageState extends State with WidgetsBindingObserver, Ticker int _currentIndex = 0; List> _data = List(); static const EventChannel _eventChannel = const EventChannel('JAVA_TO_FLUTTER'); - AnimationController animationController; - Animation scaleAnimation; - Animation opacityAnimation; - double opacity = 1.0; - - bool initFinish = false; - - double maxRatio = 5.0; @override void initState() { - animationController = AnimationController(vsync: this, duration: Duration(milliseconds: 500)); - CurvedAnimation curvedAnimation = CurvedAnimation(parent: animationController, curve: Curves.ease); - scaleAnimation = Tween(begin: 1.0, end: maxRatio).animate(curvedAnimation); - opacityAnimation = Tween(begin: 0.7, end: 0).animate(curvedAnimation); - animationController.addListener(() { - print(scaleAnimation.value); - - if (scaleAnimation.value == maxRatio) { - // 动画结束后显示弹窗 - _showPolicy(); - setState(() {}); - } - }); ///初始化一些数据 initAsync(); - ///打开动画 - // Timer(Duration(milliseconds: 0), () { - // animationController.forward(); - // }); - - ///打开动画 - Timer(Duration(milliseconds: 1000), () { - initFinish = true; - setState(() {}); - }); - - setState(() {}); super.initState(); } @@ -108,6 +75,8 @@ class _HomePageState extends State with WidgetsBindingObserver, Ticker Constants.isShowIntellectDialog = false; TaobaoAuth.initAuth(context); + //弹窗 + _showPolicy(); Moblink.uploadPrivacyPermissionStatus(1, (bool success) {}); SharesdkPlugin.uploadPrivacyPermissionStatus(1, (bool success) {}); @@ -159,7 +128,6 @@ class _HomePageState extends State with WidgetsBindingObserver, Ticker @override void dispose() { WidgetsBinding.instance.removeObserver(this); - animationController.dispose(); super.dispose(); } @@ -196,31 +164,6 @@ class _HomePageState extends State with WidgetsBindingObserver, Ticker //底部导航栏 bottomNavigationBar: createBottomNavigationBar(tabs), ); - // return Stack( - // alignment: Alignment.topCenter, - // children: [ - // Scaffold( - // body: IndexedStack( - // index: _currentIndex, - // children: contentWidgets, - // ), - // //底部导航栏 - // bottomNavigationBar: createBottomNavigationBar(tabs), - // ), - // (scaleAnimation.value != maxRatio || !initFinish) - // ? Container( - // height: initFinish?0:null, - // width: double.infinity, - // child: Image.asset( - // 'assets/images/launch_image/launch_image.png', - // package: 'zhiying_base_widget', - // fit: BoxFit.cover, - // ), - // ) - // : Container(width: 0 - // ,height: 0,) - // ], - // ); } Widget createBottomNavigationBar(List> tabs) { diff --git a/lib/pages/launch_page/launch_page.dart b/lib/pages/launch_page/launch_page.dart index 895efbd..f896c13 100644 --- a/lib/pages/launch_page/launch_page.dart +++ b/lib/pages/launch_page/launch_page.dart @@ -36,8 +36,7 @@ class LaunchPage extends StatefulWidget { _LaunchPageState createState() => _LaunchPageState(); } -class _LaunchPageState extends State { - final GlobalKey navigatorKey = new GlobalKey(); + class _LaunchPageState extends State with TickerProviderStateMixin { final GlobalKey navigatorKey = new GlobalKey();