Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
-  <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧生活" android:icon="@mipmap/ic_launcher" android:networkSecurityConfig="@xml/network_security_config">
+  <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂" android:icon="@mipmap/ic_launcher" android:networkSecurityConfig="@xml/network_security_config">
   <service android:name="com.amap.api.location.APSService"></service>
   <meta-data android:name="com.amap.api.v2.apikey"
                  android:value="f6361c0537bf2d6ddb898b10618d3726"/>

lib/pages/sign/login/other_login_page.dart

@@ -26,7 +26,7 @@ class OtherLoginPage extends StatefulWidget {
 
 class _OtherLoginPageState extends State<OtherLoginPage> {
   PageController _controller = PageController();
-  List<String> _tabs = [ '验证码登录','账号登录'];
+  List<String> _tabs = ['验证码登录', '账号登录'];
   int _currentIndex = 0;
   TextEditingController _tel = TextEditingController();
   TextEditingController _psd = TextEditingController();
@@ -143,7 +143,7 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
       BotToast.showText(text: '请先选择小区！');
       return false;
     }
-    if (_currentIndex == 0 && _psd.text.isEmpty) {
+    if (_currentIndex == 1 && _psd.text.isEmpty) {
       BotToast.showText(text: '密码不能为空');
       return false;
     }

lib/pages/splash/splash_page.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/main_initialize.dart';
 import 'package:aku_new_community/pages/setting_page/agreement_page/agreement_page.dart';
 import 'package:aku_new_community/pages/setting_page/agreement_page/privacy_page.dart';
@@ -241,13 +242,13 @@ class _SplashPageState extends State<SplashPage> {
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
                     Image.asset(
-                      R.ASSETS_IMAGES_SPLASH_LOGO_PNG,
+                      Assets.images.logo.path,
                       width: 140.w,
                       height: 140.w,
                       fit: BoxFit.fill,
                     ),
                     Text(
-                      '小蜜蜂智慧社区',
+                      '小蜜蜂',
                       style: TextStyle(
                           color: Color(0xD9000000),
                           fontSize: 32.sp,

lib/ui/community/community_views/my_community_view.dart

@@ -85,7 +85,7 @@ class MyCommunityViewState extends State<MyCommunityView>
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                '${_head?.dynamicNum}'
+                '${_head?.dynamicNum ?? 0}'
                     .text
                     .size(40.sp)
                     .fontWeight(FontWeight.bold)
@@ -100,7 +100,7 @@ class MyCommunityViewState extends State<MyCommunityView>
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                '${_head?.commentNum}'
+                '${_head?.commentNum ?? 0}'
                     .text
                     .size(40.sp)
                     .fontWeight(FontWeight.bold)
@@ -115,7 +115,7 @@ class MyCommunityViewState extends State<MyCommunityView>
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                '${_head?.likesNum}'
+                '${_head?.likesNum ?? 0}'
                     .text
                     .size(40.sp)
                     .fontWeight(FontWeight.bold)
@@ -230,7 +230,7 @@ class MyCommunityViewState extends State<MyCommunityView>
                     mainAxisSize: MainAxisSize.max,
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      '${item.createDT?.hour ?? ''}.${item.createDT?.second ?? ''}'
+                      '${item.createDT?.hour ?? ''}.${item.createDT?.minute ?? ''}'
                           .text
                           .size(28.sp)
                           .color(Color(0xA6000000))

lib/ui/profile/new_house/member_view.dart

@@ -108,7 +108,8 @@ class _MemberViewState extends State<MemberView> {
               decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(40.w),
                   border: Border.all(color: kPrimaryColor, width: 4.w)),
-              child: Assets.images.splashLogo.image(width: 80.w, height: 80.w),
+              child: Assets.newIcon.avatarPlaceholder
+                  .image(width: 80.w, height: 80.w),
             ),
             Positioned(
                 bottom: -20.w,