Skip to content

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

基础搭建 

功能开发
1：1.2.0 提交版本
parent a72f1f5b
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 272 deletions
.idea/workspace.xml
View file @ 88cc501b
......@@ -9,7 +9,10 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板">
<change afterPath="$PROJECT_DIR$/app/src/main/cpp/native_lib.cpp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/kefu.png" 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.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" />
......@@ -19,15 +22,30 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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/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/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/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/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/jniLibs/UPPayAssistEx.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/jniLibs/UPPayAssistEx.jar" 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/jniLibs/armeabi-v7a/libentryexpro.so" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/jniLibs/armeabi-v7a/libentryexpro.so" 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>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\Administrator\.android\avd\Pixel_2_API_30.avd]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[34612fa7]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
......@@ -116,7 +134,7 @@
"keyToString": {
"ApkExportedModule": "HBHFurniture.app",
"DEBUGGABLE_DEVICE": "oneplus-le2120-34612fa7",
"DEBUGGABLE_PROCESS": "com.xx.hbhconsumer",
"DEBUGGABLE_PROCESS": "com.xx.merchanthbh",
"DEBUGGER_ID": "Auto",
"ExportApk.ApkPathForHBHFurniture.app": "D:\\work\\APK\\hbh",
"ExportApk.ApkPathForHBHFurniture.consumer": "D:\\work\\APK\\hbh",
......@@ -148,7 +166,7 @@
"cidr.known.project.marker": "true",
"com.google.services.firebase.aqiPopupShown": "true",
"dart.analysis.tool.window.visible": "false",
"last_directory_selection": "D:/androidProJect/HBHFurniture/hbhbcompany/src/main/res/mipmap-xhdpi",
"last_directory_selection": "D:/androidProJect/hbhandroid/app/src/main/res/mipmap-xhdpi",
"last_opened_file_path": "D:/androidProJect/hbhandroid",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17",
......@@ -164,20 +182,21 @@
}
}]]></component>
<component name="PsdUISettings">
<option name="MODULE_TAB" value="Default Config" />
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
<option name="MODULE_TAB" value="Signing Configs" />
<option name="BUILD_VARIANTS_TAB" value="Flavors" />
<option name="LAST_EDITED_SIGNING_CONFIG" value="reseale" />
<option name="LAST_EDITED_BUILD_TYPE" value="debug" />
</component>
<component name="RecentsManager">
<key name="CreateClassDialog.RecentsKey">
<recent name="com.example.merchanthbh.ui.Home" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\androidProJect\hbhandroid\app\src\main\res\mipmap-xhdpi" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\mipmap-xhdpi" />
<recent name="D:\androidProJect\HBHFurniture\hbhbcompany\src\main\res\layout" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\layout" />
<recent name="D:\androidProJect\HBHFurniture\hbhbcompany\src" />
<recent name="D:\androidProJect\HBHFurniture\app\src" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\androidProJect\HBHFurniture\app\src\main" />
......@@ -461,13 +480,6 @@
<option name="presentableId" value="Default" />
<updated>1687161738436</updated>
</task>
<task id="LOCAL-00008" summary="基础功能&#10; 1：添加ADapter,Dialog 基础类&#10; &#10;功能开发&#10; 1：实现展位列表">
<created>1689311863539</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1689311863539</updated>
</task>
<task id="LOCAL-00009" summary="基础功能&#10; 1：添加ADapter,Dialog 基础类&#10; &#10;功能开发&#10; 1：实现品牌">
<created>1689410667874</created>
<option name="number" value="00009" />
......@@ -804,7 +816,14 @@
<option name="project" value="LOCAL" />
<updated>1713320240791</updated>
</task>
<option name="localTasksCounter" value="57" />
<task id="LOCAL-00057" summary="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板">
<created>1717047357049</created>
<option name="number" value="00057" />
<option name="presentableId" value="LOCAL-00057" />
<option name="project" value="LOCAL" />
<updated>1717047357049</updated>
</task>
<option name="localTasksCounter" value="58" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
......@@ -837,7 +856,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商品添加" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户商品管理" />
<MESSAGE value="基础搭建&#10;1:添加刷新加载控件&#10;功能开发&#10;1：企业商品管理列表" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：修复开店第一次使用bug" />
......@@ -862,223 +880,41 @@
<MESSAGE value="基础搭建&#10;功能开发&#10;申请修改" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1.1.0" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：1.0.1最终顶板" />
</component>
<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>83</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>231</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>267</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>240</line>
<option name="timeStamp" value="502" />
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXPayEntryActivity.java</url>
<line>49</line>
<option name="timeStamp" value="576" />
</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" />
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXPayEntryActivity.java</url>
<line>55</line>
<option name="timeStamp" value="577" />
</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>
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXPayEntryActivity.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" />
<option name="timeStamp" value="578" />
</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>401</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>404</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>406</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" />
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXPayEntryActivity.java</url>
<line>51</line>
<option name="timeStamp" value="579" />
</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" />
<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 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">
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="554" />
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt</url>
<line>75</line>
<option name="timeStamp" value="581" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
......
app/build.gradle
View file @ 88cc501b
......@@ -4,11 +4,11 @@ plugins {
id 'kotlin-kapt'
}
def URL_DEBUG="\"http://49.232.201.130:8004/\""
def URL_DEBUG="\" http://103.131.168.155:7005/api/\""
def URL_RELEASE="\"https://www.hbhapp.cn/api/\""
def URL_DEBUG_H5="\"http://49.232.201.130:7005\""
def URL_DEBUG_H5="\"http://103.131.168.155:7005\""
def URL_RELEASE_H5="\"https://www.hbhapp.cn\""
......@@ -17,7 +17,7 @@ android {
signingConfigs {
reseale {
storeFile file('D:\\androidProJect\\HBHFurniture\\app\\merchant_hbh.jks')
storeFile file('D:\\work\\key\\merchant_hbh.jks')
storePassword 'xxmerchant741'
keyPassword 'xxmerchant741'
keyAlias 'zoe'
......@@ -37,8 +37,8 @@ android {
applicationId "com.xx.merchanthbh"
minSdk 23
targetSdk 31
versionCode 2
versionName "1.1.0"
versionCode 3
versionName "1.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.reseale
......@@ -47,7 +47,6 @@ android {
buildTypes {
release {
minifyEnabled false
debuggable false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.reseale
buildConfigField "String", "URL", URL_RELEASE
......@@ -57,7 +56,8 @@ android {
minifyEnabled false
debuggable true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField "String", "URL", URL_RELEASE
signingConfig signingConfigs.reseale
buildConfigField "String", "URL", URL_DEBUG
buildConfigField "String", "URL_H5", URL_DEBUG_H5
}
}
......@@ -100,7 +100,7 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
implementation project(path: ':dsbridge')
implementation files('libs/qmf-ppplugin-android-3.1.6.aar')
implementation files('libs/qmf-ppplugin-android-3.1.7-ali.aar')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:2.2.2'
......
app/src/main/AndroidManifest.xml
View file @ 88cc501b
......@@ -16,6 +16,7 @@
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<!--支付-->
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
......@@ -275,14 +276,19 @@
/>
<activity android:name=".wxapi.WXEntryActivity"
<activity
android:name=".wxapi.WXPayEntryActivity"
android:exported="true"
android:launchMode="singleTask"
android:taskAffinity="com.xx.merchanthbh"
android:screenOrientation="portrait">
android:launchMode="singleTop">
</activity>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:scheme="wx0f25d8c6bc282a16"/>
</intent-filter>
</activity>
</application>
<queries>
<package android:name="com.tencent.mm" />
......@@ -291,5 +297,4 @@
</queries>
</manifest>
\ No newline at end of file
app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayActivity.kt
View file @ 88cc501b
package com.xx.merchanthbh.ui.electric
import android.Manifest
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.text.Editable
import android.text.TextUtils
import android.text.TextWatcher
import android.view.View
import androidx.recyclerview.widget.RecyclerView
......@@ -12,7 +16,10 @@ import com.xx.merchanthbh.R
import com.xx.merchanthbh.data.http.requst.ElectricPayRequest
import com.xx.merchanthbh.data.staticdata.StaticData
import com.xx.merchanthbh.databinding.ActivityElectricPayBinding
import io.reactivex.rxjava3.core.Observer
import io.reactivex.rxjava3.disposables.Disposable
import me.goldze.mvvmhabit.base.BaseActivity
import me.goldze.mvvmhabit.utils.ToastUtils
class ElectricPayActivity : BaseActivity<ActivityElectricPayBinding, ElectricPayViewModel>() {
......@@ -113,5 +120,37 @@ class ElectricPayActivity : BaseActivity<ActivityElectricPayBinding, ElectricPay
).into(binding.imageStore)
}
}
viewModel.call.observe(this) { call ->
if (!TextUtils.isEmpty(call)) {
rp.request(Manifest.permission.CALL_PHONE, Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(object: Observer<Boolean>{
override fun onSubscribe(d: Disposable) {
}
override fun onError(e: Throwable) {
ToastUtils.showShort("请开启拨打电话权限，否则无法正常使用完整功能")
}
override fun onComplete() {
}
override fun onNext(t: Boolean) {
if (t) {
val intent = Intent(Intent.ACTION_CALL)
val data = Uri.parse("tel:13011367877")
intent.data = data
startActivity(intent)
} else {
ToastUtils.showShort("请开启拨打电话权限，否则无法正常使用完整功能")
}
}
})
}
}
}
}
\ No newline at end of file
}
app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayViewModel.java
View file @ 88cc501b
......@@ -4,8 +4,10 @@ import static android.provider.ContactsContract.Directory.PACKAGE_NAME;
import android.app.Application;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.util.Log;
import android.view.View;
......@@ -52,6 +54,9 @@ public class ElectricPayViewModel extends BaseViewModel<ElectricPayRequest> {
// 创建商户logo的实体对象
private MutableLiveData<String> storeImageUrl = new MutableLiveData<>("");
public MutableLiveData<String> call = new MutableLiveData<>("");
//商户信息
public MerchantBean userMerchant = LocalData.getMerchant();
......@@ -265,6 +270,24 @@ public class ElectricPayViewModel extends BaseViewModel<ElectricPayRequest> {
}
public void callPhone(View view)
{
showCommTextDialog(new RefuseDialogBean("客服电话：13011367877", "呼叫", "取消", ""), new CommTextDialog.onAcceptCallBack() {
@Override
public void acceptBack() {
call.postValue("1231");
}
@Override
public void refuseBack() {
dismissDialog();
}
});
}
public View.OnClickListener goBillList = new View.OnClickListener() {
@Override
......
app/src/main/java/com/xx/merchanthbh/wxapi/WXEntryActivity.java → app/src/main/java/com/xx/merchanthbh/wxapi/WXPayEntryActivity.java
View file @ 88cc501b
......@@ -4,11 +4,8 @@ import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.widget.Button;
import android.widget.Toast;
import com.chinaums.pppay.unify.UnifyPayPlugin;
import com.google.gson.JsonObject;
import com.tencent.mm.opensdk.constants.ConstantsAPI;
import com.tencent.mm.opensdk.modelbase.BaseReq;
import com.tencent.mm.opensdk.modelbase.BaseResp;
......@@ -22,8 +19,8 @@ import com.xx.merchanthbh.ui.bill.BillListActivity;
import org.json.JSONException;
import org.json.JSONObject;
public class WXEntryActivity extends AppCompatActivity implements IWXAPIEventHandler {
private static final String TAG = "debug";
public class WXPayEntryActivity extends AppCompatActivity implements IWXAPIEventHandler {
private static final String TAG = "WXEntryActivity";
private IWXAPI api;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -31,7 +28,6 @@ public class WXEntryActivity extends AppCompatActivity implements IWXAPIEventHan
Log.d(TAG,"WXEntryActivity --- onCreate");
setContentView(R.layout.activity_wxpay_entry);
api = WXAPIFactory.createWXAPI(this,UnifyPayPlugin.getInstance(this).getAppId());
api.handleIntent(getIntent(), this);
}
......@@ -50,31 +46,22 @@ public class WXEntryActivity extends AppCompatActivity implements IWXAPIEventHan
@Override
public void onResp(BaseResp baseResp) {
Log.d(TAG,"WXEntryActivity --- onResp");
if (baseResp.getType() == ConstantsAPI.COMMAND_LAUNCH_WX_MINIPROGRAM) {
WXLaunchMiniProgram.Resp launchMiniProResp = (WXLaunchMiniProgram.Resp) baseResp;
String extraData =launchMiniProResp.extMsg; //对应小程序组件 <button open-type="launchApp"> 中的 app-parameter 属性
Log.d(TAG,"onResp --- " + extraData);
Log.d(TAG,"WXEntryActivity --- onReq"+baseResp.getType());
if (baseResp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
// UnifyPayPlugin.getInstance(this).getWXListener().onResponse(this, baseResp);
/* Toast.makeText(this,msg,Toast.LENGTH_LONG).show();*/
UnifyPayPlugin.getInstance(this).getWXListener().onResponse(this, baseResp);
try {
JSONObject object=new JSONObject(extraData);
if (object.getInt("errCode")==0)
if (baseResp.errCode==0)
{
startActivity(new Intent(this, BillListActivity.class));
finish();
}else {
finish();
}
} catch (JSONException e) {
throw new RuntimeException(e);
}
}else {
Log.d(TAG,"WXEntryActivity --- onReq"+baseResp.getType());
finish();
}
......
app/src/main/res/layout/activity_electric_pay.xml
View file @ 88cc501b
......@@ -56,7 +56,7 @@
android:orientation="vertical"
android:padding="17dp">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="96dp"
android:background="@mipmap/home_img_bg"
......@@ -67,6 +67,9 @@
android:id="@+id/image_store"
android:layout_width="48dp"
android:layout_height="48dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:src="@drawable/bg_white_radius_12"
android:layout_gravity="center"
android:layout_marginLeft="17dp"
......@@ -76,11 +79,27 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="17dp"
app:layout_constraintLeft_toRightOf="@+id/image_store"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:text="@{viewModel.companyName}"
android:textColor="@color/white"
android:textSize="18dp" />
</LinearLayout>
<ImageView
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginLeft="17dp"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_margin="17dp"
android:onClick="@{viewModel.callPhone}"
android:src="@mipmap/kefu"
android:textColor="@color/white"
android:textSize="18dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_home.xml
View file @ 88cc501b
......@@ -229,15 +229,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<!--电费余额模块-->
<androidx.constraintlayout.widget.ConstraintLayout
<!-- <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_columnSpan="1"
android:layout_columnWeight="1"
tools:ignore="MissingConstraints">
<!--今日下单用户-->
&lt;!&ndash;今日下单用户&ndash;&gt;
<!--今日下单用户-->
&lt;!&ndash;今日下单用户&ndash;&gt;
<TextView
android:id="@+id/tv_home_tf"
style="@style/CommText"
......@@ -246,7 +246,7 @@
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent" />
<!--今日下单用户数-->
&lt;!&ndash;今日下单用户数&ndash;&gt;
<TextView
android:id="@+id/tv_home_tfn"
android:layout_width="wrap_content"
......@@ -270,7 +270,7 @@
app:layout_constraintLeft_toRightOf="@+id/tv_home_tfn" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>-->
</GridLayout>
</LinearLayout>
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkFragment.java
View file @ 88cc501b
......@@ -121,12 +121,5 @@ public class WorkFragment extends BaseFragment<FragmentWorkBinding, WorkViewMode
}
});
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
if (!Environment.isExternalStorageManager()) {
Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
intent.setData(Uri.parse("package:" + getContext().getPackageName()));
startActivityForResult(intent, 1024);
}
}
}
}
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.java
View file @ 88cc501b
......@@ -402,7 +402,7 @@ public class WorkViewModel extends BaseViewModel<WorkRequest> {
/*商品审核值赋值*/
if (StaticData.productManagementId == 1)
{
if (t2.get().equals("0"))
if (type==0 && t2.get().equals("0"))
{
ToastUtils.showShort("暂无内容");
}else {
......
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java
View file @ 88cc501b
......@@ -61,7 +61,7 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
private MaterialDialog dialog;
private NUllDialog nullDialog;
RxPermissions rp;
public RxPermissions rp;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......
xxviewlibrary/build.gradle
View file @ 88cc501b
......@@ -6,11 +6,11 @@ plugins {
android {
namespace 'com.xx.xxviewlibrary'
compileSdk 33
compileSdk 30
defaultConfig {
minSdk 23
targetSdk 33
targetSdk 30
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
......
xxviewlibrary/src/main/java/com/xx/xxviewlibrary/utils/CommUtils.kt
View file @ 88cc501b
......@@ -84,6 +84,8 @@ fun checkVersionUpdata(self: String, line: String): Boolean {
if (lines.get(i).toInt() > selfs.get(i).toInt()) {
return true
}else if (lines.get(i).toInt() < selfs.get(i).toInt()){
return false
}
}
......
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