基础搭建

功能开发
1：添加map总览页面 7.25

.idea/workspace.xml

@@ -11,11 +11,7 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：1.3.0">
-      <change afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapOverviewActivity.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapOverviewViewModel.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_map_overview.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/consumer/src/main/res/mipmap-mdpi/map_all.jpg" afterDir="false" />
+    <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：添加map总览页面 7.25">
       <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
@@ -27,18 +23,16 @@
       <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/consumer/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/consumer/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/home/HomeViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/home/HomeViewModel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapViewModel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_map_overview.xml" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_map_overview.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/consumer/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/res/values/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/res/values/strings.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\Administrator\.android\avd\Pixel_2_API_30.avd]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[34612fa7]" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -473,13 +467,6 @@
       <option name="presentableId" value="Default" />
       <updated>1687161738436</updated>
     </task>
-    <task id="LOCAL-00011" summary="&#10;功能开发&#10; 1：环渤海活动列表&#10; 2：等待审核页面">
-      <created>1689597940781</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1689597940781</updated>
-    </task>
     <task id="LOCAL-00012" summary="&#10;功能开发1.0正式">
       <created>1689659423560</created>
       <option name="number" value="00012" />
@@ -816,7 +803,14 @@
       <option name="project" value="LOCAL" />
       <updated>1721791048989</updated>
     </task>
-    <option name="localTasksCounter" value="60" />
+    <task id="LOCAL-00060" summary="基础搭建&#10;功能开发&#10;1：添加map总览页面 7.25">
+      <created>1721873461243</created>
+      <option name="number" value="00060" />
+      <option name="presentableId" value="LOCAL-00060" />
+      <option name="project" value="LOCAL" />
+      <updated>1721873461243</updated>
+    </task>
+    <option name="localTasksCounter" value="61" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -849,7 +843,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="基础搭建&#10;功能开发&#10;1：修复开店第一次使用bug" />
     <MESSAGE value="基础搭建&#10;功能开发&#10;1：企业端-商品审核" />
     <MESSAGE value="基础搭建&#10;功能开发&#10;1：商户-创建订单&#10;2：企业-修改身份逻辑" />
     <MESSAGE value="基础搭建&#10;功能开发&#10;1：商户-创建订单" />
@@ -874,7 +867,8 @@
     <MESSAGE value="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板" />
     <MESSAGE value="基础搭建&#10;功能开发&#10;1：1.2.0 修复bug" />
     <MESSAGE value="基础搭建&#10;功能开发&#10;1：1.3.0" />
-    <option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：1.3.0" />
+    <MESSAGE value="基础搭建&#10;功能开发&#10;1：添加map总览页面 7.25" />
+    <option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：添加map总览页面 7.25" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

consumer/src/main/res/layout/activity_map_overview.xml

@@ -17,7 +17,7 @@
         <com.xx.xxviewlibrary.witget.XxBar
             android:layout_width="match_parent"
             android:id="@+id/bar"
-            bar_title="布局图"
+            bar_title="@{@string/title_map_overview}"
             on_click="@{mapViewModel.clickFinish}"
             android:layout_height="wrap_content"/>
         <androidx.constraintlayout.widget.ConstraintLayout

consumer/src/main/res/values/strings.xml

@@ -198,6 +198,7 @@
     <string name="title_home">Home</string>
     <string name="title_dashboard">Dashboard</string>
     <string name="title_notifications">Notifications</string>
+    <string name="title_map_overview">布局图</string>
 
     <string name="add_product">添加商品</string>
     <string name="product_num">商品编号</string>

hbhbcompany/src/main/res/values/strings.xml

@@ -40,7 +40,7 @@
 
     <string name="prize_accept">赠品领取</string>
 
-
+    <style name="title_map_overview">布局图</style>
 
     <!--订单管理-->
     <!--订单管理  订单编号-->