Skip to content

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

Merge remote-tracking branch 'origin/dev1.0' into dev1.0.1 

# Conflicts:
#	.idea/workspace.xml
#	app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java
parents d6cd65b6 0fcbf78a
Hide whitespace changes
Inline Side-by-side
Showing with 469 additions and 158 deletions
.idea/workspace.xml
View file @ ea1d9555
...@@ -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;1：bug 修复"> <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" />
...@@ -18,16 +18,31 @@ ...@@ -18,16 +18,31 @@
<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/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08__Changes_.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/src/main/java/com/xx/merchanthbh/data/http/ApiService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/ApiService.kt" 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/addproduct/AddProductViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/addproduct/AddProductViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/staticdata/StaticData.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/staticdata/StaticData.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeActivity.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/bg_forground_radius_no_24.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_forground_radius_no_24.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java" 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$/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/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/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/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginActivity.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/recruit/RecruitDetailActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/recruit/RecruitDetailActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_credits_exchange.xml" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_credits_exchange.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/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealEditViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealEditViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealHandleViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealHandleViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java" 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$/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$/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$/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$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java" afterDir="false" />
...@@ -95,7 +110,7 @@ ...@@ -95,7 +110,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" />
...@@ -103,7 +118,7 @@ ...@@ -103,7 +118,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" /> <entry key="$PROJECT_DIR$" value="dev1.0.1" />
</map> </map>
</option> </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
...@@ -122,56 +137,56 @@ ...@@ -122,56 +137,56 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;ApkExportedModule&quot;: &quot;HBHFurniture.consumer&quot;, "ApkExportedModule": "HBHFurniture.app",
&quot;DEBUGGABLE_DEVICE&quot;: &quot;huawei-tas_an00-XPL0219C19001938&quot;, "DEBUGGABLE_DEVICE": "oneplus-le2120-34612fa7",
&quot;DEBUGGABLE_PROCESS&quot;: &quot;com.xx.hbhbcompany&quot;, "DEBUGGABLE_PROCESS": "com.xx.hbhconsumer",
&quot;DEBUGGER_ID&quot;: &quot;Auto&quot;, "DEBUGGER_ID": "Auto",
&quot;ExportApk.ApkPathForHBHFurniture.app&quot;: &quot;D:\\androidProJect\\HBHFurniture\\app&quot;, "ExportApk.ApkPathForHBHFurniture.app": "D:\\work\\APK\\hbh",
&quot;ExportApk.ApkPathForHBHFurniture.consumer&quot;: &quot;D:\\androidProJect\\HBHFurniture\\consumer&quot;, "ExportApk.ApkPathForHBHFurniture.consumer": "D:\\work\\APK\\hbh",
&quot;ExportApk.ApkPathForHBHFurniture.hbhbcompany&quot;: &quot;D:\\androidProJect\\HBHFurniture\\hbhbcompany&quot;, "ExportApk.ApkPathForHBHFurniture.hbhbcompany": "D:\\work\\APK\\hbh",
&quot;ResourceManagerPrefKey.ModuleName&quot;: &quot;HBHFurniture.hbhbcompany.main&quot;, "ResourceManagerPrefKey.ModuleName": "HBHFurniture.hbhbcompany.main",
&quot;ResourceManagerPrefKey.ResourceType&quot;: &quot;MIPMAP&quot;, "ResourceManagerPrefKey.ResourceType": "MIPMAP",
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;, "RunOnceActivity.cidr.known.project.marker": "true",
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;, "SHARE_PROJECT_CONFIGURATION_FILES": "true",
&quot;SHOW_ALL_PROCESSES&quot;: &quot;false&quot;, "SHOW_ALL_PROCESSES": "false",
&quot;android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.4.1/f9e48179ea0c6ac0080a277b9383f74523f56aa2/appcompat-1.4.1-sources.jar!/androidx/appcompat/widget/Toolbar.java_SELECTED&quot;: &quot;Toolbar&quot;, "android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.4.1/f9e48179ea0c6ac0080a277b9383f74523f56aa2/appcompat-1.4.1-sources.jar!/androidx/appcompat/widget/Toolbar.java_SELECTED": "Toolbar",
&quot;android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.1.0/f2bdf79e1977939817f54a9d3e2f6bc52b63bdd0/recyclerview-1.1.0-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED&quot;: &quot;RecyclerView&quot;, "android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.1.0/f2bdf79e1977939817f54a9d3e2f6bc52b63bdd0/recyclerview-1.1.0-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
&quot;android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.github.bingoogolapple.BGAQRCode-Android/zxing/1.3.8/c86efa3276c4b0dc4ae2e46d99d3866740c9a58/zxing-1.3.8-sources.jar!/cn/bingoogolapple/qrcode/zxing/ZXingView.java_SELECTED&quot;: &quot;ZXingView&quot;, "android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.github.bingoogolapple.BGAQRCode-Android/zxing/1.3.8/c86efa3276c4b0dc4ae2e46d99d3866740c9a58/zxing-1.3.8-sources.jar!/cn/bingoogolapple/qrcode/zxing/ZXingView.java_SELECTED": "ZXingView",
&quot;android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.4.0-beta01/4609f0eac57d146f2f30d34a6288a469235a32ca/material-1.4.0-beta01-sources.jar!/com/google/android/material/tabs/TabLayout.java_SELECTED&quot;: &quot;TabLayout&quot;, "android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.4.0-beta01/4609f0eac57d146f2f30d34a6288a469235a32ca/material-1.4.0-beta01-sources.jar!/com/google/android/material/tabs/TabLayout.java_SELECTED": "TabLayout",
&quot;android-custom-viewC:/Users/Administrator/.gradle/wrapper/dists/gradle-6.1.1-all/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.1.0/f2bdf79e1977939817f54a9d3e2f6bc52b63bdd0/recyclerview-1.1.0-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED&quot;: &quot;RecyclerView&quot;, "android-custom-viewC:/Users/Administrator/.gradle/wrapper/dists/gradle-6.1.1-all/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.1.0/f2bdf79e1977939817f54a9d3e2f6bc52b63bdd0/recyclerview-1.1.0-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/app/src/main/java/com/xx/merchanthbh/widget/RegisterStepLayout.kt_SELECTED&quot;: &quot;RegisterStepLayout&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/app/src/main/java/com/xx/merchanthbh/widget/RegisterStepLayout.kt_SELECTED": "RegisterStepLayout",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/dsbridge/src/main/java/wendu/dsbridge/DWebView.java_SELECTED&quot;: &quot;DWebView&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/dsbridge/src/main/java/wendu/dsbridge/DWebView.java_SELECTED": "DWebView",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/hbhbcompany/src/main/java/com/xx/hbhbcompany/widget/AuditStepLayout.kt_SELECTED&quot;: &quot;AuditStepLayout&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/hbhbcompany/src/main/java/com/xx/hbhbcompany/widget/AuditStepLayout.kt_SELECTED": "AuditStepLayout",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxBar.kt_SELECTED&quot;: &quot;XxBar&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxBar.kt_SELECTED": "XxBar",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxFormEdit.kt_SELECTED&quot;: &quot;XxFormEdit&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxFormEdit.kt_SELECTED": "XxFormEdit",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxUploudPic.kt_SELECTED&quot;: &quot;XxUploudPic&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxUploudPic.kt_SELECTED": "XxUploudPic",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxBar.kt_SELECTED&quot;: &quot;XxBar&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxBar.kt_SELECTED": "XxBar",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxFormEdit.kt_SELECTED&quot;: &quot;XxFormEdit&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxFormEdit.kt_SELECTED": "XxFormEdit",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPic.kt_SELECTED&quot;: &quot;XxUploudPic&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPic.kt_SELECTED": "XxUploudPic",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt_SELECTED&quot;: &quot;XxUploudPicSmall&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt_SELECTED": "XxUploudPicSmall",
&quot;android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/model/XxUploudPicSmall.kt_SELECTED&quot;: &quot;XxUploudPicSmall&quot;, "android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/model/XxUploudPicSmall.kt_SELECTED": "XxUploudPicSmall",
&quot;cidr.known.project.marker&quot;: &quot;true&quot;, "cidr.known.project.marker": "true",
&quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;, "com.google.services.firebase.aqiPopupShown": "true",
&quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;, "dart.analysis.tool.window.visible": "false",
&quot;last_directory_selection&quot;: &quot;D:/androidProJect/HBHFurniture/hbhbcompany/src/main/res/mipmap-xhdpi&quot;, "last_directory_selection": "D:/androidProJect/HBHFurniture/hbhbcompany/src/main/res/mipmap-xhdpi",
&quot;last_opened_file_path&quot;: &quot;D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi&quot;, "last_opened_file_path": "D:/androidProJect/CarControl_company-master",
&quot;project.structure.last.edited&quot;: &quot;Modules&quot;, "project.structure.last.edited": "Modules",
&quot;project.structure.proportion&quot;: &quot;0.17&quot;, "project.structure.proportion": "0.17",
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;, "project.structure.side.proportion": "0.2",
&quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;, "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle",
&quot;show.do.not.copy.http.proxy.settings.to.gradle&quot;: &quot;true&quot;, "show.do.not.copy.http.proxy.settings.to.gradle": "true",
&quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot; "show.migrate.to.gradle.popup": "false"
}, },
&quot;keyToStringList&quot;: { "keyToStringList": {
&quot;ExportApk.BuildVariants&quot;: [ "ExportApk.BuildVariants": [
&quot;release&quot; "release"
] ]
} }
}</component> }]]></component>
<component name="PsdUISettings"> <component name="PsdUISettings">
<option name="MODULE_TAB" value="Default Config" /> <option name="MODULE_TAB" value="Default Config" />
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" /> <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
...@@ -227,7 +242,7 @@ ...@@ -227,7 +242,7 @@
<recent name="com.xx.hbhbcompany.utils" /> <recent name="com.xx.hbhbcompany.utils" />
</key> </key>
</component> </component>
<component name="RunManager"> <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" />
...@@ -470,13 +485,6 @@ ...@@ -470,13 +485,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1687161738436</updated> <updated>1687161738436</updated>
</task> </task>
<task id="LOCAL-00005" summary="&#10;功能开发&#10;1：完善用户信息的商户信息">
<created>1689057289295</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1689057289295</updated>
</task>
<task id="LOCAL-00006" summary="&#10;功能开发&#10;1：完善用户信息的商户信息"> <task id="LOCAL-00006" summary="&#10;功能开发&#10;1：完善用户信息的商户信息">
<created>1689071845317</created> <created>1689071845317</created>
<option name="number" value="00006" /> <option name="number" value="00006" />
...@@ -813,7 +821,14 @@ ...@@ -813,7 +821,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1700703581527</updated> <updated>1700703581527</updated>
</task> </task>
<option name="localTasksCounter" value="54" /> <task id="LOCAL-00054" summary="基础搭建&#10;功能开发&#10;合并1.0">
<created>1710984777261</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1710984777261</updated>
</task>
<option name="localTasksCounter" value="55" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
...@@ -827,7 +842,7 @@ ...@@ -827,7 +842,7 @@
<entry key="branch"> <entry key="branch">
<value> <value>
<list> <list>
<option value="dev_xf_" /> <option value="dev1.0" />
</list> </list>
</value> </value>
</entry> </entry>
...@@ -846,8 +861,6 @@ ...@@ -846,8 +861,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户审核列表" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户审核-督导审核-店铺信息" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业APP-商户审核流程粗略完成" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：企业APP-商户审核流程粗略完成" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业APP-订单修改" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：企业APP-订单修改" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商品添加" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：商品添加" />
...@@ -871,9 +884,228 @@ ...@@ -871,9 +884,228 @@
<MESSAGE value="基础搭建&#10;功能开发&#10;1：完善企业端商户审核" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：完善企业端商户审核" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：bug 修复 修改品牌逻辑" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：bug 修复 修改品牌逻辑" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：bug 修复" /> <MESSAGE value="基础搭建&#10;功能开发&#10;1：bug 修复" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：bug 修复" /> <MESSAGE value="基础搭建&#10;功能开发&#10;合并1.0" />
<MESSAGE value="基础搭建&#10;功能开发&#10;申请修改" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;申请修改" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>75</line>
<option name="timeStamp" value="479" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>220</line>
<option name="timeStamp" value="481" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>256</line>
<option name="timeStamp" value="499" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>229</line>
<option name="timeStamp" value="502" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java</url>
<line>205</line>
<option name="timeStamp" value="507" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java</url>
<line>104</line>
<option name="timeStamp" value="508" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java</url>
<line>173</line>
<option name="timeStamp" value="509" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java</url>
<line>340</line>
<option name="timeStamp" value="510" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeallist/AppealListViewModel.java</url>
<line>51</line>
<option name="timeStamp" value="515" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreateViewModel.java</url>
<line>173</line>
<option name="timeStamp" value="521" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java</url>
<line>337</line>
<option name="timeStamp" value="524" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java</url>
<line>338</line>
<option name="timeStamp" value="525" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java</url>
<line>369</line>
<option name="timeStamp" value="527" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayViewModel.java</url>
<line>241</line>
<option name="timeStamp" value="545" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayViewModel.java</url>
<line>248</line>
<option name="timeStamp" value="547" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXEntryActivity.java</url>
<line>53</line>
<option name="timeStamp" value="549" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/addproduct/AddProductViewModel.java</url>
<line>123</line>
<option name="timeStamp" value="550" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>214</line>
<option name="timeStamp" value="551" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java</url>
<line>225</line>
<option name="timeStamp" value="553" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>195</line>
<option name="timeStamp" value="555" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java</url>
<line>359</line>
<option name="timeStamp" value="556" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java</url>
<line>362</line>
<option name="timeStamp" value="557" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java</url>
<line>364</line>
<option name="timeStamp" value="558" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt</url>
<line>110</line>
<option name="timeStamp" value="488" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt</url>
<line>95</line>
<option name="timeStamp" value="489" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/utils/AddImgAdapter.kt</url>
<line>76</line>
<option name="timeStamp" value="493" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/RegisterMaterialFragment.kt</url>
<line>54</line>
<option name="timeStamp" value="511" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeallist/AppealListAdapter.kt</url>
<line>69</line>
<option name="timeStamp" value="513" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeallist/AppealListAdapter.kt</url>
<line>74</line>
<option name="timeStamp" value="514" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderProductAdapter.kt</url>
<line>39</line>
<option name="timeStamp" value="516" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderProductAdapter.kt</url>
<line>40</line>
<option name="timeStamp" value="517" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderProductAdapter.kt</url>
<line>43</line>
<option name="timeStamp" value="518" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderProductAdapter.kt</url>
<line>45</line>
<option name="timeStamp" value="519" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/userinfo/UserInfoActivity.kt</url>
<line>25</line>
<option name="timeStamp" value="531" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/userinfo/UserInfoActivity.kt</url>
<line>23</line>
<option name="timeStamp" value="532" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/web/CommWabActivity.kt</url>
<line>30</line>
<option name="timeStamp" value="533" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/web/CommWabActivity.kt</url>
<line>26</line>
<option name="timeStamp" value="535" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/web/CommWabActivity.kt</url>
<line>27</line>
<option name="timeStamp" value="536" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/web/CommWabActivity.kt</url>
<line>28</line>
<option name="timeStamp" value="537" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/prize/PrizeActivity.kt</url>
<line>22</line>
<option name="timeStamp" value="543" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/scan/ScanActivity.kt</url>
<line>39</line>
<option name="timeStamp" value="544" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>190</line>
<properties class="me.goldze.mvvmhabit.base.BaseViewModel" method="startPhotoPage">
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="554" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<pin-to-top-manager> <pin-to-top-manager>
<pinned-members> <pinned-members>
<PinnedItemInfo parentTag="com.xx.hbhbcompany.data.http.respons.AppealListBean$ocations" memberName="businessId" /> <PinnedItemInfo parentTag="com.xx.hbhbcompany.data.http.respons.AppealListBean$ocations" memberName="businessId" />
......
app/build.gradle
View file @ ea1d9555
...@@ -6,11 +6,11 @@ plugins { ...@@ -6,11 +6,11 @@ plugins {
def URL_DEBUG="\"http://49.232.201.130:8004/\"" def URL_DEBUG="\"http://49.232.201.130:8004/\""
def URL_RELEASE="\"https://hbhapp.cn/api/\"" def URL_RELEASE="\"https://www.hbhapp.cn/api/\""
def URL_DEBUG_H5="\"http://49.232.201.130:7005\"" def URL_DEBUG_H5="\"http://49.232.201.130:7005\""
def URL_RELEASE_H5="\"https://hbhapp.cn\"" def URL_RELEASE_H5="\"https://www.hbhapp.cn\""
android { android {
......
app/src/main/java/com/xx/merchanthbh/ui/addproduct/AddProductViewModel.java
View file @ ea1d9555
...@@ -137,7 +137,7 @@ public class AddProductViewModel extends BaseViewModel<AddProductRequest> { ...@@ -137,7 +137,7 @@ public class AddProductViewModel extends BaseViewModel<AddProductRequest> {
} }
startPhotoPage(true, max, new SelectCallback() { startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于添加商品图片时读取和写入相册和文件内容", new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>(); List<File> fList = new ArrayList<>();
......
app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java
View file @ ea1d9555
...@@ -202,7 +202,7 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> { ...@@ -202,7 +202,7 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
} }
startPhotoPage(true, max, new SelectCallback() { startPhotoPage(true, max, "申请的是摄像头和照片视频读取权限，用于在诉求场景中读取和写入相册和文件内容",new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>(); List<File> fList = new ArrayList<>();
......
app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealViewModel.java
View file @ ea1d9555
...@@ -138,7 +138,7 @@ public class AppealViewModel extends BaseViewModel<AppealRequest> { ...@@ -138,7 +138,7 @@ public class AppealViewModel extends BaseViewModel<AppealRequest> {
} }
startPhotoPage(true, max, new SelectCallback() { startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于在添诉求场景中读取和写入相册和文件内容",new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>(); List<File> fList = new ArrayList<>();
......
app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
View file @ ea1d9555
...@@ -52,11 +52,6 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() { ...@@ -52,11 +52,6 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
} }
var agreementContext: String = "" var agreementContext: String = ""
override fun onStart() {
super.onStart()
}
override fun initData() { override fun initData() {
//检查版本 //检查版本
...@@ -64,7 +59,6 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() { ...@@ -64,7 +59,6 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
// 获得协议内容 // 获得协议内容
viewModel.getProtocols() viewModel.getProtocols()
SPUtils.getInstance().clear() SPUtils.getInstance().clear()
super.initData() super.initData()
/*强制更新标识位变更--重置用户登录*/ /*强制更新标识位变更--重置用户登录*/
StaticData.updateLogin = 1 StaticData.updateLogin = 1
...@@ -127,25 +121,25 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() { ...@@ -127,25 +121,25 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
if (viewModel.isAgree) if (viewModel.isAgree)
{ {
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze2)) binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze2))
}else{ } else {
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze1)) binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze1))
} }
binding.ivLoginAgreement.setOnClickListener() binding.ivLoginAgreement.setOnClickListener()
{ {
if (viewModel.isAgree) if (viewModel.isAgree) {
{ viewModel.isAgree = false
viewModel.isAgree=false
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze1)) binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze1))
}else{ } else {
viewModel.isAgree=true viewModel.isAgree = true
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze2)) binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze2))
} }
} }
var sp:SpannableStringBuilder= SpannableStringBuilder("我已阅读并同意《用户协议》、《隐私条款》") var sp: SpannableStringBuilder =
SpannableStringBuilder("我已阅读并同意《用户协议》、《隐私条款》")
// sp.setSpan(ForegroundColorSpan(getColor(R.color.text_grey_blue)),7,20,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) // sp.setSpan(ForegroundColorSpan(getColor(R.color.text_grey_blue)),7,20,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
binding.tvLoginAgree.setMovementMethod(LinkMovementMethod.getInstance()); binding.tvLoginAgree.setMovementMethod(LinkMovementMethod.getInstance());
binding.tvLoginAgree.setHighlightColor(0) binding.tvLoginAgree.setHighlightColor(0)
...@@ -154,9 +148,8 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() { ...@@ -154,9 +148,8 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
override fun onClick(view: View) { override fun onClick(view: View) {
if (StaticData.Protocols.size>=5) if (StaticData.Protocols.size >= 5) {
{ var bundle: Bundle = Bundle();
var bundle:Bundle= Bundle();
bundle.putString("title", "用户协议") bundle.putString("title", "用户协议")
bundle.putString("URL", RetrofitClient.baseH5Url + StaticData.Protocols.get(4)) bundle.putString("URL", RetrofitClient.baseH5Url + StaticData.Protocols.get(4))
startActivity(CommWabActivity::class.java, bundle) startActivity(CommWabActivity::class.java, bundle)
...@@ -166,17 +159,16 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() { ...@@ -166,17 +159,16 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
override fun updateDrawState(ds: TextPaint) { override fun updateDrawState(ds: TextPaint) {
ds.setColor(getColor(R.color.text_grey_blue)) ds.setColor(getColor(R.color.text_grey_blue))
ds.isUnderlineText=false ds.isUnderlineText = false
} }
},7,13,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) }, 7, 13, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
sp.setSpan(object : ClickableSpan() { sp.setSpan(object : ClickableSpan() {
override fun onClick(view: View) { override fun onClick(view: View) {
if (StaticData.Protocols.size>=3) if (StaticData.Protocols.size >= 3) {
{ var bundle: Bundle = Bundle();
var bundle:Bundle= Bundle();
bundle.putString("title", "隐私条款") bundle.putString("title", "隐私条款")
bundle.putString("URL", RetrofitClient.baseH5Url + StaticData.Protocols.get(2)) bundle.putString("URL", RetrofitClient.baseH5Url + StaticData.Protocols.get(2))
startActivity(CommWabActivity::class.java, bundle) startActivity(CommWabActivity::class.java, bundle)
...@@ -185,12 +177,12 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() { ...@@ -185,12 +177,12 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
override fun updateDrawState(ds: TextPaint) { override fun updateDrawState(ds: TextPaint) {
ds.setColor(getColor(R.color.text_grey_blue)) ds.setColor(getColor(R.color.text_grey_blue))
ds.isUnderlineText=false ds.isUnderlineText = false
} }
},14,20,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) }, 14, 20, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
binding.tvLoginAgree.text=sp binding.tvLoginAgree.text = sp
} }
...@@ -200,7 +192,7 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() { ...@@ -200,7 +192,7 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
override fun initViewModel(): LoginViewModel { override fun initViewModel(): LoginViewModel {
val lm: LoginRequest = LoginRequest() val lm: LoginRequest = LoginRequest()
return LoginViewModel(application,lm) return LoginViewModel(application, lm)
} }
} }
\ No newline at end of file
app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java
View file @ ea1d9555
...@@ -89,7 +89,7 @@ public class AddBrankViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -89,7 +89,7 @@ public class AddBrankViewModel extends BaseViewModel<MerchantEnterRequst> {
} }
startPhotoPage(true, max, new SelectCallback() { startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于在添加品牌时读取和写入相册和文件内容", new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>(); List<File> fList = new ArrayList<>();
......
app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java
View file @ ea1d9555
...@@ -133,7 +133,7 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -133,7 +133,7 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> {
public BindingCommand getPhoto = new BindingCommand(new BindingAction() { public BindingCommand getPhoto = new BindingCommand(new BindingAction() {
@Override @Override
public void call() { public void call() {
startPhotoPage(true, new SelectCallback() { startPhotoPage(true, "申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容",new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
...@@ -438,7 +438,7 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -438,7 +438,7 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> {
public void uploadPic(View view) public void uploadPic(View view)
{ {
//选择图片 //选择图片
startPhotoPage(true, new SelectCallback() { startPhotoPage(true,"申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容", new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
model.upLoadFile(new File(photos.get(0).path)).compose(RxUtils.schedulersTransformer()) //线程调度 model.upLoadFile(new File(photos.get(0).path)).compose(RxUtils.schedulersTransformer()) //线程调度
......
app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java
View file @ ea1d9555
...@@ -81,7 +81,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -81,7 +81,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
public BindingCommand getPhoto = new BindingCommand(new BindingAction() { public BindingCommand getPhoto = new BindingCommand(new BindingAction() {
@Override @Override
public void call() { public void call() {
startPhotoPage(true, new SelectCallback() { startPhotoPage(true, "申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容",new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
...@@ -143,7 +143,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -143,7 +143,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
public void uploadPic(View view) public void uploadPic(View view)
{ {
//选择图片 //选择图片
startPhotoPage(true, new SelectCallback() { startPhotoPage(true,"申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容", new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
model.upLoadFile(new File(photos.get(0).path)).compose(RxUtils.schedulersTransformer()) //线程调度 model.upLoadFile(new File(photos.get(0).path)).compose(RxUtils.schedulersTransformer()) //线程调度
......
app/src/main/res/layout/activity_material_info.xml
View file @ ea1d9555
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
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.bigPic}" 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}"
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
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.bigPic}" 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"
......
consumer/build.gradle
View file @ ea1d9555
...@@ -6,11 +6,11 @@ plugins { ...@@ -6,11 +6,11 @@ plugins {
def URL_DEBUG="\"http://49.232.201.130:8004/\"" def URL_DEBUG="\"http://49.232.201.130:8004/\""
def URL_RELEASE="\"https://hbhapp.cn/api/\"" def URL_RELEASE="\"https://www.hbhapp.cn/api/\""
def URL_DEBUG_H5="\"http://49.232.201.130:7005\"" def URL_DEBUG_H5="\"http://49.232.201.130:7005\""
def URL_RELEASE_H5="\"https://hbhapp.cn\"" def URL_RELEASE_H5="\"https://www.hbhapp.cn\""
android { android {
signingConfigs { signingConfigs {
......
consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java
View file @ ea1d9555
...@@ -145,7 +145,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> { ...@@ -145,7 +145,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
@Override @Override
public void call() { public void call() {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("basic", "8"); bundle.putString("basic", "14");
bundle.putString("basicName", "隐私条款"); bundle.putString("basicName", "隐私条款");
startActivity(UserAgreementActivity.class, bundle); startActivity(UserAgreementActivity.class, bundle);
} }
......
consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java
View file @ ea1d9555
...@@ -109,7 +109,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> { ...@@ -109,7 +109,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
}); });
public void choosePhoto() { public void choosePhoto() {
startPhotoPage(true, new SelectCallback() { startPhotoPage(true,"申请的是摄像头和照片视频读取权限，用于设置头像", new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
file = new File(photos.get(0).path); file = new File(photos.get(0).path);
...@@ -223,7 +223,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> { ...@@ -223,7 +223,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
} }
public void takePhoto() { public void takePhoto() {
startPhotoPage(true, new SelectCallback() { startPhotoPage(true, "申请的是摄像头和照片视频读取权限，用于个人头像维护中读取和写入相册和文件内容",new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
......
consumer/src/main/java/com/xx/hbhconsumer/ui/recruit/RecruitDetailActivity.java
View file @ ea1d9555
...@@ -101,6 +101,7 @@ public class RecruitDetailActivity extends BaseActivity<ActivityRecruitDetailBin ...@@ -101,6 +101,7 @@ public class RecruitDetailActivity extends BaseActivity<ActivityRecruitDetailBin
Manifest.permission.READ_EXTERNAL_STORAGE);//缺少什么权限就写什么权限 Manifest.permission.READ_EXTERNAL_STORAGE);//缺少什么权限就写什么权限
if (permission != PackageManager.PERMISSION_GRANTED) { if (permission != PackageManager.PERMISSION_GRANTED) {
// We don't have permission so prompt the user // We don't have permission so prompt the user
ToastUtils.showShort("申请的是文件读取权限，用于投递简历");
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,}, 0); ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,}, 0);
} }
int permission2 = ActivityCompat.checkSelfPermission(this, int permission2 = ActivityCompat.checkSelfPermission(this,
......
consumer/src/main/res/layout/activity_credits_exchange.xml
View file @ ea1d9555
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:layout_marginLeft="17dp" android:layout_marginLeft="17dp"
android:layout_marginTop="31dp" android:layout_marginTop="31dp"
android:lineSpacingExtra="10dp" android:lineSpacingExtra="10dp"
android:text="为你推荐" android:text="精选商品"
android:textColor="#FF333333" android:textColor="#FF333333"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold" />
......
consumer/src/main/res/values/strings.xml
View file @ ea1d9555
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<string name="shop_navigation">店内导航</string> <string name="shop_navigation">店内导航</string>
<string name="shop_services">门店服务</string> <string name="shop_services">门店服务</string>
<string name="low_priced_goods">低价好物</string> <string name="low_priced_goods">低价好物</string>
<string name="guess_like">猜你喜欢</string> <string name="guess_like">每日精选</string>
<string name="more">更多</string> <string name="more">更多</string>
<string name="coupon_collection">优惠券领取</string> <string name="coupon_collection">优惠券领取</string>
<!--首页模块 店员管理--> <!--首页模块 店员管理-->
......
hbhbcompany/build.gradle
View file @ ea1d9555
...@@ -6,11 +6,11 @@ plugins { ...@@ -6,11 +6,11 @@ plugins {
def URL_DEBUG="\"http://49.232.201.130:8004/\"" def URL_DEBUG="\"http://49.232.201.130:8004/\""
def URL_RELEASE="\"https://hbhapp.cn/api/\"" def URL_RELEASE="\"https://www.hbhapp.cn/api/\""
def URL_DEBUG_H5="\"http://49.232.201.130:7005\"" def URL_DEBUG_H5="\"http://49.232.201.130:7005\""
def URL_RELEASE_H5="\"https://hbhapp.cn\"" def URL_RELEASE_H5="\"https://www.hbhapp.cn\""
android { android {
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealEditViewModel.java
View file @ ea1d9555
...@@ -206,7 +206,7 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> { ...@@ -206,7 +206,7 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
} }
startPhotoPage(true, max, new SelectCallback() { startPhotoPage(true, max, "申请的是摄像头和照片视频读取权限，用于在添诉求场景中读取和写入相册和文件内容",new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>(); List<File> fList = new ArrayList<>();
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealHandleViewModel.java
View file @ ea1d9555
...@@ -255,7 +255,7 @@ public class AppealHandleViewModel extends BaseViewModel<AppealRequest> { ...@@ -255,7 +255,7 @@ public class AppealHandleViewModel extends BaseViewModel<AppealRequest> {
} }
startPhotoPage(true, max, new SelectCallback() { startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于诉求场景中读取和写入相册和文件内容", new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>(); List<File> fList = new ArrayList<>();
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealViewModel.java
View file @ ea1d9555
...@@ -115,7 +115,7 @@ public class AppealViewModel extends BaseViewModel<AppealRequest> { ...@@ -115,7 +115,7 @@ public class AppealViewModel extends BaseViewModel<AppealRequest> {
} }
startPhotoPage(true, max, new SelectCallback() { startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于在添诉求场景中读取和写入相册和文件内容", new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>(); List<File> fList = new ArrayList<>();
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java
View file @ ea1d9555
...@@ -540,7 +540,7 @@ public class QualityAuditInfoViewModel extends BaseViewModel<QualityAuditRequst> ...@@ -540,7 +540,7 @@ public class QualityAuditInfoViewModel extends BaseViewModel<QualityAuditRequst>
public void changeLogo(View view ) public void changeLogo(View view )
{ {
startPhotoPage(false, new SelectCallback() { startPhotoPage(false, "申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容",new SelectCallback() {
@Override @Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) { public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>(); List<File> fList = new ArrayList<>();
......
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java
View file @ ea1d9555
...@@ -204,6 +204,16 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie ...@@ -204,6 +204,16 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
@Override @Override
public void onChanged(Map<String, Object> o) { public void onChanged(Map<String, Object> o) {
if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
{
ToastUtils.showLong(o.get("pMsg").toString());
}
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() { rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
......
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java
View file @ ea1d9555
package me.goldze.mvvmhabit.base; package me.goldze.mvvmhabit.base;
import android.Manifest;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.DatePickerDialog; import android.app.DatePickerDialog;
import android.content.Context; import android.content.Context;
...@@ -21,6 +22,7 @@ import androidx.lifecycle.ViewModelProviders; ...@@ -21,6 +22,7 @@ import androidx.lifecycle.ViewModelProviders;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.huantansheng.easyphotos.EasyPhotos; import com.huantansheng.easyphotos.EasyPhotos;
import com.huantansheng.easyphotos.callback.SelectCallback; import com.huantansheng.easyphotos.callback.SelectCallback;
import com.tbruyelle.rxpermissions3.RxPermissions;
import com.trello.rxlifecycle4.components.support.RxFragment; import com.trello.rxlifecycle4.components.support.RxFragment;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
...@@ -31,6 +33,8 @@ import java.util.Date; ...@@ -31,6 +33,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.disposables.Disposable;
import me.goldze.mvvmhabit.base.BaseViewModel.ParameterField; import me.goldze.mvvmhabit.base.BaseViewModel.ParameterField;
import me.goldze.mvvmhabit.bus.Messenger; import me.goldze.mvvmhabit.bus.Messenger;
...@@ -38,7 +42,10 @@ import com.xx.xxviewlibrary.comm.CommTextDialog; ...@@ -38,7 +42,10 @@ import com.xx.xxviewlibrary.comm.CommTextDialog;
import com.xx.xxviewlibrary.comm.NUllDialog; import com.xx.xxviewlibrary.comm.NUllDialog;
import com.xx.xxviewlibrary.comm.RefuseDialogBean; import com.xx.xxviewlibrary.comm.RefuseDialogBean;
import com.xx.xxviewlibrary.utils.GlideEngine; import com.xx.xxviewlibrary.utils.GlideEngine;
import me.goldze.mvvmhabit.utils.MaterialDialogUtils; import me.goldze.mvvmhabit.utils.MaterialDialogUtils;
import me.goldze.mvvmhabit.utils.StringUtils;
import me.goldze.mvvmhabit.utils.ToastUtils;
/** /**
* Created by goldze on 2017/6/15. * Created by goldze on 2017/6/15.
...@@ -50,7 +57,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -50,7 +57,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
private MaterialDialog dialog; private MaterialDialog dialog;
private NUllDialog nullDialog; private NUllDialog nullDialog;
Fragment f=this;
Fragment f = this;
RxPermissions rp;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
...@@ -85,6 +95,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -85,6 +95,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
@Override @Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
rp =new RxPermissions(this);
//私有的初始化Databinding和ViewModel方法 //私有的初始化Databinding和ViewModel方法
initViewDataBinding(viewModelType()); initViewDataBinding(viewModelType());
//私有的ViewModel与View的契约事件回调逻辑 //私有的ViewModel与View的契约事件回调逻辑
...@@ -97,7 +108,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -97,7 +108,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
viewModel.registerRxBus(); viewModel.registerRxBus();
} }
public abstract int viewModelType(); public abstract int viewModelType();
/** /**
* 注入绑定 * 注入绑定
...@@ -115,11 +126,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -115,11 +126,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
//如果没有指定泛型参数，则默认使用BaseViewModel //如果没有指定泛型参数，则默认使用BaseViewModel
modelClass = BaseViewModel.class; modelClass = BaseViewModel.class;
} }
if(vmType==0) if (vmType == 0) {
{
viewModel = (VM) createViewModel(this, modelClass); viewModel = (VM) createViewModel(this, modelClass);
}else { } else {
viewModel = (VM) createActivityViewModel( modelClass); viewModel = (VM) createActivityViewModel(modelClass);
} }
} }
...@@ -140,10 +150,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -140,10 +150,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
//加载对话框显示 //加载对话框显示
viewModel.getUC().getShowDialogEvent().observe(this, new Observer<String>() { viewModel.getUC().getShowDialogEventNoTouch().observe(this, new Observer<String>() {
@Override @Override
public void onChanged(@Nullable String title) { public void onChanged(@Nullable String title) {
showDialog(title); showNoTouchDialog(title);
} }
}); });
//加载对话框消失 //加载对话框消失
...@@ -189,44 +199,107 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -189,44 +199,107 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
viewModel.getUC().getStartPhotoEvent().observe(this, new Observer<Map<String, Object>>() { viewModel.getUC().getStartPhotoEvent().observe(this, new Observer<Map<String, Object>>() {
@Override @Override
public void onChanged(Map<String, Object> o) { public void onChanged(Map<String, Object> o) {
boolean hasCamera= (boolean) o.get("hasCamera");
SelectCallback callback= (SelectCallback) o.get("callBack");
startPhoto(hasCamera,callback); if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
{
ToastUtils.showShort(o.get("pMsg").toString());
}
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull Boolean aBoolean) {
if (aBoolean)
{
boolean hasCamera = (boolean) o.get("hasCamera");
SelectCallback callback = (SelectCallback) o.get("callBack");
startPhoto(hasCamera, callback);
}else {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
}
@Override
public void onError(@NonNull Throwable e) {
}
@Override
public void onComplete() {
}
});
} }
}); });
//调用日期选择弹窗 //调用日期选择弹窗
viewModel.getUC().getShowDataDialogEvent().observe(this,new Observer<Map<String, Object>>() viewModel.getUC().getShowDataDialogEvent().observe(this, new Observer<Map<String, Object>>() {
{
@Override @Override
public void onChanged(Map<String, Object> stringObjectMap) { public void onChanged(Map<String, Object> stringObjectMap) {
int year= (int) stringObjectMap.get("year"); int year = (int) stringObjectMap.get("year");
int month= (int) stringObjectMap.get("month"); int month = (int) stringObjectMap.get("month");
int day= (int) stringObjectMap.get("day"); int day = (int) stringObjectMap.get("day");
onDataSelect ondata= (onDataSelect) stringObjectMap.get("ondata"); onDataSelect ondata = (onDataSelect) stringObjectMap.get("ondata");
showDataDialog(year,month,day,ondata); showDataDialog(year, month, day, ondata);
} }
}); });
viewModel.getUC().getShowTextDialogEvent().observe(this, new Observer<Map<String, Object>>() { viewModel.getUC().getShowTextDialogEvent().observe(this, new Observer<Map<String, Object>>() {
@Override @Override
public void onChanged(Map<String, Object> o) { public void onChanged(Map<String, Object> o) {
RefuseDialogBean bean= (RefuseDialogBean) o.get("bean"); RefuseDialogBean bean = (RefuseDialogBean) o.get("bean");
CommTextDialog.onAcceptCallBack callBack= (CommTextDialog.onAcceptCallBack) o.get("callBack"); CommTextDialog.onAcceptCallBack callBack = (CommTextDialog.onAcceptCallBack) o.get("callBack");
showCommTextDialog(bean,callBack); showCommTextDialog(bean, callBack);
} }
}); });
} }
public void showCommTextDialog(RefuseDialogBean bean,CommTextDialog.onAcceptCallBack callBack)
{ /**
CommTextDialog textDialog=new CommTextDialog(getContext(),bean,callBack); * 触发禁用返回键
*/
public void showNoTouchDialog(String title) {
if (StringUtils.isEmpty(title)) {
if (nullDialog != null) {
nullDialog.show();
} else {
nullDialog = new NUllDialog(getContext());
nullDialog.show();
}
} else {
if (dialog != null) {
dialog = dialog.getBuilder().title(title).build();
dialog.show();
} else {
MaterialDialog.Builder builder = MaterialDialogUtils.showIndeterminateProgressNoTouchDialog(getContext(), title, true);
dialog = builder.show();
}
}
}
public void showCommTextDialog(RefuseDialogBean bean, CommTextDialog.onAcceptCallBack callBack) {
CommTextDialog textDialog = new CommTextDialog(getContext(), bean, callBack);
textDialog.show(); textDialog.show();
} }
public void startPhoto(boolean hasCamera,SelectCallback callback) public void startPhoto(boolean hasCamera, SelectCallback callback) {
{
EasyPhotos.createAlbum(this, hasCamera, false, GlideEngine.getInstance()).setCount(1) EasyPhotos.createAlbum(this, hasCamera, false, GlideEngine.getInstance()).setCount(1)
.setFileProviderAuthority(getAppProcessName(getContext()) + ".fileProvider")
.start(callback); .start(callback);
} }
...@@ -295,24 +368,24 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -295,24 +368,24 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
/** /**
* 展示日期选择 * 展示日期选择
*
* @param year * @param year
* @param month * @param month
* @param day * @param day
* @param onData * @param onData
*/ */
public void showDataDialog(int year,int month,int day,onDataSelect onData) public void showDataDialog(int year, int month, int day, onDataSelect onData) {
{
DatePickerDialog datePickerDialog = new DatePickerDialog(getContext(), new DatePickerDialog.OnDateSetListener() { DatePickerDialog datePickerDialog = new DatePickerDialog(getContext(), new DatePickerDialog.OnDateSetListener() {
@Override @Override
public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) { public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
try { try {
SimpleDateFormat df=new SimpleDateFormat("yyyy-m-d"); SimpleDateFormat df = new SimpleDateFormat("yyyy-m-d");
Date date= df.parse(year + "-" + (month + 1) + "-" + dayOfMonth); Date date = df.parse(year + "-" + (month + 1) + "-" + dayOfMonth);
SimpleDateFormat df2=new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd");
onData.reData(df2.format(date) ); onData.reData(df2.format(date));
} catch (ParseException e) { } catch (ParseException e) {
onData.reData( ""); onData.reData("");
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -324,7 +397,6 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -324,7 +397,6 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
} }
/** /**
* ===================================================================== * =====================================================================
**/ **/
...@@ -373,6 +445,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -373,6 +445,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
public void initViewObservable() { public void initViewObservable() {
} }
public boolean isBackPressed() { public boolean isBackPressed() {
return false; return false;
} }
...@@ -388,9 +461,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -388,9 +461,10 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
return ViewModelProviders.of(fragment).get(cls); return ViewModelProviders.of(fragment).get(cls);
} }
public <T extends ViewModel> T createActivityViewModel( Class<T> cls) { public <T extends ViewModel> T createActivityViewModel(Class<T> cls) {
return ViewModelProviders.of(getActivity()).get(cls); return ViewModelProviders.of(getActivity()).get(cls);
} }
/** /**
* 获取当前应用程序的包名 * 获取当前应用程序的包名
* *
...@@ -410,5 +484,4 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -410,5 +484,4 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
} }
return ""; return "";
} }
} }
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java
View file @ ea1d9555
...@@ -190,11 +190,13 @@ public class BaseViewModel<M extends BaseModel> extends AndroidViewModel impleme ...@@ -190,11 +190,13 @@ public class BaseViewModel<M extends BaseModel> extends AndroidViewModel impleme
* @param hasCamera 是否有照相机功能 * @param hasCamera 是否有照相机功能
* @param callback * @param callback
*/ */
public void startPhotoPage(boolean hasCamera, SelectCallback callback) public void startPhotoPage(boolean hasCamera, String msg,SelectCallback callback)
{ {
Map<String, Object> photomap = new HashMap<>(); Map<String, Object> photomap = new HashMap<>();
photomap.put("hasCamera", hasCamera); photomap.put("hasCamera", hasCamera);
photomap.put("maxCount", 1); photomap.put("maxCount", 1);
photomap.put("pMsg",msg);
if (callback != null) { if (callback != null) {
photomap.put("callBack", callback); photomap.put("callBack", callback);
} }
...@@ -207,11 +209,12 @@ public class BaseViewModel<M extends BaseModel> extends AndroidViewModel impleme ...@@ -207,11 +209,12 @@ public class BaseViewModel<M extends BaseModel> extends AndroidViewModel impleme
* @param maxCount 选则最大数量 * @param maxCount 选则最大数量
* @param callback * @param callback
*/ */
public void startPhotoPage(boolean hasCamera,int maxCount, SelectCallback callback) public void startPhotoPage(boolean hasCamera,int maxCount, String msg,SelectCallback callback)
{ {
Map<String, Object> photomap = new HashMap<>(); Map<String, Object> photomap = new HashMap<>();
photomap.put("hasCamera", hasCamera); photomap.put("hasCamera", hasCamera);
photomap.put("maxCount", maxCount); photomap.put("maxCount", maxCount);
photomap.put("pMsg",msg);
if (callback != null) { if (callback != null) {
photomap.put("callBack", callback); photomap.put("callBack", callback);
} }
......
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