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

# Conflicts:
#	lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart

lib/constants/application_objects.dart

@@ -17,7 +17,7 @@ import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart
 import 'package:aku_new_community/pages/renovation_manage/new_renovation/new_renovation_page.dart';
 import 'package:aku_new_community/pages/service_browse/service_browse_page.dart';
 import 'package:aku_new_community/pages/setting_page/settings_page.dart';
-import 'package:aku_new_community/pages/surrounding_enterprises/Surrounding_enterprises_page.dart';
+import 'package:aku_new_community/pages/surrounding_enterprises/surrounding_enterprises_page.dart';
 import 'package:aku_new_community/pages/things_page/fixed_submit_page.dart';
 import 'package:aku_new_community/pages/visitor_access_page/visitor_access_page.dart';
 import 'package:aku_new_community/ui/community/activity/activity_list_page.dart';

lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart

@@ -0,0 +1,140 @@
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/constants/app_theme.dart';
+import 'package:aku_new_community/model/common/img_model.dart';
+import 'package:aku_new_community/models/surrounding_enterprises/surrounding_enterprises_model.dart';
+import 'package:aku_new_community/pages/surrounding_enterprises/surrounding_enterprises_detail_page.dart';
+import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
+import 'package:aku_new_community/utils/headers.dart';
+import 'package:aku_new_community/widget/bee_scaffold.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+class SurroundingEnterprisesPage extends StatefulWidget {
+  SurroundingEnterprisesPage({Key? key}) : super(key: key);
+
+  @override
+  _SurroundingEnterprisesPageState createState() =>
+      _SurroundingEnterprisesPageState();
+}
+
+class _SurroundingEnterprisesPageState
+    extends State<SurroundingEnterprisesPage> {
+  EasyRefreshController _refreshController = EasyRefreshController();
+  int _page = 1;
+  int _size = 10;
+  @override
+  void initState() {
+    super.initState();
+    // Future.delayed(Duration(milliseconds: 0), () async {
+    //   var agreement = await HiveStore.appBox?.get('IndustryCommitteePage') ?? false;
+    //   if (!agreement) {
+    //     await TipsDialog.tipsDialog();
+    //     HiveStore.appBox!.put('IndustryCommitteePage',true);
+    //   }
+    // });
+  }
+
+  Widget _buildCard(SurroundingEnterprisesModel model) {
+    return GestureDetector(
+      onTap: () {
+        Get.to(SurroundingEnterprisesDetailPage(
+          surroundingEnterprisesModel: model,
+        ));
+      },
+      child: Container(
+        padding: EdgeInsets.all(20.w),
+        color: Colors.white,
+        height: 250.w,
+        child: Row(
+          //  .padding(EdgeInsets.all(20.w)).white.withRounded(value: 8.w).make()
+
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            ClipRRect(
+              borderRadius: BorderRadius.circular(4.w),
+              child: FadeInImage.assetNetwork(
+                placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+                image: API.image(ImgModel.first(model.imgList)),
+                height: 200.w,
+                width: 240.w,
+                fit: BoxFit.fill,
+              ),
+            ),
+            24.wb,
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Container(
+                  width: 440.w,
+                  child: Text(
+                    '${model.name}',
+                    style: TextStyle(
+                        fontSize: 30.sp,
+                        fontWeight: FontWeight.bold,
+                        color: ktextPrimary),
+                    maxLines: 4,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
+                20.hb,
+                Container(
+                  width: 440.w,
+                  child: Text(
+                    '${model.content}',
+                    style: TextStyle(fontSize: 24.sp, color: ktextPrimary),
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
+                Spacer(),
+                Row(
+                  children: [
+                    '南宁人才公寓'.text.size(20.sp).color(ktextThirdColor).make(),
+                    Spacer(),
+                    '发布于：${model.getReleaseDate}'
+                        .text
+                        .size(20.sp)
+                        .color(ktextThirdColor)
+                        .make(),
+                  ],
+                )
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget build(BuildContext context) {
+    return BeeScaffold(
+      title: '周边企业',
+      systemStyle: SystemStyle.genStyle(bottom: Color(0xFF2A2A2A)),
+      body: BeeListView<SurroundingEnterprisesModel>(
+        path: API.manager.surroundingEnterprises,
+        extraParams: {'pageNum': _page, 'size': _size},
+        convert: (model) {
+          return model.tableList!
+              .map((e) => SurroundingEnterprisesModel.fromJson(e))
+              .toList();
+        },
+        controller: _refreshController,
+        builder: (items) {
+          return ListView.separated(
+            padding: EdgeInsets.symmetric(vertical: 20.w),
+            itemBuilder: (context, index) {
+              return _buildCard(items[index]);
+            },
+            separatorBuilder: (context, index) => 20.hb,
+            itemCount: items.length,
+          );
+        },
+      ),
+    );
+  }
+}

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,8 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import device_info_plus_macos
-import firebase_core
-import firebase_crashlytics
 import package_info
 import package_info_plus_macos
 import path_provider_macos
@@ -17,8 +15,6 @@ import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
-  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
-  FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
   FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
   FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))