Skip to content

HBHAndroid
HBHAndroid
Commit 06b0acb5 authored by 杨秀秀's avatar 杨秀秀
Browse files
Options

基础搭建 

功能开发
商户端店铺信息bug
parent 87cb65f6
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 54 deletions
.idea/workspace.xml
View file @ 06b0acb5
...@@ -9,7 +9,7 @@ ...@@ -9,7 +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;申请修改"> <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;隐私协议目的提示，通用询问">
<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" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" />
...@@ -20,17 +20,28 @@ ...@@ -20,17 +20,28 @@
<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/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$/consumer/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java" 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/java/com/xx/merchanthbh/ui/mine/MineViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_material_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_material_info.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hbhbcompany/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeViewModel.java" 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" /> <change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.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" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[34612fa7]" /> <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\Administrator\.android\avd\Pixel_2_API_30.avd]" />
<component name="ExternalProjectsData"> <component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$"> <projectState path="$PROJECT_DIR$">
<ProjectState /> <ProjectState />
...@@ -88,7 +99,7 @@ ...@@ -88,7 +99,7 @@
</option> </option>
</component> </component>
<component name="GenerateSignedApkSettings"> <component name="GenerateSignedApkSettings">
<option name="KEY_STORE_PATH" value="D:\work\key\consumer_hbh.jks" /> <option name="KEY_STORE_PATH" value="D:\work\key\merchant_hbh.jks" />
<option name="KEY_ALIAS" value="zoe" /> <option name="KEY_ALIAS" value="zoe" />
<option name="REMEMBER_PASSWORDS" value="true" /> <option name="REMEMBER_PASSWORDS" value="true" />
<option name="BUILD_TARGET_KEY" value="apk" /> <option name="BUILD_TARGET_KEY" value="apk" />
...@@ -96,7 +107,7 @@ ...@@ -96,7 +107,7 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
<map> <map>
<entry key="$PROJECT_DIR$" value="dev1.0.1" /> <entry key="$PROJECT_DIR$" value="dev1.0" />
</map> </map>
</option> </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
...@@ -117,9 +128,9 @@ ...@@ -117,9 +128,9 @@
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent"><![CDATA[{
"keyToString": { "keyToString": {
"ApkExportedModule": "HBHFurniture.consumer", "ApkExportedModule": "HBHFurniture.app",
"DEBUGGABLE_DEVICE": "oneplus-le2120-34612fa7", "DEBUGGABLE_DEVICE": "oneplus-le2120-34612fa7",
"DEBUGGABLE_PROCESS": "com.xx.hbhconsumer", "DEBUGGABLE_PROCESS": "com.xx.merchanthbh",
"DEBUGGER_ID": "Auto", "DEBUGGER_ID": "Auto",
"ExportApk.ApkPathForHBHFurniture.app": "D:\\work\\APK\\hbh", "ExportApk.ApkPathForHBHFurniture.app": "D:\\work\\APK\\hbh",
"ExportApk.ApkPathForHBHFurniture.consumer": "D:\\work\\APK\\hbh", "ExportApk.ApkPathForHBHFurniture.consumer": "D:\\work\\APK\\hbh",
...@@ -151,7 +162,7 @@ ...@@ -151,7 +162,7 @@
"com.google.services.firebase.aqiPopupShown": "true", "com.google.services.firebase.aqiPopupShown": "true",
"dart.analysis.tool.window.visible": "false", "dart.analysis.tool.window.visible": "false",
"last_directory_selection": "D:/androidProJect/HBHFurniture/hbhbcompany/src/main/res/mipmap-xhdpi", "last_directory_selection": "D:/androidProJect/HBHFurniture/hbhbcompany/src/main/res/mipmap-xhdpi",
"last_opened_file_path": "D:/androidProJect/CarEnter", "last_opened_file_path": "D:/work/key/merchant_hbh.jks",
"project.structure.last.edited": "Modules", "project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17", "project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2", "project.structure.side.proportion": "0.2",
...@@ -220,7 +231,7 @@ ...@@ -220,7 +231,7 @@
<recent name="com.xx.hbhbcompany.utils" /> <recent name="com.xx.hbhbcompany.utils" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Android App.consumer"> <component name="RunManager" selected="Android App.app">
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App"> <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="HBHFurniture.app.main" /> <module name="HBHFurniture.app.main" />
<option name="DEPLOY" value="true" /> <option name="DEPLOY" value="true" />
...@@ -463,20 +474,6 @@ ...@@ -463,20 +474,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1687161738436</updated> <updated>1687161738436</updated>
</task> </task>
<task id="LOCAL-00006" summary="&#10;功能开发&#10;1：完善用户信息的商户信息">
<created>1689071845317</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1689071845317</updated>
</task>
<task id="LOCAL-00007" summary="&#10;功能开发&#10;1：添加图片选择，文件上传">
<created>1689225928592</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1689225928592</updated>
</task>
<task id="LOCAL-00008" summary="基础功能&#10; 1：添加ADapter,Dialog 基础类&#10; &#10;功能开发&#10; 1：实现展位列表"> <task id="LOCAL-00008" summary="基础功能&#10; 1：添加ADapter,Dialog 基础类&#10; &#10;功能开发&#10; 1：实现展位列表">
<created>1689311863539</created> <created>1689311863539</created>
<option name="number" value="00008" /> <option name="number" value="00008" />
...@@ -806,7 +803,21 @@ ...@@ -806,7 +803,21 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1710984777261</updated> <updated>1710984777261</updated>
</task> </task>
<option name="localTasksCounter" value="55" /> <task id="LOCAL-00055" summary="基础搭建&#10;功能开发&#10;1.1.0">
<created>1712912554572</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1712912554572</updated>
</task>
<task id="LOCAL-00056" summary="基础搭建&#10;功能开发&#10;隐私协议目的提示，通用询问">
<created>1713149803668</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1713149803668</updated>
</task>
<option name="localTasksCounter" value="57" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
...@@ -839,8 +850,6 @@ ...@@ -839,8 +850,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业APP-商户审核流程粗略完成" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业APP-订单修改" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商品添加" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：商品添加" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户商品管理" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：商户商品管理" />
<MESSAGE value="基础搭建&#10;1:添加刷新加载控件&#10;功能开发&#10;1：企业商品管理列表" /> <MESSAGE value="基础搭建&#10;1:添加刷新加载控件&#10;功能开发&#10;1：企业商品管理列表" />
...@@ -864,7 +873,9 @@ ...@@ -864,7 +873,9 @@
<MESSAGE value="基础搭建&#10;功能开发&#10;1：bug 修复" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：bug 修复" />
<MESSAGE value="基础搭建&#10;功能开发&#10;合并1.0" /> <MESSAGE value="基础搭建&#10;功能开发&#10;合并1.0" />
<MESSAGE value="基础搭建&#10;功能开发&#10;申请修改" /> <MESSAGE value="基础搭建&#10;功能开发&#10;申请修改" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;申请修改" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1.1.0" />
<MESSAGE value="基础搭建&#10;功能开发&#10;隐私协议目的提示，通用询问" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;隐私协议目的提示，通用询问" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -901,7 +912,7 @@ ...@@ -901,7 +912,7 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line"> <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java</url> <url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java</url>
<line>173</line> <line>172</line>
<option name="timeStamp" value="509" /> <option name="timeStamp" value="509" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line"> <line-breakpoint enabled="true" type="java-line">
...@@ -984,6 +995,36 @@ ...@@ -984,6 +995,36 @@
<line>416</line> <line>416</line>
<option name="timeStamp" value="558" /> <option name="timeStamp" value="558" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>278</line>
<option name="timeStamp" value="559" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>286</line>
<option name="timeStamp" value="560" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>280</line>
<option name="timeStamp" value="561" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>282</line>
<option name="timeStamp" value="562" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>288</line>
<option name="timeStamp" value="568" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>290</line>
<option name="timeStamp" value="569" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line"> <line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt</url> <url>file://$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt</url>
<line>110</line> <line>110</line>
...@@ -1074,10 +1115,35 @@ ...@@ -1074,10 +1115,35 @@
<line>39</line> <line>39</line>
<option name="timeStamp" value="544" /> <option name="timeStamp" value="544" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>42</line>
<option name="timeStamp" value="563" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>43</line>
<option name="timeStamp" value="564" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>44</line>
<option name="timeStamp" value="565" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>45</line>
<option name="timeStamp" value="566" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>41</line>
<option name="timeStamp" value="567" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method"> <line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url> <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>190</line> <line>190</line>
<properties class="me.goldze.mvvmhabit.base.BaseViewModel" method="startPhotoPage"> <properties class="me.goldze.mvvmhabit.base.BaseViewModel">
<option name="WATCH_EXIT" value="false" /> <option name="WATCH_EXIT" value="false" />
</properties> </properties>
<option name="timeStamp" value="554" /> <option name="timeStamp" value="554" />
......
app/build.gradle
View file @ 06b0acb5
...@@ -57,7 +57,7 @@ android { ...@@ -57,7 +57,7 @@ android {
minifyEnabled false minifyEnabled false
debuggable true debuggable true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField "String", "URL", URL_DEBUG buildConfigField "String", "URL", URL_RELEASE
buildConfigField "String", "URL_H5", URL_DEBUG_H5 buildConfigField "String", "URL_H5", URL_DEBUG_H5
} }
} }
......
app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java
View file @ 06b0acb5
...@@ -219,7 +219,7 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> { ...@@ -219,7 +219,7 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
} }
} else { } else {
ToastUtils.showShort("版本已是最新！");
} }
......
app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiViewModel.java
View file @ 06b0acb5
...@@ -199,7 +199,6 @@ public class HuanBoHaiViewModel extends ListBaseViewModel<HuanBoHaiRequest> { ...@@ -199,7 +199,6 @@ public class HuanBoHaiViewModel extends ListBaseViewModel<HuanBoHaiRequest> {
} }
} else { } else {
ToastUtils.showShort("版本已是最新！");
} }
......
app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java
View file @ 06b0acb5
...@@ -153,7 +153,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> { ...@@ -153,7 +153,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
} else { } else {
/*强制更新标识位变更--重置用户登录*/ /*强制更新标识位变更--重置用户登录*/
StaticData.updateLogin = 1; StaticData.updateLogin = 1;
ToastUtils.showShort("版本已是最新！");
} }
...@@ -328,7 +327,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> { ...@@ -328,7 +327,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
} else { } else {
/*强制更新标识位变更--重置用户登录*/ /*强制更新标识位变更--重置用户登录*/
StaticData.updateLogin = 1; StaticData.updateLogin = 1;
ToastUtils.showShort("版本已是最新！");
} }
......
app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt
View file @ 06b0acb5
package com.xx.merchanthbh.ui.merchantinfo package com.xx.merchanthbh.ui.merchantinfo
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.View import android.view.View
import com.xx.merchanthbh.BR import com.xx.merchanthbh.BR
import com.xx.merchanthbh.R import com.xx.merchanthbh.R
...@@ -24,6 +25,30 @@ class MaterialInfoActivity : BaseActivity<ActivityMaterialInfoBinding, MerchantI ...@@ -24,6 +25,30 @@ class MaterialInfoActivity : BaseActivity<ActivityMaterialInfoBinding, MerchantI
super.initData() super.initData()
viewModel.adapter=AddBrankAdapter(this,1) viewModel.adapter=AddBrankAdapter(this,1)
binding.rvFrmBrankList.adapter= viewModel.adapter binding.rvFrmBrankList.adapter= viewModel.adapter
viewModel.brandVisibility.observe(this){
it->
if (it)
{
binding.llBrand.visibility=View.VISIBLE
}else{
binding.llBrand.visibility=View.GONE
}
}
viewModel.imgVisibility.observe(this){
it->
when(it)
{
0-> {}
1-> {binding.llBusinessLicense.visibility=View.VISIBLE }
2-> {binding.llBusinessLicense.visibility=View.GONE }
3-> {binding.llOperatingPermit.visibility=View.VISIBLE }
4-> {binding.llOperatingPermit.visibility=View.GONE }
}
}
viewModel.getMerchantInfo() viewModel.getMerchantInfo()
...@@ -39,6 +64,7 @@ class MaterialInfoActivity : BaseActivity<ActivityMaterialInfoBinding, MerchantI ...@@ -39,6 +64,7 @@ class MaterialInfoActivity : BaseActivity<ActivityMaterialInfoBinding, MerchantI
} }
} }
......
app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java
View file @ 06b0acb5
...@@ -3,6 +3,7 @@ package com.xx.merchanthbh.ui.merchantinfo; ...@@ -3,6 +3,7 @@ package com.xx.merchanthbh.ui.merchantinfo;
import android.app.Application; import android.app.Application;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
...@@ -60,6 +61,18 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -60,6 +61,18 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
public ObservableField<String> supervisors=new ObservableField<>(""); public ObservableField<String> supervisors=new ObservableField<>("");
//品牌是否显示
public MutableLiveData<Boolean> brandVisibility=new MutableLiveData<>(true);
/**
* 1:营业执照显示
* 2：营业执照隐藏
* 3：经营许可证显示
* 4：经营许可证隐藏
*/
public MutableLiveData<Integer> imgVisibility=new MutableLiveData<>(0);
public MutableLiveData<MerchantBean> merchantInfos=new MutableLiveData<>(); public MutableLiveData<MerchantBean> merchantInfos=new MutableLiveData<>();
public MerchantInfoViewModel(@NonNull Application application) { public MerchantInfoViewModel(@NonNull Application application) {
...@@ -131,6 +144,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -131,6 +144,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
public void addBrank(View view) public void addBrank(View view)
{ {
brandVisibility.postValue(true);
adapter.mList.add(new Brankbody(new ObservableField(""),new ArrayList(),null,true)); adapter.mList.add(new Brankbody(new ObservableField(""),new ArrayList(),null,true));
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
} }
...@@ -248,11 +262,34 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -248,11 +262,34 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
public void onSuccess(MerchantBean resultBean) { public void onSuccess(MerchantBean resultBean) {
merchantInfo.setMerchantInfo(resultBean); merchantInfo.setMerchantInfo(resultBean);
merchantInfos.postValue(resultBean); merchantInfos.postValue(resultBean);
adapter.mList=merchantInfo.reBrankbody(resultBean.getBrandAuthorizationList());
if (resultBean.getBrandAuthorizationList().size()<=0)
{
brandVisibility.postValue(false);
}else {
brandVisibility.postValue(true);
}
adapter.mList=merchantInfo.reBrankbody(resultBean.getBrandAuthorizationList());
supervisors.set( StringUtils.join(resultBean.getSupervisorsUserInfoList(),",",supervisorsUserInfo -> supervisorsUserInfo.getNickName())); supervisors.set( StringUtils.join(resultBean.getSupervisorsUserInfoList(),",",supervisorsUserInfo -> supervisorsUserInfo.getNickName()));
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
//营业执照图片
if (TextUtils.isEmpty(resultBean.getBusinessLicense()))
{
imgVisibility.setValue(2);
}else {
imgVisibility.setValue(1);
}
//营业许可证
if (TextUtils.isEmpty(resultBean.getOperatingPermit()))
{
imgVisibility.setValue(4);
}else {
imgVisibility.setValue(3);
}
} }
@Override @Override
......
app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java
View file @ 06b0acb5
...@@ -121,7 +121,7 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode ...@@ -121,7 +121,7 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
// 检查版本 // 检查版本
viewModel.rxPermissions = new RxPermissions(this); viewModel.rxPermissions = new RxPermissions(this);
/*检查版本*/ /*检查版本*/
viewModel.checkVersion(binding.getRoot().getRootView()); // viewModel.checkVersion(binding.getRoot().getRootView());
// 安装新版本 // 安装新版本
viewModel.openInstall.observe(this, new Observer<String>() { viewModel.openInstall.observe(this, new Observer<String>() {
......
app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java
View file @ 06b0acb5
...@@ -244,7 +244,11 @@ public class MineViewModel extends BaseViewModel<MineRequest> { ...@@ -244,7 +244,11 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
} }
} else { } else {
ToastUtils.showShort("版本已是最新！"); if (view!=null)
{
ToastUtils.showShort("版本已是最新！");
}
} }
...@@ -252,7 +256,6 @@ public class MineViewModel extends BaseViewModel<MineRequest> { ...@@ -252,7 +256,6 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
@Override @Override
public void onError(String Error) { public void onError(String Error) {
Log.e("归根究底的错误", "归根究底的错误: " + Error);
} }
}); });
} }
......
app/src/main/res/layout/activity_material_info.xml
View file @ 06b0acb5
...@@ -223,6 +223,7 @@ ...@@ -223,6 +223,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="134dp" android:layout_height="134dp"
android:paddingLeft="13dp" android:paddingLeft="13dp"
android:id="@+id/ll_business_license"
android:paddingRight="13dp" android:paddingRight="13dp"
android:background="#00000000"> android:background="#00000000">
...@@ -241,7 +242,6 @@ ...@@ -241,7 +242,6 @@
android:layout_width="106dp" android:layout_width="106dp"
android:layout_height="80dp" android:layout_height="80dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:onClick="@{viewModel.uploadPic}"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
pic_url="@{viewModel.merchantInfo.businessLicense}" pic_url="@{viewModel.merchantInfo.businessLicense}"
...@@ -264,6 +264,7 @@ ...@@ -264,6 +264,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="134dp" android:layout_height="134dp"
android:paddingLeft="13dp" android:paddingLeft="13dp"
android:id="@+id/ll_operating_permit"
android:paddingRight="13dp" android:paddingRight="13dp"
android:background="#00000000"> android:background="#00000000">
...@@ -284,7 +285,6 @@ ...@@ -284,7 +285,6 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
android:onClick="@{viewModel.uploadPic}"
pic_url="@{viewModel.merchantInfo.operatingPermit}" pic_url="@{viewModel.merchantInfo.operatingPermit}"
android:id="@+id/xup_frm_licence" android:id="@+id/xup_frm_licence"
android:layout_marginLeft="129dp" android:layout_marginLeft="129dp"
...@@ -302,6 +302,7 @@ ...@@ -302,6 +302,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="13dp" android:layout_marginTop="13dp"
android:background="@drawable/bg_white_radius_12" android:background="@drawable/bg_white_radius_12"
android:orientation="vertical"> android:orientation="vertical">
...@@ -335,12 +336,11 @@ ...@@ -335,12 +336,11 @@
android:text="添加品牌授权" android:text="添加品牌授权"
android:id="@+id/tv_ami_add_brand" android:id="@+id/tv_ami_add_brand"
android:textSize="16sp"/> android:textSize="16sp"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:id="@+id/ll_brand"
android:background="@color/line_grey" android:background="@color/line_grey"
android:layout_marginLeft="14dp" android:layout_marginLeft="14dp"
android:layout_marginRight="14dp"/> android:layout_marginRight="14dp"/>
......
consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java
View file @ 06b0acb5
...@@ -340,7 +340,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> { ...@@ -340,7 +340,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
} else { } else {
/*强制更新标识位变更--重置用户登录*/ /*强制更新标识位变更--重置用户登录*/
StaticData.updateLogin = 1; StaticData.updateLogin = 1;
ToastUtils.showShort("版本已是最新！");
} }
......
hbhbcompany/build.gradle
View file @ 06b0acb5
...@@ -59,7 +59,7 @@ android { ...@@ -59,7 +59,7 @@ android {
debug { debug {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField "String", "URL", URL_DEBUG buildConfigField "String", "URL", URL_RELEASE
buildConfigField "String", "URL_H5", URL_DEBUG_H5 buildConfigField "String", "URL_H5", URL_DEBUG_H5
} }
} }
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeViewModel.java
View file @ 06b0acb5
...@@ -178,7 +178,6 @@ public class HomeViewModel extends ListBaseViewModel<HomeRequest> { ...@@ -178,7 +178,6 @@ public class HomeViewModel extends ListBaseViewModel<HomeRequest> {
} }
} else { } else {
ToastUtils.showShort("版本已是最新！");
} }
} }
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java
View file @ 06b0acb5
...@@ -155,7 +155,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> { ...@@ -155,7 +155,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
/*强制更新标识位变更--重置用户登录*/ /*强制更新标识位变更--重置用户登录*/
StaticData.updateLogin = 1; StaticData.updateLogin = 1;
ToastUtils.showShort("版本已是最新！");
} }
...@@ -307,7 +306,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> { ...@@ -307,7 +306,6 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
} else { } else {
/*强制更新标识位变更--重置用户登录*/ /*强制更新标识位变更--重置用户登录*/
StaticData.updateLogin = 1; StaticData.updateLogin = 1;
ToastUtils.showShort("版本已是最新！");
} }
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineFragment.java
View file @ 06b0acb5
...@@ -104,8 +104,7 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode ...@@ -104,8 +104,7 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
super.onResume(); super.onResume();
// 检查版本 // 检查版本
viewModel.rxPermissions = new RxPermissions(this); viewModel.rxPermissions = new RxPermissions(this);
/*检查版本*/
viewModel.checkVersion(binding.getRoot().getRootView());
// 安装新版本 // 安装新版本
viewModel.openInstall.observe(this, new Observer<String>() { viewModel.openInstall.observe(this, new Observer<String>() {
@Override @Override
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineViewModel.java
View file @ 06b0acb5
...@@ -229,7 +229,11 @@ public class MineViewModel extends BaseViewModel<MineRequest> { ...@@ -229,7 +229,11 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
} }
} else { } else {
ToastUtils.showShort("版本已是最新！"); if(view!=null)
{
ToastUtils.showShort("版本已是最新！");
}
} }
} }
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.java
View file @ 06b0acb5
...@@ -139,7 +139,6 @@ public class WorkViewModel extends BaseViewModel<WorkRequest> { ...@@ -139,7 +139,6 @@ public class WorkViewModel extends BaseViewModel<WorkRequest> {
} }
} else { } else {
ToastUtils.showShort("版本已是最新！");
} }
} }
......
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