Skip to content

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

基础搭建 

功能开发
1：1.2.0 修复bug
parent 88cc501b
Hide whitespace changes
Inline Side-by-side
Showing with 361 additions and 112 deletions
.idea/navEditor.xml
View file @ fad0dfe8
...@@ -244,6 +244,18 @@ ...@@ -244,6 +244,18 @@
<LayoutPositions> <LayoutPositions>
<option name="myPositions"> <option name="myPositions">
<map> <map>
<entry key="listSelectFragment">
<value>
<LayoutPositions>
<option name="myPosition">
<Point>
<option name="x" value="648" />
<option name="y" value="-366" />
</Point>
</option>
</LayoutPositions>
</value>
</entry>
<entry key="merchantIntroduceFragment"> <entry key="merchantIntroduceFragment">
<value> <value>
<LayoutPositions> <LayoutPositions>
...@@ -307,6 +319,20 @@ ...@@ -307,6 +319,20 @@
<option name="y" value="12" /> <option name="y" value="12" />
</Point> </Point>
</option> </option>
<option name="myPositions">
<map>
<entry key="action_registerMaterialFragment_to_listSelectFragment">
<value>
<LayoutPositions />
</value>
</entry>
<entry key="action_registerMaterialFragment_to_merchantWaitFragment">
<value>
<LayoutPositions />
</value>
</entry>
</map>
</option>
</LayoutPositions> </LayoutPositions>
</value> </value>
</entry> </entry>
......
.idea/workspace.xml
View file @ fad0dfe8
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<option name="autoReloadType" value="NONE" /> <option name="autoReloadType" value="NONE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板"> <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：1.2.0 提交版本">
<change afterPath="$PROJECT_DIR$/app/src/main/cpp/native_lib.cpp" afterDir="false" /> <change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ListSelectFragment.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/kefu.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/ListSelectFragment.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_list_select.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
...@@ -21,31 +22,24 @@ ...@@ -21,31 +22,24 @@
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/navEditor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/navEditor.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/libs/qmf-ppplugin-android-3.1.6.aar" beforeDir="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/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayActivity.kt" 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/electric/ElectricPayViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayViewModel.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/RegisterMaterialFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/RegisterMaterialFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXEntryActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXPayEntryActivity.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/jniLibs/UPPayAssistEx.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/jniLibs/UPPayAssistEx.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/navigation/nav_merchant_enter.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/navigation/nav_merchant_enter.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/jniLibs/arm64-v8a/libentryexpro.so" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/jniLibs/arm64-v8a/libentryexpro.so" 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/jniLibs/armeabi-v7a/libentryexpro.so" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/jniLibs/armeabi-v7a/libentryexpro.so" 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$/app/src/main/jniLibs/armeabi/libentryexpro.so" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/jniLibs/armeabi/libentryexpro.so" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_electric_pay.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_electric_pay.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_home.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_home.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkFragment.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" />
<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$/xxviewlibrary/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/xxviewlibrary/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/utils/CommUtils.kt" beforeDir="false" afterPath="$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/utils/CommUtils.kt" 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 />
...@@ -130,57 +124,57 @@ ...@@ -130,57 +124,57 @@
<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"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"ApkExportedModule": "HBHFurniture.app", &quot;ApkExportedModule&quot;: &quot;HBHFurniture.app&quot;,
"DEBUGGABLE_DEVICE": "oneplus-le2120-34612fa7", &quot;DEBUGGABLE_DEVICE&quot;: &quot;oneplus-le2120-34612fa7&quot;,
"DEBUGGABLE_PROCESS": "com.xx.merchanthbh", &quot;DEBUGGABLE_PROCESS&quot;: &quot;com.xx.merchanthbh&quot;,
"DEBUGGER_ID": "Auto", &quot;DEBUGGER_ID&quot;: &quot;Auto&quot;,
"ExportApk.ApkPathForHBHFurniture.app": "D:\\work\\APK\\hbh", &quot;ExportApk.ApkPathForHBHFurniture.app&quot;: &quot;D:\\work\\APK\\hbh&quot;,
"ExportApk.ApkPathForHBHFurniture.consumer": "D:\\work\\APK\\hbh", &quot;ExportApk.ApkPathForHBHFurniture.consumer&quot;: &quot;D:\\work\\APK\\hbh&quot;,
"ExportApk.ApkPathForHBHFurniture.hbhbcompany": "D:\\work\\APK\\hbh", &quot;ExportApk.ApkPathForHBHFurniture.hbhbcompany&quot;: &quot;D:\\work\\APK\\hbh&quot;,
"ResourceManagerPrefKey.ModuleName": "HBHFurniture.hbhbcompany.main", &quot;ResourceManagerPrefKey.ModuleName&quot;: &quot;HBHFurniture.hbhbcompany.main&quot;,
"ResourceManagerPrefKey.ResourceType": "MIPMAP", &quot;ResourceManagerPrefKey.ResourceType&quot;: &quot;MIPMAP&quot;,
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.cidr.known.project.marker": "true", &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
"SHARE_PROJECT_CONFIGURATION_FILES": "true", &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
"SHOW_ALL_PROCESSES": "false", &quot;SHOW_ALL_PROCESSES&quot;: &quot;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": "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&quot;: &quot;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": "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&quot;: &quot;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": "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&quot;: &quot;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": "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&quot;: &quot;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": "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&quot;: &quot;RecyclerView&quot;,
"android-custom-viewD:/androidProJect/HBHFurniture/app/src/main/java/com/xx/merchanthbh/widget/RegisterStepLayout.kt_SELECTED": "RegisterStepLayout", &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/dsbridge/src/main/java/wendu/dsbridge/DWebView.java_SELECTED": "DWebView", &quot;android-custom-viewD:/androidProJect/HBHFurniture/dsbridge/src/main/java/wendu/dsbridge/DWebView.java_SELECTED&quot;: &quot;DWebView&quot;,
"android-custom-viewD:/androidProJect/HBHFurniture/hbhbcompany/src/main/java/com/xx/hbhbcompany/widget/AuditStepLayout.kt_SELECTED": "AuditStepLayout", &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/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/XxBar.kt_SELECTED&quot;: &quot;XxBar&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/XxFormEdit.kt_SELECTED&quot;: &quot;XxFormEdit&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/example/xxviewlibrary/witget/XxUploudPic.kt_SELECTED&quot;: &quot;XxUploudPic&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/XxBar.kt_SELECTED&quot;: &quot;XxBar&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/XxFormEdit.kt_SELECTED&quot;: &quot;XxFormEdit&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/XxUploudPic.kt_SELECTED&quot;: &quot;XxUploudPic&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/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;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/hbhandroid/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt_SELECTED": "XxUploudPicSmall", &quot;android-custom-viewD:/androidProJect/hbhandroid/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt_SELECTED&quot;: &quot;XxUploudPicSmall&quot;,
"cidr.known.project.marker": "true", &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
"com.google.services.firebase.aqiPopupShown": "true", &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
"dart.analysis.tool.window.visible": "false", &quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
"last_directory_selection": "D:/androidProJect/hbhandroid/app/src/main/res/mipmap-xhdpi", &quot;last_directory_selection&quot;: &quot;D:/androidProJect/hbhandroid/app/src/main/res/mipmap-xhdpi&quot;,
"last_opened_file_path": "D:/androidProJect/hbhandroid", &quot;last_opened_file_path&quot;: &quot;D:/androidProJect/KunlunRecord&quot;,
"project.structure.last.edited": "Modules", &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
"project.structure.proportion": "0.17", &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
"project.structure.side.proportion": "0.2", &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle", &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;,
"show.do.not.copy.http.proxy.settings.to.gradle": "true", &quot;show.do.not.copy.http.proxy.settings.to.gradle&quot;: &quot;true&quot;,
"show.migrate.to.gradle.popup": "false" &quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;
}, },
"keyToStringList": { &quot;keyToStringList&quot;: {
"ExportApk.BuildVariants": [ &quot;ExportApk.BuildVariants&quot;: [
"release" &quot;release&quot;
] ]
} }
}]]></component> }</component>
<component name="PsdUISettings"> <component name="PsdUISettings">
<option name="MODULE_TAB" value="Signing Configs" /> <option name="MODULE_TAB" value="Signing Configs" />
<option name="BUILD_VARIANTS_TAB" value="Flavors" /> <option name="BUILD_VARIANTS_TAB" value="Flavors" />
...@@ -206,11 +200,11 @@ ...@@ -206,11 +200,11 @@
<recent name="D:\androidProJect\HBHFurniture\xxviewlibrary\src\main\res\mipmap-xhdpi" /> <recent name="D:\androidProJect\HBHFurniture\xxviewlibrary\src\main\res\mipmap-xhdpi" />
</key> </key>
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY"> <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
<recent name="com.xx.merchanthbh.ui.merchantenter" />
<recent name="com.xx.xxviewlibrary.model" /> <recent name="com.xx.xxviewlibrary.model" />
<recent name="com.xx.merchanthbh.data.http.requst" /> <recent name="com.xx.merchanthbh.data.http.requst" />
<recent name="com.xx.merchanthbh.data.http.respons" /> <recent name="com.xx.merchanthbh.data.http.respons" />
<recent name="com.xx.xxviewlibrary.comm" /> <recent name="com.xx.xxviewlibrary.comm" />
<recent name="com.xx.xxviewlibrary.witget" />
</key> </key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="me.goldze.mvvmhabit.base" /> <recent name="me.goldze.mvvmhabit.base" />
...@@ -886,35 +880,30 @@ ...@@ -886,35 +880,30 @@
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" type="java-line"> <line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXPayEntryActivity.java</url> <url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/RegisterMaterialFragment.kt</url>
<line>49</line> <line>40</line>
<option name="timeStamp" value="576" /> <option name="timeStamp" value="610" />
</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/wxapi/WXPayEntryActivity.java</url> <url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java</url>
<line>55</line> <line>478</line>
<option name="timeStamp" value="577" /> <option name="timeStamp" value="602" />
</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/wxapi/WXPayEntryActivity.java</url> <url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java</url>
<line>53</line> <line>479</line>
<option name="timeStamp" value="578" /> <option name="timeStamp" value="603" />
</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/wxapi/WXPayEntryActivity.java</url> <url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java</url>
<line>51</line> <line>116</line>
<option name="timeStamp" value="579" /> <option name="timeStamp" value="604" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt</url>
<line>72</line>
<option name="timeStamp" value="580" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line"> <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt</url> <url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java</url>
<line>75</line> <line>394</line>
<option name="timeStamp" value="581" /> <option name="timeStamp" value="606" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
......
app/src/main/java/com/xx/merchanthbh/ListSelectFragment.kt 0 → 100644
View file @ fad0dfe8
package com.xx.merchanthbh
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private const val ARG_PARAM1 = "param1"
private const val ARG_PARAM2 = "param2"
app/src/main/java/com/xx/merchanthbh/data/http/requst/LoginRequest.kt
View file @ fad0dfe8
...@@ -50,7 +50,7 @@ class LoginRequest: BaseRespons() { ...@@ -50,7 +50,7 @@ class LoginRequest: BaseRespons() {
fun getProtocols(): Observable<BaseResponse<List<String>>> fun getProtocols(): Observable<BaseResponse<List<String>>>
{ {
return apiService.getProtocols(ApiParams<Array<String>>().setParams(arrayOf("6","7","8","9","10"))) return apiService.getProtocols(ApiParams<Array<String>>().setParams(arrayOf("6","7","13","9","10")))
} }
......
app/src/main/java/com/xx/merchanthbh/ui/home/HomeFragment.java
View file @ fad0dfe8
...@@ -75,13 +75,13 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding, HomeViewMode ...@@ -75,13 +75,13 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding, HomeViewMode
} }
}); });
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { /* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
if (!Environment.isExternalStorageManager()) { if (!Environment.isExternalStorageManager()) {
Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION); Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
intent.setData(Uri.parse("package:" + getContext().getPackageName())); intent.setData(Uri.parse("package:" + getContext().getPackageName()));
startActivityForResult(intent, 1024); startActivityForResult(intent, 1024);
} }
} }*/
} }
// 重写初始方法调用参数 // 重写初始方法调用参数
......
app/src/main/java/com/xx/merchanthbh/ui/merchantenter/ListSelectFragment.kt 0 → 100644
View file @ fad0dfe8
package com.xx.merchanthbh.ui.merchantenter
import android.os.Bundle
import android.view.LayoutInflater
import android.view.ViewGroup
import com.xx.merchanthbh.BR
import com.xx.merchanthbh.R
import com.xx.merchanthbh.databinding.FragmentListSelectBinding
import com.xx.merchanthbh.dialog.adapter.BoothListAdapter
import me.goldze.mvvmhabit.base.BaseFragment
/**
* 选择展位号
*/
class ListSelectFragment : BaseFragment<FragmentListSelectBinding, MerchantEnterViewModel>() {
override fun viewModelType(): Int {
return 1;
}
override fun initContentView(
inflater: LayoutInflater?,
container: ViewGroup?,
savedInstanceState: Bundle?
): Int {
return R.layout.fragment_list_select;
}
override fun initVariableId(): Int {
return BR.viewModel
}
override fun initData() {
super.initData()
viewModel.boothAdapter=BoothListAdapter(context);
binding.rvSelelctList.adapter=viewModel.boothAdapter;
if (viewModel. boothAdapter.mList==null)
{viewModel. boothAdapter.mList=ArrayList();
}
viewModel. boothAdapter.mList.addAll( viewModel.boothBeanList)
viewModel. boothAdapter.notifyDataSetChanged()
}
}
\ No newline at end of file
app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java
View file @ fad0dfe8
...@@ -4,6 +4,7 @@ import static me.goldze.mvvmhabit.utils.Utils.Interceptor_TOKEN; ...@@ -4,6 +4,7 @@ import static me.goldze.mvvmhabit.utils.Utils.Interceptor_TOKEN;
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 androidx.annotation.NonNull; import androidx.annotation.NonNull;
...@@ -18,10 +19,12 @@ import com.xx.merchanthbh.data.http.requst.body.Brankbody; ...@@ -18,10 +19,12 @@ import com.xx.merchanthbh.data.http.requst.body.Brankbody;
import com.xx.merchanthbh.data.http.requst.body.MerchantMsgbody; import com.xx.merchanthbh.data.http.requst.body.MerchantMsgbody;
import com.xx.merchanthbh.data.http.respons.BoothBean; import com.xx.merchanthbh.data.http.respons.BoothBean;
import com.xx.merchanthbh.data.http.respons.Filebean; import com.xx.merchanthbh.data.http.respons.Filebean;
import com.xx.merchanthbh.data.http.respons.MerchantBean;
import com.xx.merchanthbh.data.http.respons.RegisterBean; import com.xx.merchanthbh.data.http.respons.RegisterBean;
import com.xx.merchanthbh.data.http.respons.UserBean; import com.xx.merchanthbh.data.http.respons.UserBean;
import com.xx.merchanthbh.data.local.LocalData; import com.xx.merchanthbh.data.local.LocalData;
import com.xx.merchanthbh.dialog.BoothListDialog; import com.xx.merchanthbh.dialog.BoothListDialog;
import com.xx.merchanthbh.dialog.adapter.BoothListAdapter;
import com.xx.merchanthbh.dialog.data.TextListProvider; import com.xx.merchanthbh.dialog.data.TextListProvider;
import com.xx.xxviewlibrary.base.xxBaseDialog; import com.xx.xxviewlibrary.base.xxBaseDialog;
import com.xx.xxviewlibrary.comm.CommTextDialog; import com.xx.xxviewlibrary.comm.CommTextDialog;
...@@ -54,10 +57,15 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -54,10 +57,15 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> {
public ObservableField<String> pwds = new ObservableField<>(""); public ObservableField<String> pwds = new ObservableField<>("");
public ObservableField<String> boothSelect = new ObservableField<>("");
public RegisterModel registerBody=new RegisterModel(); public RegisterModel registerBody=new RegisterModel();
public List<BoothBean> boothBeanList=new ArrayList<>(); public List<BoothBean> boothBeanList=new ArrayList<>();
public BoothListAdapter boothAdapter;
/** /**
* 获取验证码按钮文字 * 获取验证码按钮文字
*/ */
...@@ -100,13 +108,21 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -100,13 +108,21 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> {
public MerchantEnterViewModel(@NonNull Application application) { public MerchantEnterViewModel(@NonNull Application application) {
super(application); super(application);
model= new MerchantEnterRequst(); model= new MerchantEnterRequst();
Log.e("fragment 生命周期","MerchantEnterViewModel");
if(LocalData.getUser()!=null) if(LocalData.getUser()!=null)
{ {
user=LocalData.getUser(); user=LocalData.getUser();
merchantInfo=new MerchantEnterRequst.MerchantInfo(user.getPhonenumber()); merchantInfo=new MerchantEnterRequst.MerchantInfo(user.getPhonenumber());
} }
MerchantBean merchantBean =LocalData.getMerchant();
if (merchantBean!=null )
{
userStatic=merchantBean.getBusinessId();
merchantInfo.setMerchantInfo(merchantBean);
}
} }
...@@ -375,7 +391,8 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -375,7 +391,8 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> {
* 获取展位列表 * 获取展位列表
*/ */
public void getBoothList() public void getBoothList()
{model.getBoothList() {
model.getBoothList()
.compose(RxUtils.schedulersTransformer()) //线程调度 .compose(RxUtils.schedulersTransformer()) //线程调度
.doOnSubscribe(MerchantEnterViewModel.this) .doOnSubscribe(MerchantEnterViewModel.this)
.doOnSubscribe (new Consumer<Disposable>() { .doOnSubscribe (new Consumer<Disposable>() {
...@@ -404,20 +421,67 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> { ...@@ -404,20 +421,67 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> {
*/ */
public void openBooth(View view) public void openBooth(View view)
{ {
BoothListDialog dialoh=new BoothListDialog(view.getContext(),"请选择所属展位",boothBeanList);
dialoh.setDialogClickListener(new xxBaseDialog.onDialogClickListener<TextListProvider>() {
@Override
public void dialogClickBack(int code, TextListProvider data) {
merchantInfo.getBoothNum().set(data.providerText()); if (boothBeanList.size()<=0)
merchantInfo.setBoothId(data.ProviderId()); {
} ToastUtils.showShort("正在加载展位数据请稍后点击");
}); }else {
NavController navController= Navigation.findNavController(view);
navController.navigate(R.id.action_registerMaterialFragment_to_listSelectFragment);
}
dialoh.show();
} }
/**
* 筛选展位号
* @param view
*/
public void searchBooth(View view)
{
List<BoothBean> newBoothBeanList=new ArrayList<>();
if (!TextUtils.isEmpty(boothSelect.get()))
{
for (BoothBean bean:boothBeanList)
{
if (bean.getBoothNumber().indexOf(boothSelect.get())>-1)
{
newBoothBeanList.add(bean);
}
}
}else {
newBoothBeanList=boothBeanList;
}
boothAdapter.mList.clear();
boothAdapter.mList.addAll(newBoothBeanList);
boothAdapter.notifyDataSetChanged();
}
/**
* 确定选择展位号
* @param view
*/
public void searchBoothSure(View view)
{
if (boothAdapter.getBuuthBusinessId()==null)
{
ToastUtils.showShort("请选择展位号");
}else {
NavController navController= Navigation.findNavController(view);
navController.popBackStack();
merchantInfo.getBoothNum().set(boothAdapter.getBuuthBusinessId().providerText());
merchantInfo.setBoothId(boothAdapter.getBuuthBusinessId().ProviderId());
}
}
/** /**
* 添加品牌 * 添加品牌
* @param view * @param view
......
app/src/main/java/com/xx/merchanthbh/ui/merchantenter/RegisterMaterialFragment.kt
View file @ fad0dfe8
...@@ -29,10 +29,15 @@ class RegisterMaterialFragment : BaseFragment<FragmentRegisterMaterialBinding, M ...@@ -29,10 +29,15 @@ class RegisterMaterialFragment : BaseFragment<FragmentRegisterMaterialBinding, M
return BR.viewModel return BR.viewModel
} }
override fun initParam() {
super.initParam()
}
override fun initData() { override fun initData() {
super.initData() super.initData()
viewModel.title.set("商家信息") viewModel.title.set("商家信息")
viewModel.getBoothList() viewModel.getBoothList();
adapter=AddBrankAdapter(context) adapter=AddBrankAdapter(context)
binding.rvFrmBrankList.adapter=adapter binding.rvFrmBrankList.adapter=adapter
...@@ -59,10 +64,9 @@ class RegisterMaterialFragment : BaseFragment<FragmentRegisterMaterialBinding, M ...@@ -59,10 +64,9 @@ class RegisterMaterialFragment : BaseFragment<FragmentRegisterMaterialBinding, M
}) })
var merchantBean :MerchantBean?=LocalData.getMerchant(); var merchantBean :MerchantBean?=LocalData.getMerchant();
if (merchantBean!=null) if (merchantBean!=null )
{ {
viewModel.userStatic=merchantBean.businessId;
viewModel.merchantInfo.setMerchantInfo(merchantBean)
if (merchantBean.brandAuthorizationList!=null) if (merchantBean.brandAuthorizationList!=null)
{ {
adapter.mList = viewModel.merchantInfo.reBrankbody(merchantBean.brandAuthorizationList!!) adapter.mList = viewModel.merchantInfo.reBrankbody(merchantBean.brandAuthorizationList!!)
......
app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java
View file @ fad0dfe8
...@@ -104,9 +104,9 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode ...@@ -104,9 +104,9 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
@Override @Override
public void onChanged(String s) { public void onChanged(String s) {
if ("1".equals(s)) { if ("1".equals(s)) {
var packageURI = Uri.parse("package:" + getContext().getPackageName()); /* var packageURI = Uri.parse("package:" + getContext().getPackageName());
Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI); Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI);
startActivityForResult(intent, 1002); startActivityForResult(intent, 1002);*/
} }
} }
......
app/src/main/res/layout/fragment_list_select.xml 0 → 100644
View file @ fad0dfe8
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:binding="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="viewModel"
type="com.xx.merchanthbh.ui.merchantenter.MerchantEnterViewModel" />
<import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LayoutManagers" />
<import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LineManagers" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:paddingLeft="17dp"
android:layout_margin="20dp"
android:id="@+id/fls_select"
android:background="@drawable/bg_gray_size_1_radius_6"
android:layout_height="48dp">
<EditText
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="#00000000"
android:textColor="@color/text_grey"
android:text="@={viewModel.boothSelect}"
android:textSize="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:onClick="@{viewModel.searchBooth}"
android:text="搜索"
android:background="#00000000"
android:textColor="#333333"
android:textSize="14dp"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_selelct_list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
app:layout_constraintBottom_toTopOf="@+id/button2"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginBottom="20dp"
binding:layoutManager="@{LayoutManagers.linear(1,false)}"
tools:layout_editor_absoluteX="24dp" />
<Button
android:id="@+id/button2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:background="@drawable/bg_forground_radius_24"
android:text="确定"
android:onClick="@{viewModel.searchBoothSure}"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="20dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/navigation/nav_merchant_enter.xml
View file @ fad0dfe8
...@@ -31,10 +31,18 @@ ...@@ -31,10 +31,18 @@
<action <action
android:id="@+id/action_registerMaterialFragment_to_merchantWaitFragment" android:id="@+id/action_registerMaterialFragment_to_merchantWaitFragment"
app:destination="@id/merchantWaitFragment" /> app:destination="@id/merchantWaitFragment" />
<action
android:id="@+id/action_registerMaterialFragment_to_listSelectFragment"
app:destination="@id/listSelectFragment" />
</fragment> </fragment>
<fragment <fragment
android:id="@+id/merchantWaitFragment" android:id="@+id/merchantWaitFragment"
android:name="com.xx.merchanthbh.ui.merchantenter.MerchantWaitFragment" android:name="com.xx.merchanthbh.ui.merchantenter.MerchantWaitFragment"
android:label="MerchantWaitFragment" /> android:label="MerchantWaitFragment" />
<fragment
android:id="@+id/listSelectFragment"
android:name="com.xx.merchanthbh.ui.merchantenter.ListSelectFragment"
android:label="fragment_list_select"
tools:layout="@layout/fragment_list_select" />
</navigation> </navigation>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ fad0dfe8
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<!--我的模块 用户职位--> <!--我的模块 用户职位-->
<string name="user_position">店长</string> <string name="user_position">店长</string>
<!--我的模块 创建日期--> <!--我的模块 创建日期-->
<string name="user_createdate" >创建日期</string> <string name="user_createdate">创建日期</string>
<!--我的模块 菜单列表--> <!--我的模块 菜单列表-->
<!--2--> <!--2-->
<string name="change_password">修改密码</string> <string name="change_password">修改密码</string>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<string name="electric_msg">物业信息</string> <string name="electric_msg">物业信息</string>
<string name="bill_msg">账单信息</string> <string name="bill_msg">账单信息</string>
<string name="company_name">公司名称</string> <string name="company_name">公司名称</string>
<string name="account_num">账户号</string> <string name="account_num">账户号</string>
...@@ -239,4 +239,6 @@ ...@@ -239,4 +239,6 @@
<string name="pay_count">付款金额</string> <string name="pay_count">付款金额</string>
<string name="pay_time">付款时间</string> <string name="pay_time">付款时间</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources> </resources>
\ No newline at end of file
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java
View file @ fad0dfe8
...@@ -6,6 +6,7 @@ import android.app.DatePickerDialog; ...@@ -6,6 +6,7 @@ import android.app.DatePickerDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -64,6 +65,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -64,6 +65,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Log.e("fragment 生命周期","onCreate");
initParam(); initParam();
} }
...@@ -75,6 +77,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -75,6 +77,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
@Nullable @Nullable
@Override @Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
Log.e("fragment 生命周期","onCreateView");
binding = DataBindingUtil.inflate(inflater, initContentView(inflater, container, savedInstanceState), container, false); binding = DataBindingUtil.inflate(inflater, initContentView(inflater, container, savedInstanceState), container, false);
return binding.getRoot(); return binding.getRoot();
} }
...@@ -82,6 +85,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -82,6 +85,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();
Log.e("fragment 生命周期","onDestroyView");
//解除Messenger注册 //解除Messenger注册
Messenger.getDefault().unregister(viewModel); Messenger.getDefault().unregister(viewModel);
if (viewModel != null) { if (viewModel != null) {
...@@ -96,6 +100,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie ...@@ -96,6 +100,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
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); rp =new RxPermissions(this);
Log.e("fragment 生命周期","onViewCreated");
//私有的初始化Databinding和ViewModel方法 //私有的初始化Databinding和ViewModel方法
initViewDataBinding(viewModelType()); initViewDataBinding(viewModelType());
//私有的ViewModel与View的契约事件回调逻辑 //私有的ViewModel与View的契约事件回调逻辑
......
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