Skip to content

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

基础搭建 

1：XxBar 添加右面按钮功能
功能开发
1：完善诉求管理
parent 8a49520b
Show whitespace changes
Inline Side-by-side
Showing with 544 additions and 139 deletions
.idea/workspace.xml
View file @ e403c6b7
......@@ -9,22 +9,11 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：企业端-商品审核">
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/requst/OrderCreateRequest.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/respons/MemberInfoBean.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreatFragment.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreateActivity.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreateViewModel.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrserSelectProductAdapter.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/SelectProductFragment.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_order_create.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_order_create.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_product_select_list.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_product_select.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/chuangjiandingdan_icon_jia.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/chuangjiandingdan_icon_jian.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/chuangjiandingdan_icon_shanchu.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/navigation/nav_order_creat.xml" afterDir="false" />
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;1：XxBar 添加右面按钮功能&#10;功能开发&#10;1：完善商户审批流程">
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/dialog/SignDialog.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_sign.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/home_icon_qiandao.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dsbridge/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/checksums.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/md5-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" />
......@@ -36,14 +25,34 @@
<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/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$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/androidTest/java/com/xx/merchanthbh/ExampleInstrumentedTest.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/androidTest/java/com/xx/merchanthbh/ExampleInstrumentedTest.kt" 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/src/main/java/com/xx/merchanthbh/data/http/requst/AppealRequest.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/requst/AppealRequest.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/requst/HomeRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/requst/HomeRequest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/respons/OrderBean.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/data/http/respons/OrderBean.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealDetailActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealDetailActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealDetailViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealDetailViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditActivity.java" 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/appeallist/AppealListAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeallist/AppealListAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeallist/AppealListViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeallist/AppealListViewModel.java" 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/home/HomeViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/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/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreatFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreatFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreateViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreateViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_add_product.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_add_product.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$/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$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_order_create.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_order_create.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_product_select_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_product_select_list.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_appeal_detail.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_appeal_detail.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/androidTest/java/com/xx/hbhconsumer/ExampleInstrumentedTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/androidTest/java/com/xx/hbhconsumer/ExampleInstrumentedTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/androidTest/java/com/xx/hbhbcompany/ExampleInstrumentedTest.kt" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/androidTest/java/com/xx/hbhbcompany/ExampleInstrumentedTest.kt" 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$/hbhbcompany/src/main/res/layout/fragment_quality_audit_shop.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/res/layout/fragment_quality_audit_shop.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/xxviewlibrary/src/main/res/layout/witget_xx_edit.xml" beforeDir="false" afterPath="$PROJECT_DIR$/xxviewlibrary/src/main/res/layout/witget_xx_edit.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -78,10 +87,10 @@
<list>
<option value="layoutResourceFile_vertical" />
<option value="Kotlin File" />
<option value="resourceFile" />
<option value="navigationResourceFile" />
<option value="Class" />
<option value="resourceFile" />
<option value="layoutResourceFile" />
<option value="Class" />
<option value="Kotlin Class" />
</list>
</option>
......@@ -139,9 +148,9 @@
"cidr.known.project.marker": "true",
"com.google.services.firebase.aqiPopupShown": "true",
"dart.analysis.tool.window.visible": "false",
"last_directory_selection": "D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi",
"last_opened_file_path": "D:/androidProJect/HBHFurniture/app/src/main/res/layout",
"project.structure.last.edited": "Dependencies",
"last_directory_selection": "D:/androidProJect/HBHFurniture/hbhbcompany/src/main/res/mipmap-xhdpi",
"last_opened_file_path": "D:/androidProJect/LawsuitService",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "preferences.pluginManager",
......@@ -159,11 +168,11 @@
<recent name="com.example.merchanthbh.ui.Home" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\androidProJect\HBHFurniture\hbhbcompany\src\main\res\mipmap-xhdpi" />
<recent name="D:\androidProJect\HBHFurniture\hbhbcompany\src\main\res\drawable" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\drawable" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\layout" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\mipmap-xhdpi" />
<recent name="D:\androidProJect\HBHFurniture\hbhbcompany\src\main\res\drawable" />
<recent name="D:\androidProJect\HBHFurniture\hbhbcompany\src\main\res\layout" />
<recent name="D:\androidProJect\HBHFurniture\hbhbcompany\src\main\java\com\xx\hbhbcompany\data\http\respons" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\androidProJect\HBHFurniture\hbhbcompany\src\main\res\layout" />
......@@ -173,16 +182,16 @@
<recent name="D:\androidProJect\HBHFurniture\app\src\main\java\com\example\merchanthbh\data\requst" />
</key>
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
<recent name="com.xx.merchanthbh.data.http.respons" />
<recent name="com.xx.merchanthbh.data.http.requst" />
<recent name="com.xx.xxviewlibrary.comm" />
<recent name="com.xx.xxviewlibrary.witget" />
<recent name="com.xx.hbhbcompany.data.http.respons" />
<recent name="com.example.merchanthbh.data.http.respons" />
<recent name="com.example.merchanthbh.ui.merchantenter" />
</key>
<key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
<recent name="com.xx.merchanthbh.data.http.requst" />
<recent name="com.xx.hbhbcompany.ui.productInfo" />
<recent name="com.xx.hbhbcompany.ui.productlist" />
<recent name="com.xx.merchanthbh.dialog.adapter" />
<recent name="com.xx.merchanthbh.ui.share" />
<recent name="com.xx.hbhbcompany.ui.appeallist" />
<recent name="com.xx.hbhbcompany.data.http.respons" />
<recent name="com.xx.hbhbcompany.data.http.requst" />
</key>
......@@ -194,11 +203,11 @@
<recent name="com.xx.xxviewlibrary" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.xx.merchanthbh.data.http.requst" />
<recent name="com.xx.merchanthbh.app" />
<recent name="com.xx.hbhbcompany.ui.productInfo" />
<recent name="com.xx.xxviewlibrary.comm" />
<recent name="com.xx.merchanthbh.ui.merchantinfo" />
<recent name="me.goldze.mvvmhabit.http" />
<recent name="com.example.hbhbcompany.app" />
</key>
</component>
<component name="RunManager" selected="Android App.app">
......@@ -647,7 +656,98 @@
<option name="project" value="LOCAL" />
<updated>1691395142526</updated>
</task>
<option name="localTasksCounter" value="30" />
<task id="LOCAL-00030" summary="基础搭建&#10;功能开发&#10;1：商户-创建订单">
<created>1691457094021</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1691457094021</updated>
</task>
<task id="LOCAL-00031" summary="基础搭建&#10;功能开发&#10;1：商户-创建订单&#10;2：企业-修改身份逻辑">
<created>1691479839336</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1691479839336</updated>
</task>
<task id="LOCAL-00032" summary="基础搭建&#10;功能开发&#10;1：商户-创建订单">
<created>1691487127857</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1691487127857</updated>
</task>
<task id="LOCAL-00033" summary="基础搭建&#10;功能开发&#10;1：商户-诉求列表">
<created>1691649384341</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1691649384341</updated>
</task>
<task id="LOCAL-00034" summary="基础搭建&#10;功能开发&#10;1：商户-诉求列表">
<created>1691651980236</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1691651980236</updated>
</task>
<task id="LOCAL-00035" summary="基础搭建&#10;功能开发&#10;1：企业-诉求列表">
<created>1691667414051</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1691667414051</updated>
</task>
<task id="LOCAL-00036" summary="基础搭建&#10;1：XxesitForm添加定义InputType 功能&#10;功能开发&#10;1：完善登陆功能">
<created>1691744471710</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1691744471710</updated>
</task>
<task id="LOCAL-00037" summary="基础搭建&#10;1：添加dsBridge&#10;功能开发">
<created>1691744561732</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1691744561732</updated>
</task>
<task id="LOCAL-00038" summary="基础搭建&#10;1：添加dsBridge&#10;功能开发">
<created>1692062133811</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1692062133811</updated>
</task>
<task id="LOCAL-00039" summary="基础搭建&#10;1：XxFormEdit 添加了多行文本展示类型&#10;功能开发&#10;2：完善了店铺信息展示">
<created>1692079511651</created>
<option name="number" value="00039" />
<option name="presentableId" value="LOCAL-00039" />
<option name="project" value="LOCAL" />
<updated>1692079511651</updated>
</task>
<task id="LOCAL-00040" summary="基础搭建&#10;1：XxBar 左边返回点击事件&#10;功能开发">
<created>1692084802991</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1692084802991</updated>
</task>
<task id="LOCAL-00041" summary="基础搭建&#10;1：XxBar 添加右面按钮功能&#10;功能开发&#10;1：完善商户审批流程">
<created>1692175009108</created>
<option name="number" value="00041" />
<option name="presentableId" value="LOCAL-00041" />
<option name="project" value="LOCAL" />
<updated>1692175009108</updated>
</task>
<task id="LOCAL-00042" summary="基础搭建&#10;1：XxBar 添加右面按钮功能&#10;功能开发&#10;1：完善商户审批流程">
<created>1692177608368</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1692177608368</updated>
</task>
<option name="localTasksCounter" value="43" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
......@@ -655,20 +755,20 @@
<map>
<entry key="MAIN">
<value>
<State />
<State>
<option name="COLUMN_ID_WIDTH">
<map>
<entry key="Table.Default.Author.ColumnIdWidth" value="83" />
<entry key="Table.Default.Date.ColumnIdWidth" value="106" />
</map>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="环渤海-我的页面创建" />
<MESSAGE value="基础功能完善&#10;1：完善表单输入控件&#10;2：完善注册" />
<MESSAGE value="基础功能完善&#10;1：完善表单输入控件,添加TextView展示内容&#10;功能开发&#10;1：完成注册页面&#10;2：添加商品信息提交页面&#10;3：添加获取个人信息接口" />
<MESSAGE value="&#10;功能开发&#10;1：文件路径名称调整&#10;2：添加本地数据存储" />
<MESSAGE value="&#10;功能开发&#10;1：完善用户信息的商户信息" />
<MESSAGE value="&#10;功能开发&#10;1：添加图片选择，文件上传" />
<MESSAGE value="基础功能&#10; 1：添加ADapter,Dialog 基础类&#10; &#10;功能开发&#10; 1：实现展位列表" />
<MESSAGE value="基础功能&#10; 1：添加ADapter,Dialog 基础类&#10; &#10;功能开发&#10; 1：实现品牌" />
<MESSAGE value="基础功能&#10; 1：完善xxFormEdit&#10; &#10;功能开发&#10; 1：实现开店申请" />
<MESSAGE value="&#10;功能开发&#10; 1：环渤海活动列表&#10; 2：等待审核页面" />
......@@ -685,58 +785,34 @@
<MESSAGE value="基础搭建&#10;1:添加刷新加载控件&#10;功能开发&#10;1：企业商品管理列表" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：修复开店第一次使用bug" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业端-商品审核" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：企业端-商品审核" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户-创建订单&#10;2：企业-修改身份逻辑" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户-创建订单" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户-诉求列表" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业-诉求列表" />
<MESSAGE value="基础搭建&#10;1：XxesitForm添加定义InputType 功能&#10;功能开发&#10;1：完善登陆功能" />
<MESSAGE value="基础搭建&#10;1：添加dsBridge&#10;功能开发" />
<MESSAGE value="基础搭建&#10;1：XxFormEdit 添加了多行文本展示类型&#10;功能开发&#10;2：完善了店铺信息展示" />
<MESSAGE value="基础搭建&#10;1：XxBar 左边返回点击事件&#10;功能开发" />
<MESSAGE value="基础搭建&#10;1：XxBar 添加右面按钮功能&#10;功能开发&#10;1：完善商户审批流程" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;1：XxBar 添加右面按钮功能&#10;功能开发&#10;1：完善商户审批流程" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/dialog/data/ProductTypeProvider.kt</url>
<line>26</line>
<option name="timeStamp" value="245" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/dialog/data/ProductTypeProvider.kt</url>
<line>25</line>
<option name="timeStamp" value="246" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-function">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/dialog/ProductTypeDialog.kt</url>
<line>26</line>
<properties class="com.xx.merchanthbh.dialog.ProductTypeDialog">
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="251" />
</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>241</line>
<option name="timeStamp" value="253" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/order/OrderDetailViewModel.java</url>
<line>95</line>
<option name="timeStamp" value="254" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/order/OrderDetailViewModel.java</url>
<line>86</line>
<option name="timeStamp" value="255" />
</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>196</line>
<option name="timeStamp" value="258" />
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java</url>
<line>110</line>
<option name="timeStamp" value="320" />
</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>201</line>
<option name="timeStamp" value="259" />
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java</url>
<line>117</line>
<option name="timeStamp" value="321" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/productInfo/ProductInfoFragmentViewModel.java</url>
<line>54</line>
<option name="timeStamp" value="260" />
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java</url>
<line>118</line>
<option name="timeStamp" value="322" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
......
app/src/androidTest/java/com/xx/merchanthbh/ExampleInstrumentedTest.kt
View file @ e403c6b7
package com.xx.merchanthbh
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Test
......
app/src/main/java/com/xx/merchanthbh/data/http/requst/AppealRequest.kt
View file @ e403c6b7
......@@ -56,8 +56,8 @@ class AppealRequest : BaseRespons() {
/**
* 获取诉求详情
*/
fun getAppealDetailById(): Observable<BaseResponse<AppealBean>> {
return apiService.getAppealDetailById("15f29fe32d1670bc3a931923c34636b4");
fun getAppealDetailById(id:String): Observable<BaseResponse<AppealBean>> {
return apiService.getAppealDetailById(id);
}
class AppealInfo(
......
app/src/main/java/com/xx/merchanthbh/data/http/requst/HomeRequest.java
View file @ e403c6b7
......@@ -12,4 +12,12 @@ public class HomeRequest extends BaseRespons {
return getApiService().getHomeStatistical();
}
/**
* 签到
*/
public Observable<BaseResponse<Boolean>> getSign(String id) {
return getApiService().getSign(id);
}
}
app/src/main/java/com/xx/merchanthbh/data/http/respons/OrderBean.kt
View file @ e403c6b7
......@@ -10,7 +10,7 @@ data class OrderBean(
/*orderStatus string 订单状态 1-待付款 2-已完成 3-已关闭:1-待付款,2-已完成,3-已关闭*/
var orderStatus:String,
/*orderAmount Number 订金金额*/
var orderAmount:Number,
var orderAmount:Int,
/*quantity Int 商品库存数量*/
var quantity:Int,
/*商品信息*/
......@@ -31,12 +31,8 @@ data class OrderBean(
/*购买数量*/
var commodityQuantity:Int,
/*商品图片信息*/
var commodityPictureList: List<commodityPictureLists>,
var commodityPictureList: List<Filebean>,
)
/*商品图片信息*/
data class commodityPictureLists(
/*商品路径*/
var filePath:String,
)
}
\ No newline at end of file
app/src/main/java/com/xx/merchanthbh/dialog/SignDialog.kt 0 → 100644
View file @ e403c6b7
package com.xx.merchanthbh.dialog
import android.content.Context
import android.content.Intent
import android.view.Gravity
import android.view.View
import android.view.WindowManager
import com.xx.merchanthbh.R
import com.xx.merchanthbh.databinding.DialogSignBinding
import com.xx.merchanthbh.ui.point.StorePointsActivity
import com.xx.xxviewlibrary.base.xxBaseDialog
import me.jessyan.autosize.utils.AutoSizeUtils
class SignDialog(context:Context): xxBaseDialog<DialogSignBinding>(context) {
override fun InitView(): DialogSet {
return DialogSet(
R.layout.dialog_sign,true,
Gravity.CENTER,true, WindowManager.LayoutParams.MATCH_PARENT,
AutoSizeUtils.dp2px(context,
216.0F));
}
override fun InitData() {
binding.signDialog = this
binding.btnConfirm.setOnClickListener {
dismiss()
}
}
//查看积分明细
fun typeClickDialog(view:View)
{
context.startActivity(Intent(context, StorePointsActivity::class.java));
}
}
\ No newline at end of file
app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealDetailActivity.java
View file @ e403c6b7
......@@ -45,7 +45,7 @@ public class AppealDetailActivity extends BaseActivity<ActivityAppealDetailBindi
public void initData() {
super.initData();
/*调取诉求详情*/
viewModel.getAppealDetailById();
viewModel.getAppealDetailById(getIntent().getStringExtra("appealId"));
//展示上传图片列表
AppealDetailListAdapter adapter = new AppealDetailListAdapter(this);
binding.rvDblList.setAdapter(adapter);
......
app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealDetailViewModel.java
View file @ e403c6b7
......@@ -55,8 +55,8 @@ public class AppealDetailViewModel extends BaseViewModel<AppealRequest> {
}
/*获取诉求详情*/
public void getAppealDetailById() {
model.getAppealDetailById()
public void getAppealDetailById(String id) {
model.getAppealDetailById(id)
.compose(RxUtils.schedulersTransformer()) //线程调度
.doOnSubscribe(AppealDetailViewModel.this)
.doOnSubscribe(new Consumer<Disposable>() {
......
app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditActivity.java
View file @ e403c6b7
......@@ -31,10 +31,12 @@ public class AppealEditActivity extends BaseActivity<ActivityAppealEditBinding,
public void initData() {
super.initData();
/*调取诉求详情*/
viewModel.getAppealDetailById();
viewModel.getAppealDetailById(getIntent().getStringExtra("appealId"));
// 调用ViewModel的方法来刷新昵称
viewModel.refreshNickName();
/*上传图片*/
viewModel.appealPicsAdapter= new AddImgAdapter(this, new ArrayList(),5);
binding.rvAapProduct.setAdapter(viewModel.appealPicsAdapter);
......
app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java
View file @ e403c6b7
......@@ -79,8 +79,8 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
}
/*获取诉求详情*/
public void getAppealDetailById() {
model.getAppealDetailById()
public void getAppealDetailById(String id) {
model.getAppealDetailById(id)
.compose(RxUtils.schedulersTransformer()) //线程调度
.doOnSubscribe(AppealEditViewModel.this)
.doOnSubscribe(new Consumer<Disposable>() {
......@@ -90,7 +90,6 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
}).subscribe(new ApiDisposableObserver<AppealBean>() {
@Override
public void onSuccess(AppealBean resultBean) {
Log.v("businessIddeddddddddd", String.valueOf(resultBean.getBusinessId()));
/*businessId*/
businessId.set(String.valueOf(resultBean.getBusinessId()));
/*反馈人*/
......@@ -106,9 +105,18 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
/*反馈类型*/
dictSort = String.valueOf(resultBean.getAppAppealType());
/*上传图片*/
for (AppealFilesBean appealFile : resultBean.getAppealFiles()) {
fList.add(new FileBean(appealFile.getId(), appealFile.getPath()));
}
appealPicsAdapter.mList=fList;
if (appealPicsAdapter.mList.size()<5)
{
appealPicsAdapter.mList.add(new FileBean(null,null));
}
appealPicsAdapter.notifyDataSetChanged();
getAppealTypesList();
}
......@@ -256,12 +264,6 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
.map(fileBean -> fileBean.getId())
.collect(Collectors.toList());
}
Log.v("1--dictValue的值!!!!!:", String.valueOf(dictSort));
Log.v("2--appealCustom的值!!!!!:", appealCustom.get());
Log.v("3--appealPerson的值!!!!!:", appealPerson.get());
Log.v("4--appealPhone的值!!!!!:", appealPhone.get());
Log.v("5--appealDescribe的值!!!!!:", appealDescribe.get());
Log.v("6--这是图片的数组:", uploadImgs.toString());
/*依次传入businessId,反馈类型,诉求商户,反馈人,联系方式,文字描述,上传图片*/
/*调用request的添加接口*/
......@@ -275,7 +277,6 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
}).subscribe(new ApiDisposableObserver<Boolean>() {
@Override
public void onSuccess(Boolean resultBean) {
startActivity(HomeActivity.class);
finish();
}
......
app/src/main/java/com/xx/merchanthbh/ui/appeallist/AppealListAdapter.kt
View file @ e403c6b7
......@@ -4,6 +4,7 @@ import android.app.ActionBar.LayoutParams
import android.content.Context
import android.content.Intent
import android.graphics.Bitmap
import android.os.Bundle
import android.view.View
import android.widget.ImageView
import androidx.core.content.ContextCompat.startActivity
......@@ -14,12 +15,19 @@ import com.bumptech.glide.request.target.Target
import com.xx.merchanthbh.R
import com.xx.merchanthbh.data.http.respons.AppealListBean
import com.xx.merchanthbh.databinding.ItemAppealListBinding
import com.xx.merchanthbh.ui.appeal.AppealDetailActivity
import com.xx.merchanthbh.ui.appeal.AppealEditActivity
import com.xx.merchanthbh.utils.RetrofitClient
import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter
import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter.OnItemClick
import me.jessyan.autosize.utils.AutoSizeUtils
class AppealListAdapter(context:Context): xxBaseRecyclerViewAdapter<ItemAppealListBinding, AppealListBean>(context) {
class AppealListAdapter(context:Context): xxBaseRecyclerViewAdapter<ItemAppealListBinding, AppealListBean>(context),OnItemClick<AppealListBean> {
init {
itemClick=this
}
override fun initLayout(): Int {
return R.layout.item_appeal_list
}
......@@ -55,7 +63,7 @@ class AppealListAdapter(context:Context): xxBaseRecyclerViewAdapter<ItemAppealLi
dataBind?.btnIalEdit?.visibility= View.VISIBLE
}
}
dataBind?.llIalImgs?.removeAllViews()
for (file in data?.appealFiles!!)
{
var iv=ImageView(mContext)
......@@ -74,9 +82,16 @@ class AppealListAdapter(context:Context): xxBaseRecyclerViewAdapter<ItemAppealLi
dataBind?.btnIalEdit?.setOnClickListener()
{
//todo 跳转编辑页面
val intent = Intent(mContext, AppealEditActivity::class.java)
intent.putExtra("appealId",data.businessId)
mContext.startActivity(intent)
}
}
override fun itemClickCalBack(position: Int, data: AppealListBean?) {
val intent = Intent(mContext, AppealDetailActivity::class.java)
intent.putExtra("appealId",data?.businessId)
mContext.startActivity(intent)
}
}
\ No newline at end of file
app/src/main/java/com/xx/merchanthbh/ui/appeallist/AppealListViewModel.java
View file @ e403c6b7
......@@ -71,10 +71,12 @@ public class AppealListViewModel extends ListBaseViewModel<AppealListRequest> {
.doOnSubscribe(new Consumer<Disposable>() {
@Override
public void accept(Disposable disposable) throws Exception {
showDialog();
}
}).subscribe(new ApiDisposablePageObserver<AppealListBean>() {
@Override
public void onSuccess(List<AppealListBean> resultBean) {
dismissDialog();
if (page==1)
{
adapter.mList=resultBean;
......@@ -86,7 +88,7 @@ public class AppealListViewModel extends ListBaseViewModel<AppealListRequest> {
@Override
public void onError(String Error) {
dismissDialog();
}
@Override
......
app/src/main/java/com/xx/merchanthbh/ui/home/HomeFragment.java
View file @ e403c6b7
......@@ -3,6 +3,7 @@ package com.xx.merchanthbh.ui.home;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.Nullable;
......@@ -15,11 +16,13 @@ import com.xx.merchanthbh.data.http.requst.HomeRequest;
import com.xx.merchanthbh.data.http.respons.AdvertisingBean;
import com.xx.merchanthbh.data.http.respons.ConsultationInformationBean;
import com.xx.merchanthbh.databinding.FragmentHomeBinding;
import com.xx.merchanthbh.dialog.SignDialog;
import com.xx.merchanthbh.fragment.adapter.ConsultationInformationTitleAdapter;
import com.xx.merchanthbh.fragment.adapter.ConsultationsInformationAdapter;
import com.xx.merchanthbh.ui.consult.ConsultationActivity;
import com.xx.merchanthbh.ui.consult.ConsultationViewModel;
import com.xx.merchanthbh.ui.consult.HomeBannerAdapter;
import com.xx.xxviewlibrary.base.xxBaseDialog;
import com.youth.banner.indicator.CircleIndicator;
import java.util.List;
......@@ -48,8 +51,15 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding, HomeViewMode
public void initData() {
super.initData();
/*调首页统计数据接口*/
Log.v("!!!!!!!!!!!!!!!!!!!!!!!!","11");
viewModel.getHomeStatistical();
viewModel.showSignDialog.observe(this,show -> {
SignDialog dialog=new SignDialog(getContext());
dialog.show();
});
}
@Override
public HomeViewModel initViewModel() {
......@@ -57,4 +67,6 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding, HomeViewMode
return new HomeViewModel(getActivity().getApplication(), lm);
}
}
app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java
View file @ e403c6b7
......@@ -3,13 +3,16 @@ package com.xx.merchanthbh.ui.home;
import android.app.Application;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.databinding.ObservableField;
import androidx.lifecycle.MutableLiveData;
import com.xx.merchanthbh.R;
import com.xx.merchanthbh.data.http.requst.HomeRequest;
import com.xx.merchanthbh.data.http.respons.HomeStatisticalBean;
import com.xx.merchanthbh.data.http.respons.MerchantBean;
import com.xx.merchanthbh.data.http.respons.UserInfoBean;
import com.xx.merchanthbh.data.local.LocalData;
import com.xx.merchanthbh.ui.addproduct.AddProductActivity;
......@@ -47,6 +50,10 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
public ObservableField<String> memberCount = new ObservableField<>("");
//电费余额的绑定
public ObservableField<String> electricityBalance = new ObservableField<>("");
//展示签到弹窗
public MutableLiveData<Boolean> showSignDialog=new MutableLiveData<>();
public MerchantBean mb=LocalData.getMerchant();
public HomeViewModel(@NonNull Application application) {
super(application);
}
......@@ -184,5 +191,34 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
}
/**
* 签到
*/
public void getSign(View view)
{
model.getSign(mb.getBusinessId()).compose(RxUtils.schedulersTransformer()) //线程调度
.doOnSubscribe(HomeViewModel.this)
.doOnSubscribe(new Consumer<Disposable>() {
@Override
public void accept(Disposable disposable) throws Exception {
showDialog();
}
}).subscribe(new ApiDisposableObserver<Boolean>() {
@Override
public void onSuccess(Boolean resultBean) {
dismissDialog();
showSignDialog.postValue(true);
}
@Override
public void onError(String Error) {
dismissDialog();
showSignDialog.postValue(true);
}
});
}
}
app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
View file @ e403c6b7
......@@ -16,6 +16,7 @@ import com.xx.merchanthbh.R
import com.xx.merchanthbh.data.http.requst.LoginRequest
import com.xx.merchanthbh.databinding.ActivityLoginBinding
import me.goldze.mvvmhabit.base.BaseActivity
import me.goldze.mvvmhabit.utils.SPUtils
class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
......@@ -31,7 +32,7 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
}
override fun initData() {
SPUtils.getInstance().clear()
super.initData()
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.R)
......
app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreatFragment.kt
View file @ e403c6b7
......@@ -55,7 +55,7 @@ class OrderCreatFragment: BaseFragment<FragmentOrderCreateBinding, OrderCreateVi
binding.ivFocClear.setOnClickListener()
{
binding.ivFocSelect.visibility=View.GONE
binding.ivFocClear.visibility=View.GONE
viewModel.phone.set("")
}
......
app/src/main/java/com/xx/merchanthbh/ui/ordercreate/OrderCreateViewModel.java
View file @ e403c6b7
......@@ -24,6 +24,7 @@ import io.reactivex.rxjava3.functions.Consumer;
import me.goldze.mvvmhabit.http.ApiDisposableObserver;
import me.goldze.mvvmhabit.http.ApiDisposablePageObserver;
import me.goldze.mvvmhabit.utils.RxUtils;
import me.goldze.mvvmhabit.utils.ToastUtils;
public class OrderCreateViewModel extends ListBaseViewModel<OrderCreateRequest> {
......@@ -41,6 +42,8 @@ public class OrderCreateViewModel extends ListBaseViewModel<OrderCreateRequest>
public MutableLiveData<Double> total=new MutableLiveData<>(0.0d);
public ObservableField<String> searchWord=new ObservableField<>("");
public OrderCreateViewModel(@NonNull Application application) {
super(application);
......@@ -83,7 +86,7 @@ public class OrderCreateViewModel extends ListBaseViewModel<OrderCreateRequest>
*/
public void getProductList()
{
model.getProductForPrder("",page). compose(RxUtils.schedulersTransformer()) //线程调度
model.getProductForPrder(searchWord.get(),page). compose(RxUtils.schedulersTransformer()) //线程调度
// .compose(RxUtils.exceptionTransformer()) // 网络错误的异常转换, 这里可以换成自己的ExceptionHandle
.doOnSubscribe(OrderCreateViewModel.this)
.doOnSubscribe(new Consumer<Disposable>() {
......@@ -161,6 +164,11 @@ public class OrderCreateViewModel extends ListBaseViewModel<OrderCreateRequest>
public void createOrder(View view )
{
if (orderProductList.size()<=0)
{
ToastUtils.showShort("请选择商品");
return;
}
model.createOrder(memberInfoBean.get(),orderProductList).compose(RxUtils.schedulersTransformer()) //线程调度
// .compose(RxUtils.exceptionTransformer()) // 网络错误的异常转换, 这里可以换成自己的ExceptionHandle
.doOnSubscribe(OrderCreateViewModel.this)
......@@ -182,5 +190,15 @@ public class OrderCreateViewModel extends ListBaseViewModel<OrderCreateRequest>
});
}
/**
* 筛选商品
* @param view
*/
public void searchGoods(View view )
{
page=1;
getProductList();
}
}
app/src/main/res/layout/activity_add_product.xml
View file @ e403c6b7
......@@ -212,7 +212,7 @@
android:onClick="@{viewModel.openBrankDialog}"
ed_content="@{viewModel.pBrand}"
ed_title='@{@string/product_brank}'
isBottom="true"
app:isBottom="true"
/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
......
app/src/main/res/layout/dialog_sign.xml 0 → 100644
View file @ e403c6b7
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:binding="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
>
<data>
<variable
name="signDialog"
type="com.xx.merchanthbh.dialog.SignDialog" />
<import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LayoutManagers" />
<import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LineManagers" />
</data>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="216dp"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/bg_white_radius_12">
<LinearLayout
android:id="@+id/ll_tips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_centerHorizontal="true"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="今日已签到"
android:textSize="21sp"
android:textColor="#FF333333"
android:textStyle="bold"/>
</LinearLayout>
<TextView
android:id="@+id/tv_credit_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:layout_below="@id/ll_tips"
android:text="查看积分明细"
android:textSize="16sp"
android:textColor="#FF5971A4"
android:onClick="@{signDialog.typeClickDialog}"/>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_confirm"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="80dp"
android:layout_marginRight="80dp"
android:layout_marginBottom="21dp"
android:background="@drawable/bg_forground_radius_24"
android:layout_alignParentBottom="true"
android:layout_marginTop="40dp"
android:textColor="@color/white"
android:text="确定"
android:textSize="16sp"
android:textStyle="bold"
/>
</RelativeLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_home.xml
View file @ e403c6b7
......@@ -42,7 +42,9 @@
binding:layout_constraintBottom_toBottomOf="parent"
binding:layout_constraintRight_toLeftOf="@+id/iv_bar_msg"
android:layout_marginRight="30.5dp"
android:src="@mipmap/home_icon_saoyisao"
android:id="@+id/iv_fh_sign"
android:onClick="@{homeViewModel.getSign}"
android:src="@mipmap/home_icon_qiandao"
/>
<ImageView
......
app/src/main/res/layout/fragment_order_create.xml
View file @ e403c6b7
......@@ -117,24 +117,50 @@
android:layout_height="1dp"
android:background="@color/line_grey"
/>
<LinearLayout
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_marginTop="28dp"
android:layout_height="wrap_content">
<TextView
style="@style/xxTextContent"
android:textColor="@color/text_grey"
android:text="@{viewModel.memberInfoBean.memberNickname}"
android:layout_marginTop="28dp"
android:text="会员姓名："
/>
<TextView
style="@style/xxTextContent"
android:textColor="@color/text_grey"
android:text="@{viewModel.memberInfoBean.memberNickname}"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_marginTop="21dp"
android:layout_marginBottom="28dp"
android:layout_height="wrap_content">
<TextView
style="@style/xxTextContent"
android:textColor="@color/text_grey"
android:text="会员等级："
/>
<TextView
style="@style/xxTextContent"
android:textColor="@color/orange"
android:text="@{viewModel.memberInfoBean.gradeName}"
android:layout_marginTop="21dp"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
......
app/src/main/res/layout/fragment_product_select_list.xml
View file @ e403c6b7
......@@ -18,12 +18,83 @@
android:layout_height="match_parent"
android:background="@color/bg_grey"
android:fitsSystemWindows="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent"
android:id="@+id/search"
app:layout_constraintLeft_toLeftOf="parent"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="17dp"
android:background="@drawable/bg_research"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="10dp"
android:layout_marginLeft="17dp"
android:layout_marginRight="17dp"
android:layout_marginBottom="13dp"
android:paddingBottom="10dp">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="17dp"
android:src="@mipmap/dianyuanguanli_icon_sousui" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="17dp"
android:layout_marginRight="15dp"
android:orientation="vertical">
<EditText
android:id="@+id/et_research"
style="@style/CommEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:textColorHint="#AEAEAE"
android:hint="请输入商品名称/商品编号"
android:text="@={viewModel.searchWord}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="17dp"
android:gravity="right"
android:orientation="horizontal">
<ImageView
android:layout_width="1dp"
android:layout_height="30dp"
android:background="#E1E1E1"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="搜索"
android:layout_marginLeft="14dp"
android:gravity="center"
android:textColor="#333333"
android:textSize="14dp"
android:onClick="@{viewModel.searchGoods}" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!--滚动轮-->
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@+id/search"
app:layout_constraintBottom_toTopOf="@+id/ll_fpsl_bottom"
android:background="@color/bg_grey">
......@@ -39,6 +110,7 @@
android:id="@+id/rv_product_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="17dp"
android:layout_gravity="center"
binding:layoutManager="@{LayoutManagers.linear(1,false)}" />
......@@ -65,7 +137,7 @@
android:layout_height="48dp"
android:layout_marginLeft="5dp"
android:layout_weight="1"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/bg_forground_radius_24"
android:text="确定"
android:id="@+id/btn_fpsl_sure"
......
app/src/main/res/layout/item_appeal_detail.xml
View file @ e403c6b7
......@@ -12,6 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingRight="11dp"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_idb_select"
......
consumer/src/androidTest/java/com/xx/hbhconsumer/ExampleInstrumentedTest.java
View file @ e403c6b7
......@@ -2,7 +2,7 @@ package com.xx.hbhconsumer;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
......
hbhbcompany/src/androidTest/java/com/xx/hbhbcompany/ExampleInstrumentedTest.kt
View file @ e403c6b7
package com.xx.hbhbcompany
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Test
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java
View file @ e403c6b7
......@@ -29,6 +29,7 @@ import me.goldze.mvvmhabit.base.BaseViewModel;
import me.goldze.mvvmhabit.base.onDataSelect;
import me.goldze.mvvmhabit.http.ApiDisposableObserver;
import me.goldze.mvvmhabit.utils.RxUtils;
import me.goldze.mvvmhabit.utils.ToastUtils;
public class QualityAuditInfoViewModel extends BaseViewModel<QualityAuditRequst> {
......@@ -47,7 +48,7 @@ public class QualityAuditInfoViewModel extends BaseViewModel<QualityAuditRequst>
//审核意见:0-通过,1-驳回
public int agree;
public int agree=0;
public class MerchantInfo
{
public MerchantInfo() {
......@@ -274,6 +275,19 @@ public class QualityAuditInfoViewModel extends BaseViewModel<QualityAuditRequst>
*/
public void submitQualityAudit(View view)
{
if (TextUtils.isEmpty(merchantInfo.leaseStartTime.get()))
{
ToastUtils.showShort("请选择开始时间");
return;
}
if (TextUtils.isEmpty(merchantInfo.leaseEndTime.get()))
{
ToastUtils.showShort("请选择结束时间");
return;
}
model.submitQualityAudit(merchantInfo.boothId,id, merchantInfo.leaseStartTime.get(), merchantInfo.leaseEndTime.get(),merchantInfo.remark.get(),agree).compose(RxUtils.schedulersTransformer()) //线程调度
.doOnSubscribe(QualityAuditInfoViewModel.this)
.doOnSubscribe(new Consumer<Disposable>() {
......
hbhbcompany/src/main/res/layout/fragment_quality_audit_shop.xml
View file @ e403c6b7
......@@ -90,6 +90,7 @@
android:layout_height="wrap_content"
android:textColor="@color/text_grey"
android:textSize="16sp"
android:checked="true"
android:text="审核通过" />
<RadioButton
......
xxviewlibrary/src/main/res/layout/witget_xx_edit.xml
View file @ e403c6b7
......@@ -43,6 +43,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginRight="20dp"
android:id="@+id/et_wxe_content"/>
<EditText
......@@ -103,8 +104,7 @@
app:layout_constraintBottom_toBottomOf="parent"
android:visibility="gone"
android:layout_marginBottom="28dp"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginRight="16dp"/>
app:layout_constraintRight_toRightOf="parent"/>
<View
android:layout_width="match_parent"
......
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