Skip to content

HBHAndroid
HBHAndroid
Commit 35e66d5a authored by 杨秀秀's avatar 杨秀秀
Browse files
Options

基础搭建 

功能开发
1：1.3.0
parent fad0dfe8
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 23 deletions
.idea/workspace.xml
View file @ 35e66d5a
...@@ -9,10 +9,7 @@ ...@@ -9,10 +9,7 @@
<option name="autoReloadType" value="NONE" /> <option name="autoReloadType" value="NONE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：1.2.0 提交版本"> <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：1.2.0 修复bug">
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ListSelectFragment.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/ListSelectFragment.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_list_select.xml" afterDir="false" />
<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/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.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" /> <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
...@@ -22,17 +19,8 @@ ...@@ -22,17 +19,8 @@
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/navEditor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/navEditor.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/requst/LoginRequest.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/requst/LoginRequest.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/RegisterMaterialFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/RegisterMaterialFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/navigation/nav_merchant_enter.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/navigation/nav_merchant_enter.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -474,13 +462,6 @@ ...@@ -474,13 +462,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1687161738436</updated> <updated>1687161738436</updated>
</task> </task>
<task id="LOCAL-00009" summary="基础功能&#10; 1：添加ADapter,Dialog 基础类&#10; &#10;功能开发&#10; 1：实现品牌">
<created>1689410667874</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1689410667874</updated>
</task>
<task id="LOCAL-00010" summary="基础功能&#10; 1：完善xxFormEdit&#10; &#10;功能开发&#10; 1：实现开店申请"> <task id="LOCAL-00010" summary="基础功能&#10; 1：完善xxFormEdit&#10; &#10;功能开发&#10; 1：实现开店申请">
<created>1689577788654</created> <created>1689577788654</created>
<option name="number" value="00010" /> <option name="number" value="00010" />
...@@ -817,7 +798,14 @@ ...@@ -817,7 +798,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1717047357049</updated> <updated>1717047357049</updated>
</task> </task>
<option name="localTasksCounter" value="58" /> <task id="LOCAL-00058" summary="基础搭建&#10;功能开发&#10;1：1.2.0 修复bug">
<created>1721786953754</created>
<option name="number" value="00058" />
<option name="presentableId" value="LOCAL-00058" />
<option name="project" value="LOCAL" />
<updated>1721786953754</updated>
</task>
<option name="localTasksCounter" value="59" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
...@@ -850,7 +838,6 @@ ...@@ -850,7 +838,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户商品管理" />
<MESSAGE value="基础搭建&#10;1:添加刷新加载控件&#10;功能开发&#10;1：企业商品管理列表" /> <MESSAGE value="基础搭建&#10;1:添加刷新加载控件&#10;功能开发&#10;1：企业商品管理列表" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：修复开店第一次使用bug" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：修复开店第一次使用bug" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业端-商品审核" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：企业端-商品审核" />
...@@ -875,7 +862,8 @@ ...@@ -875,7 +862,8 @@
<MESSAGE value="基础搭建&#10;功能开发&#10;1.1.0" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1.1.0" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：1.2.0 修复bug" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：1.2.0 修复bug" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment