Merge branch 'master' of http://192.168.2.201:8099/zhangmeng/aku_community_manager

* 'master' of http://192.168.2.201:8099/zhangmeng/aku_community_manager:
  ios图标修改
  版本更新，更改应用名
  图标更改，首页公告indicator更改

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="aku_community_manager" android:icon="@mipmap/ic_launcher">
+  <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧社区管家端" android:icon="@mipmap/ic_launcher">
     <meta-data android:name="com.amap.api.v2.apikey" android:value="872b909f2ebc8150b809d692c4349f22"/>
     <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as

ios/Podfile.lock

@@ -0,0 +1,113 @@
+PODS:
+  - AMap3DMap-NO-IDFA (7.6.0):
+    - AMapFoundation-NO-IDFA (~> 1.6.3)
+  - amap_core_fluttify (0.0.1):
+    - AMapFoundation-NO-IDFA (~> 1.6.4)
+    - Flutter
+    - foundation_fluttify
+  - amap_location_fluttify (0.0.1):
+    - amap_core_fluttify
+    - AMapLocation-NO-IDFA (= 2.6.7)
+    - Flutter
+    - foundation_fluttify
+  - amap_map_fluttify (0.0.1):
+    - AMap3DMap-NO-IDFA (= 7.6.0)
+    - amap_core_fluttify
+    - amap_location_fluttify
+    - amap_search_fluttify
+    - Flutter
+    - foundation_fluttify
+    - url_launcher
+  - amap_search_fluttify (0.0.1):
+    - amap_core_fluttify
+    - AMapSearch-NO-IDFA (~> 7.3.0)
+    - Flutter
+    - foundation_fluttify
+  - AMapFoundation-NO-IDFA (1.6.4)
+  - AMapLocation-NO-IDFA (2.6.7):
+    - AMapFoundation-NO-IDFA (~> 1.6.4)
+  - AMapSearch-NO-IDFA (7.3.0):
+    - AMapFoundation-NO-IDFA (~> 1.6.3)
+  - core_location_fluttify (0.0.1):
+    - Flutter
+    - foundation_fluttify
+  - Flutter (1.0.0)
+  - foundation_fluttify (0.0.1):
+    - Flutter
+  - image_picker (0.0.1):
+    - Flutter
+  - MTBBarcodeScanner (5.0.11)
+  - "permission_handler (5.0.1+1)":
+    - Flutter
+  - qr_code_scanner (0.0.2):
+    - Flutter
+    - MTBBarcodeScanner
+  - url_launcher (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - amap_core_fluttify (from `.symlinks/plugins/amap_core_fluttify/ios`)
+  - amap_location_fluttify (from `.symlinks/plugins/amap_location_fluttify/ios`)
+  - amap_map_fluttify (from `.symlinks/plugins/amap_map_fluttify/ios`)
+  - amap_search_fluttify (from `.symlinks/plugins/amap_search_fluttify/ios`)
+  - core_location_fluttify (from `.symlinks/plugins/core_location_fluttify/ios`)
+  - Flutter (from `Flutter`)
+  - foundation_fluttify (from `.symlinks/plugins/foundation_fluttify/ios`)
+  - image_picker (from `.symlinks/plugins/image_picker/ios`)
+  - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
+  - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
+  - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
+
+SPEC REPOS:
+  trunk:
+    - AMap3DMap-NO-IDFA
+    - AMapFoundation-NO-IDFA
+    - AMapLocation-NO-IDFA
+    - AMapSearch-NO-IDFA
+    - MTBBarcodeScanner
+
+EXTERNAL SOURCES:
+  amap_core_fluttify:
+    :path: ".symlinks/plugins/amap_core_fluttify/ios"
+  amap_location_fluttify:
+    :path: ".symlinks/plugins/amap_location_fluttify/ios"
+  amap_map_fluttify:
+    :path: ".symlinks/plugins/amap_map_fluttify/ios"
+  amap_search_fluttify:
+    :path: ".symlinks/plugins/amap_search_fluttify/ios"
+  core_location_fluttify:
+    :path: ".symlinks/plugins/core_location_fluttify/ios"
+  Flutter:
+    :path: Flutter
+  foundation_fluttify:
+    :path: ".symlinks/plugins/foundation_fluttify/ios"
+  image_picker:
+    :path: ".symlinks/plugins/image_picker/ios"
+  permission_handler:
+    :path: ".symlinks/plugins/permission_handler/ios"
+  qr_code_scanner:
+    :path: ".symlinks/plugins/qr_code_scanner/ios"
+  url_launcher:
+    :path: ".symlinks/plugins/url_launcher/ios"
+
+SPEC CHECKSUMS:
+  AMap3DMap-NO-IDFA: 5e5b483ef230d1bed6c8d989d36254a66c67a6fc
+  amap_core_fluttify: 832331914f028c32aebf1dab23474a82aff828e8
+  amap_location_fluttify: baa3007e3f215456ab2ea2f4ccccf5bc1a9a164b
+  amap_map_fluttify: 6b64256d6ccea7813e1b6423fcf7b5ef10d3c984
+  amap_search_fluttify: f83f950b4f8e8688bc8b100684c33868335f2e06
+  AMapFoundation-NO-IDFA: 68a24362b110b8e0a3677605d0fd36bdf521f2bb
+  AMapLocation-NO-IDFA: 2a3edfee336b38481b892e1ecc85df0f6b365851
+  AMapSearch-NO-IDFA: 85555dc9ba312949d39a259baa4ef4e0619fa944
+  core_location_fluttify: 9466a411ea7d22c6349c7e6a767ae4623f01eb1d
+  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  foundation_fluttify: 0c45145e3fad1fb99188e4979daed5b24cd9b278
+  image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
+  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
+  permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
+  qr_code_scanner: 16107718bdad7d708cdf6a5eacdca24b56cdf471
+  url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
+
+PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+
+COCOAPODS: 1.9.1

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -13,6 +13,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		BB92201F37E1F5D70CFCE42D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB29D734FFC9A5F30EE56862 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -29,6 +30,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		026E30CE00A074BD3FBE54F9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
@@ -37,11 +39,14 @@
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146EE1CF9000F007C117D /* 小蜜蜂智慧社区管家端.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "小蜜蜂智慧社区管家端.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		BB0EBAE2C9CD25508CE8905A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		EAD6594E3E9D112D0B561296 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		FB29D734FFC9A5F30EE56862 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -49,12 +54,31 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BB92201F37E1F5D70CFCE42D /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		2DB52540A04D1584EC8D457F /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				FB29D734FFC9A5F30EE56862 /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		56D0962DE7CFC0677D733DA3 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				BB0EBAE2C9CD25508CE8905A /* Pods-Runner.debug.xcconfig */,
+				026E30CE00A074BD3FBE54F9 /* Pods-Runner.release.xcconfig */,
+				EAD6594E3E9D112D0B561296 /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -72,13 +96,15 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
+				56D0962DE7CFC0677D733DA3 /* Pods */,
+				2DB52540A04D1584EC8D457F /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
 		97C146EF1CF9000F007C117D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				97C146EE1CF9000F007C117D /* Runner.app */,
+				97C146EE1CF9000F007C117D /* 小蜜蜂智慧社区管家端.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -105,12 +131,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				5D6FE9614EB73A014A4CBD95 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				57FAB5C02328A5D2101BE340 /* [CP] Embed Pods Frameworks */,
+				3D357B61FE9220306DA43845 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -118,7 +147,7 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
+			productReference = 97C146EE1CF9000F007C117D /* 小蜜蜂智慧社区管家端.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -183,6 +212,62 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		3D357B61FE9220306DA43845 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		57FAB5C02328A5D2101BE340 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		5D6FE9614EB73A014A4CBD95 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -288,19 +373,23 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 89Z9B4EZ45;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.akucommunity.akuCommunityManager;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "小蜜蜂智慧社区管家端";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -407,7 +496,8 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -420,19 +510,23 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 89Z9B4EZ45;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.akucommunity.akuCommunityManager;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "小蜜蜂智慧社区管家端";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -447,19 +541,23 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 89Z9B4EZ45;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.akucommunity.akuCommunityManager;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "小蜜蜂智慧社区管家端";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "Runner.app"
+               BuildableName = "&#x5c0f;&#x871c;&#x8702;&#x667a;&#x6167;&#x793e;&#x533a;&#x7ba1;&#x5bb6;&#x7aef;.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -27,19 +27,17 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
+            BuildableName = "&#x5c0f;&#x871c;&#x8702;&#x667a;&#x6167;&#x793e;&#x533a;&#x7ba1;&#x5bb6;&#x7aef;.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -56,13 +54,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
+            BuildableName = "&#x5c0f;&#x871c;&#x8702;&#x667a;&#x6167;&#x793e;&#x533a;&#x7ba1;&#x5bb6;&#x7aef;.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"
@@ -75,7 +71,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
+            BuildableName = "&#x5c0f;&#x871c;&#x8702;&#x667a;&#x6167;&#x793e;&#x533a;&#x7ba1;&#x5bb6;&#x7aef;.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,120 +3,120 @@
         {
             "size": "20x20",
             "idiom": "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
+            "filename": "icon-20@2x.png",
             "scale": "2x"
         },
         {
             "size": "20x20",
             "idiom": "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
+            "filename": "icon-20@3x.png",
             "scale": "3x"
         },
         {
             "size": "29x29",
             "idiom": "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
+            "filename": "icon-29.png",
             "scale": "1x"
         },
         {
             "size": "29x29",
             "idiom": "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
+            "filename": "icon-29@2x.png",
             "scale": "2x"
         },
         {
             "size": "29x29",
             "idiom": "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
+            "filename": "icon-29@3x.png",
             "scale": "3x"
         },
         {
             "size": "40x40",
             "idiom": "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
+            "filename": "icon-40@2x.png",
             "scale": "2x"
         },
         {
             "size": "40x40",
             "idiom": "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
+            "filename": "icon-40@3x.png",
             "scale": "3x"
         },
         {
             "size": "60x60",
             "idiom": "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
+            "filename": "icon-60@2x.png",
             "scale": "2x"
         },
         {
             "size": "60x60",
             "idiom": "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
+            "filename": "icon-60@3x.png",
             "scale": "3x"
         },
         {
             "size": "20x20",
             "idiom": "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
+            "filename": "icon-20-ipad.png",
             "scale": "1x"
         },
         {
             "size": "20x20",
             "idiom": "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
+            "filename": "icon-20@2x-ipad.png",
             "scale": "2x"
         },
         {
             "size": "29x29",
             "idiom": "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
+            "filename": "icon-29-ipad.png",
             "scale": "1x"
         },
         {
             "size": "29x29",
             "idiom": "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
+            "filename": "icon-29@2x-ipad.png",
             "scale": "2x"
         },
         {
             "size": "40x40",
             "idiom": "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
+            "filename": "icon-40.png",
             "scale": "1x"
         },
         {
             "size": "40x40",
             "idiom": "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
+            "filename": "icon-40@2x.png",
             "scale": "2x"
         },
         {
             "size": "76x76",
             "idiom": "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
+            "filename": "icon-76.png",
             "scale": "1x"
         },
         {
             "size": "76x76",
             "idiom": "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
+            "filename": "icon-76@2x.png",
             "scale": "2x"
         },
         {
             "size": "83.5x83.5",
             "idiom": "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
+            "filename": "icon-83.5@2x.png",
             "scale": "2x"
         },
         {
             "size": "1024x1024",
             "idiom": "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
+            "filename": "icon-1024.png",
             "scale": "1x"
         }
     ],
     "info": {
         "version": 1,
-    "author" : "xcode"
+        "author": "icon.wuruihong.com"
     }
 }

ios/Runner/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

lib/ui/home/announcement/All_anouncement.dart

@@ -41,6 +41,7 @@ class AllAnouncementState extends State<AllAnouncement> {
             child: Row(
               children: [
                 Container(
+                  alignment: Alignment.center,
                   width: 104.w,
                   height: 104.w,
                   decoration: BoxDecoration(
@@ -52,7 +53,7 @@ class AllAnouncementState extends State<AllAnouncement> {
                             Color(0xFF7EB4FF),
                             Color(0xFF3F8FFE),
                           ])),
-                  child: Image.asset(R.ASSETS_MANAGE_IC_ANNOUNCE_PNG),
+                  child: Image.asset(R.ASSETS_MANAGE_IC_ANNOUNCE_PNG,width: 74.w,height: 60.w,),
                 ),
                 SizedBox(
                   width: 24.w,

lib/ui/home/home_page.dart

@@ -395,11 +395,9 @@ class _HomePageState extends State<HomePage> {
             //公告栏
             Container(
               color: Color(0xFFFFFFFF),
-              //公告栏
               width: double.infinity,
-              height: 200.w,
-              child: Column(
-                children: [
+              height: 172.w,
+              child: Stack(children: [
                     CarouselSlider(
                       items: _anouncementProvider.anouncementCardModels
                           .map((e) => AllAnouncementState.anounceCard(e))
@@ -415,28 +413,34 @@ class _HomePageState extends State<HomePage> {
                         },
                       ),
                     ),
-                  Row(
+                 Positioned(
+                      top: 144.w,
+                      left: 0,
+                      bottom: 16.w,
+                      right: 0,
+                      child: Row(
+                        mainAxisSize: MainAxisSize.max,
                         mainAxisAlignment: MainAxisAlignment.center,
                         children:
                             _anouncementProvider.anouncementCardModels.map((e) {
-                      int index =
-                          _anouncementProvider.anouncementCardModels.indexOf(e);
+                          int index = _anouncementProvider.anouncementCardModels
+                              .indexOf(e);
                           return Container(
-                        width: 8.w,
-                        height: 8.w,
+                            width: 12.w,
+                            height: 12.w,
                             margin: EdgeInsets.symmetric(
-                            vertical: 10.w, horizontal: 2.w),
+                                 horizontal: 12.w),
                             decoration: BoxDecoration(
                               shape: BoxShape.circle,
                               color: _currentIndicator == index
-                              ? Color.fromRGBO(0, 0, 0, 0.9)
-                              : Color.fromRGBO(0, 0, 0, 0.4),
+                                  ? Color(0xFFFFC40C)
+                                  : Color(0xFFE8E8E8),
                             ),
                           );
                         }).toList(),
                       ),
-                ],
                     ),
+              ]),
             ),
             SizedBox(height: 16.w),
             //待办事项标题行

lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart

@@ -72,7 +72,7 @@ class InspectionManageCard {
               Row(
                 children: [
                   Image.asset(
-                    R.ASSETS_HOME_IC_NEWS_PNG,
+                    R.ASSETS_INSPECTION_IC_XUNJIAN_PNG,
                     width: 40.w,
                     height: 40.w,
                   ),

lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart';
 import 'package:aku_community_manager/mock_models/users/user_info_model.dart';
 import 'package:aku_community_manager/provider/user_provider.dart';
@@ -122,7 +124,12 @@ class _DecorationManagerDetailStatePage
           midBottom: widget.model.userHomeModel.detailAddr,
           name: '业主：' + widget.model.userHomeModel.userName,
           phone: widget.model.userHomeModel.phone,
-          rightTopWidget: Placeholder(),
+          rightTopWidget: Transform.rotate(
+            angle: pi/4,
+                      child: widget.model.statusType == DecorationStatusType.DONE
+                ? Image.asset(R.ASSETS_MANAGE_IC_WANCHENG_PNG)
+                : Image.asset(R.ASSETS_MANAGE_IC_ZHUANGXIU_PNG),
+          ),
         ),
         AkuBox.h(16),
         _buildInfoCard(

lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:aku_community_manager/const/resource.dart';
 import 'package:aku_community_manager/style/app_style.dart';
 import 'package:aku_community_manager/tools/widget_tool.dart';
@@ -70,7 +72,7 @@ class _VisitorManagerCardState extends State<VisitorManagerCard> {
                   Row(
                     children: [
                       Image.asset(
-                        R.ASSETS_USER_IC_PERSON_PNG,
+                        R.ASSETS_OUTDOOR_IC_PEOPLE_PNG,
                         width: 40.w,
                         height: 40.w,
                       ),
@@ -81,7 +83,7 @@ class _VisitorManagerCardState extends State<VisitorManagerCard> {
                       ),
                       AkuBox.w(137),
                       Image.asset(
-                        R.ASSETS_HOME_IC_BORROW_PNG,
+                        R.ASSETS_MANAGE_IC_CAR_PNG,
                         width: 40.w,
                         height: 40.w,
                       ),
@@ -97,7 +99,7 @@ class _VisitorManagerCardState extends State<VisitorManagerCard> {
                   Row(
                     children: [
                       Image.asset(
-                        R.ASSETS_HOME_IC_ARTICLE_PNG,
+                        R.ASSETS_MANAGE_IC_TIME_PNG,
                         width: 40.w,
                         height: 40.w,
                       ),
@@ -109,7 +111,13 @@ class _VisitorManagerCardState extends State<VisitorManagerCard> {
                 ],
               ),
               Positioned(
-                  left: 582.w, bottom: 104.w, child: _statusImage(_status)),
+                left: 552.w-24.w,
+                bottom: 75.w-28.w,
+                child: Transform.rotate(
+                  angle: pi / 4,
+                  child: Image.asset(_statusImage(_status),width: 140.w,height: 140.w,),
+                ),
+              ),
             ],
           ),
         ),
@@ -117,16 +125,16 @@ class _VisitorManagerCardState extends State<VisitorManagerCard> {
     );
   }
 
-  Widget _statusImage(VisitorStatus status) {
+  String _statusImage(VisitorStatus status) {
     switch (status) {
       case VisitorStatus.NOT_VISIT:
-        return Placeholder();
+        return R.ASSETS_MANAGE_IC_WEIDAO_PNG;
       case VisitorStatus.VISIT_DONE:
-        return Placeholder();
+        return R.ASSETS_MANAGE_IC_DAOFANG_PNG;
       case VisitorStatus.OUTDATE:
-        return Placeholder();
+        return R.ASSETS_MANAGE_IC_GUOQI_PNG;
       default:
-        return Placeholder();
+        return '';
     }
   }
 }

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.0+1
+version: 1.0.1+2
 
 environment:
   sdk: ">=2.7.0 <3.0.0"