扫码更新

android/app/build.gradle

@@ -32,7 +32,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 32
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -96,7 +96,7 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.amap.api:3dmap:latest.integration'
-    implementation 'com.amap.api:location:5.2.0'
+//    implementation 'com.amap.api:location:5.2.0'
     implementation 'com.android.support:multidex:2.0.1'
 
 }

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: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"/>

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()

lib/constants/api.dart

@@ -2,7 +2,7 @@ part 'sars_api.dart';
 
 class API {
   ///HOST
-  static const String host = 'http://shop.kaidalai.cn';
+  static const String host = 'http://star.kaidalai.cn/';
 
   ///接口基础地址
   static const String baseURL = '$host/api/app';
@@ -174,6 +174,9 @@ class _Task {
 
   ///完成任务
   String get finish => '/user/taskRelease/finish';
+
+  ///确认任务
+  String get confirm => '/user/taskRelease/confirm';
 }
 
 class _Manager {

lib/generated_plugin_registrant.dart

@@ -4,6 +4,7 @@
 
 // ignore_for_file: directives_ordering
 // ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: depend_on_referenced_packages
 
 import 'package:device_info_plus_web/device_info_plus_web.dart';
 import 'package:image_picker_for_web/image_picker_for_web.dart';

lib/l10n/app_zh.arb

@@ -3,7 +3,7 @@
   "@appName": {
     "description": "应用名称"
   },
-  "tempPlotName": "人才公寓智慧小区",
+  "tempPlotName": "盛邦滨江府",
   "@tempPlotName": {
     "description": "临时使用的小区名称"
   }

lib/main.dart

@@ -51,7 +51,7 @@ class _MyAppState extends State<MyApp> {
         },
         child: ScreenUtilInit(
           designSize: Size(750, 1334),
-          builder: () => GetMaterialApp(
+          builder: (context,widget) => GetMaterialApp(
             onGenerateTitle: (context) => S.of(context)!.appName,
             debugShowCheckedModeBanner: false,
             theme: AppTheme.theme,

lib/pages/home/home_page.dart

@@ -150,13 +150,13 @@ class _HomePageState extends State<HomePage>
             textAlign: TextAlign.center,
           ),
           Spacer(),
-          GestureDetector(
+          // GestureDetector(
-            onTap: () {
+          //   onTap: () {
-              Get.to(() => BeeSearch());
+          //     Get.to(() => BeeSearch());
-            },
+          //   },
-            child: Image.asset(R.ASSETS_ICONS_ICON_MAIN_FIND_PNG,
+          //   child: Image.asset(R.ASSETS_ICONS_ICON_MAIN_FIND_PNG,
-                height: 40.w, width: 40.w),
+          //       height: 40.w, width: 40.w),
-          ),
+          // ),
           Padding(
             padding: EdgeInsets.only(right: 16.w, left: 12.w),
             child: Badge(

lib/pages/renovation_manage/renovation_manage_card.dart

@@ -8,6 +8,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import '../../utils/headers.dart';
+
 class RenovationManageCard extends StatefulWidget {
   final int index;
 
@@ -55,7 +57,7 @@ class _RenovationManageCardState extends State<RenovationManageCard> {
               ],
             ),
             24.w.heightBox,
-            _buildTile(R.ASSETS_ICONS_ARTICLE_NAME_PNG, '小区名称', '人才公寓'),
+            _buildTile(R.ASSETS_ICONS_ARTICLE_NAME_PNG, '小区名称',S.of(context)!.tempPlotName ),
             12.w.heightBox,
             _buildTile(
               R.ASSETS_ICONS_APPOINTMENT_ADDRESS_PNG,

lib/pages/renovation_manage/renovation_manage_detail_page.dart

@@ -9,6 +9,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import '../../utils/headers.dart';
+
 class RenovationManageDetailPage extends StatefulWidget {
   RenovationManageDetailPage({Key? key}) : super(key: key);
 
@@ -197,7 +199,7 @@ class _RenovationManageDetailPageState
       [
         _buildInfoCard(
           tag: '家',
-          midTop: '人才公寓',
+          midTop: S.of(context)!.tempPlotName,
           midBottom: '1幢-1单元-302',
           name: '业主：' + '马泽鹏',
           phone: '13720183183',

lib/pages/service_browse/service_browse_page.dart

@@ -11,6 +11,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import '../../utils/headers.dart';
+
 class ServiceBrowsePage extends StatefulWidget {
   ServiceBrowsePage({Key? key}) : super(key: key);
 
@@ -89,7 +91,7 @@ class _ServiceBrowsePageState extends State<ServiceBrowsePage> {
           32.w.heightBox,
           Row(
             children: [
-              '南宁人才公寓'.text.size(20.sp).color(ktextSubColor).make(),
+              S.of(context)!.tempPlotName.text.size(20.sp).color(ktextSubColor).make(),
               Spacer(),
               '发布于 ${DateUtil.formatDateStr(model.createDate, format: 'MM-dd HH:mm')}'
                   .text

lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart

@@ -94,7 +94,7 @@ class _SurroundingEnterprisesPageState
                 Spacer(),
                 Row(
                   children: [
-                    '南宁人才公寓'.text.size(20.sp).color(ktextThirdColor).make(),
+                    S.of(context)!.tempPlotName.text.size(20.sp).color(ktextThirdColor).make(),
                     Spacer(),
                     '发布于：${model.getReleaseDate}'
                         .text

lib/ui/community/community_views/community_page.dart

@@ -181,8 +181,8 @@ class _CommunityPageState extends State<CommunityPage>
                       ? SizedBox()
                       : ListView(
                           children: [
-                            _geSearch(),
+                            // _geSearch(),
-                            2.hb,
+                            // 2.hb,
                             _hotNewsModels.isEmpty ? SizedBox() : _getInfo(),
                             16.hb,
                             _gambitModels.isEmpty ? SizedBox() : _getNews(),

lib/ui/community/community_views/widgets/chat_card_detail.dart

@@ -356,10 +356,6 @@ class _ChatCardDetailState extends State<ChatCardDetail> {
                     .color(Color(0xFF999999))
                     .make(),
                 32.wb,
-
-
-
-
               ].row(),
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -367,10 +363,15 @@ class _ChatCardDetailState extends State<ChatCardDetail> {
                   Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      32.hb,
+                      Column(
-                      widget.model!.content!.text.size(28.sp).color(ktextSubColor).make(),
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                      32.hb,
+                        children: [
-                      _renderImage(),
+                          32.hb,
+                          widget.model!.content!.text.size(28.sp).color(ktextSubColor).make(),
+                          32.hb,
+                          _renderImage(),
+                        ],
+                      ).paddingOnly(left: 116.w),
                       Row(
                         children: [
                           widget.model!.gambitTitle?.isEmpty ?? true

lib/ui/market/order/my_order_card.dart

@@ -16,6 +16,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import '../../../utils/headers.dart';
+
 class MyOrderCard extends StatefulWidget {
   final MyOrderListModel model;
   final VoidCallback callRefresh;
@@ -119,7 +121,7 @@ class _MyOrderCardState extends State<MyOrderCard> {
             40.w.heightBox,
             ...[
               _rowTile('下单时间', widget.model.arrivalDateString),
-              _rowTile('到达地点', '人才公寓小区北侧门口'),
+              _rowTile('到达地点', '${S.of(context)!.tempPlotName}北侧门口'),
               _rowTile('发货时间', widget.model.sendDateString),
             ].sepWidget(separate: 16.w.heightBox),
             ..._bottomWidget(),

lib/ui/service/my_take_task/my_take_task_card.dart

@@ -171,7 +171,7 @@ class MyTakeTaskCard extends StatelessWidget {
             )
           ],
         );
-      case 4:
+      case 9:
         return Column(
           children: [
             32.w.heightBox,

lib/ui/service/my_task/my_task_card.dart

@@ -140,25 +140,7 @@ class MyTaskCard extends StatelessWidget {
                 )
               ],
             ),
-            Column(
+            _cardBottom(model.status),
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                40.w.heightBox,
-                Row(
-                  children: [
-                    Spacer(),
-                    CardBottomButton.yellow(
-                        text: '取消订单',
-                        onPressed: () async {
-                          var re = await TaskFunc.cancel(taskId: model.id);
-                          if (re) {
-                            refresh();
-                          }
-                        }),
-                  ],
-                ),
-              ],
-            ),
           ],
         ),
       ),
@@ -173,11 +155,32 @@ class MyTaskCard extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.end,
           children: [
             40.w.heightBox,
-            CardBottomButton.white(text: '取消订单', onPressed: () {}),
+            Row(
-            CardBottomButton.yellow(text: '确认完成', onPressed: () {}),
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                CardBottomButton.white(text: '取消订单', onPressed: () {}),
+              ],
+            ),
+          ],
+        );
+      case 3:
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            40.w.heightBox,
+            Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                CardBottomButton.yellow(
+                    text: '确认完成',
+                    onPressed: () async {
+                      await TaskFunc.confirm(taskId: model.id);
+                    }),
+              ],
+            ),
           ],
         );
-      case 4:
+      case 9:
         return Column(
           children: [
             32.w.heightBox,

lib/ui/service/my_task/my_task_detail_page.dart

@@ -3,11 +3,14 @@ import 'package:aku_new_community/models/task/my_task_list_model.dart';
 import 'package:aku_new_community/ui/service/task_map.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
+import 'package:aku_new_community/widget/buttons/bottom_button.dart';
 import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import '../task_func.dart';
+
 class MyTaskDetailPage extends StatefulWidget {
   final MyTaskListModel model;
 
@@ -118,6 +121,14 @@ class _MyTaskDetailPageState extends State<MyTaskDetailPage> {
               )),
         ],
       ),
+      bottomNavi: widget.model.status != 3
+          ? SizedBox()
+          : BottomButton(
+              onPressed: () async {
+                await TaskFunc.confirm(taskId: widget.model.id);
+              },
+              child: Text('完成任务'),
+            ),
     );
   }
 

lib/ui/service/task_func.dart

@@ -58,4 +58,15 @@ class TaskFunc {
     });
     return base.status ?? false;
   }
+
+  ///完成任务
+
+  static Future<bool> confirm({
+    required int taskId,
+  }) async {
+    var base = await NetUtil().get(API.manager.task.confirm, params: {
+      'taskId': taskId,
+    });
+    return base.status ?? false;
+  }
 }

lib/ui/service/task_map.dart

@@ -2,8 +2,9 @@ class TaskMap {
   static Map<int, String> statusToString = {
     1: '未接单',
     2: '待处理',
-    3: '已完成',
+    3: '待确认',
-    4: '已取消'
+    4: '已完成',
+    9: '已取消'
   };
 
   static Map<int, String> typeToString = {1: '跑腿', 2: '代驾', 3: '装修', 4: '陪玩'};
@@ -13,8 +14,9 @@ class TaskMap {
   static Map<int, String> detailStatusToString = {
     1: '已发布',
     2: '待处理',
-    3: '已完成',
+    3: '待确认',
-    4: '已取消'
+    4: '已完成',
+    9: '已取消'
   };
 
   static Map<int, String> subStatus = {

pubspec.yaml

@@ -94,7 +94,7 @@ dependencies:
   #瀑布流
   waterfall_flow: ^3.0.1
   #扫码组件
-  qr_code_scanner: ^0.4.0
+  qr_code_scanner: ^1.0.0
   #model 插件
   equatable: ^2.0.0
   #pdf文件预览

tool/_build.dart

@@ -20,7 +20,7 @@ buildApk() async {
   await runAsync('mkdir', arguments: ['-p', Config.apkDir]);
   await runAsync('mv', arguments: [
     Config.buildPath,
-    '${Config.apkDir}/${Config.packageName}_${version}_release_$date.apk'
+    '${Config.apkDir}/binjiang/${Config.packageName}_${version}_release_$date.apk'
   ]);
 }