Skip to content

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

基础搭建 

功能开发
申请修改
parent 19b6e2a1
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 60 deletions
.idea/workspace.xml
View file @ 0fcbf78a
......@@ -9,7 +9,7 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：bug 修复">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;申请修改">
<change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.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" />
......@@ -18,14 +18,41 @@
<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/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08__Changes_.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/addproduct/AddProductViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/addproduct/AddProductViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/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/appeal/AppealViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_material_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_material_info.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/recruit/RecruitDetailActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/recruit/RecruitDetailActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_credits_exchange.xml" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_credits_exchange.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealEditViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealEditViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealHandleViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealHandleViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java" afterDir="false" />
</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[]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\Administrator\.android\avd\Pixel_2_API_30.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
......@@ -83,7 +110,7 @@
</option>
</component>
<component name="GenerateSignedApkSettings">
<option name="KEY_STORE_PATH" value="D:\work\key\consumer_hbh.jks" />
<option name="KEY_STORE_PATH" value="D:\work\key\merchant_hbh.jks" />
<option name="KEY_ALIAS" value="zoe" />
<option name="REMEMBER_PASSWORDS" value="true" />
<option name="BUILD_TARGET_KEY" value="apk" />
......@@ -91,7 +118,7 @@
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="89d28bb2e628fdf9826cd48aa45b134548faea79" />
<entry key="$PROJECT_DIR$" value="dev1.0.1" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -112,13 +139,13 @@
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"ApkExportedModule": "HBHFurniture.consumer",
"DEBUGGABLE_DEVICE": "huawei-tas_an00-XPL0219C19001938",
"DEBUGGABLE_PROCESS": "com.xx.hbhbcompany",
"ApkExportedModule": "HBHFurniture.app",
"DEBUGGABLE_DEVICE": "oneplus-le2120-34612fa7",
"DEBUGGABLE_PROCESS": "com.xx.hbhconsumer",
"DEBUGGER_ID": "Auto",
"ExportApk.ApkPathForHBHFurniture.app": "D:\\androidProJect\\HBHFurniture\\app",
"ExportApk.ApkPathForHBHFurniture.consumer": "D:\\androidProJect\\HBHFurniture\\consumer",
"ExportApk.ApkPathForHBHFurniture.hbhbcompany": "D:\\androidProJect\\HBHFurniture\\hbhbcompany",
"ExportApk.ApkPathForHBHFurniture.app": "D:\\work\\APK\\hbh",
"ExportApk.ApkPathForHBHFurniture.consumer": "D:\\work\\APK\\hbh",
"ExportApk.ApkPathForHBHFurniture.hbhbcompany": "D:\\work\\APK\\hbh",
"ResourceManagerPrefKey.ModuleName": "HBHFurniture.hbhbcompany.main",
"ResourceManagerPrefKey.ResourceType": "MIPMAP",
"RunOnceActivity.OpenProjectViewOnStart": "true",
......@@ -146,7 +173,7 @@
"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_opened_file_path": "D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi",
"last_opened_file_path": "D:/androidProJect/CarControl_company-master",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
......@@ -458,13 +485,6 @@
<option name="presentableId" value="Default" />
<updated>1687161738436</updated>
</task>
<task id="LOCAL-00005" summary="&#10;功能开发&#10;1：完善用户信息的商户信息">
<created>1689057289295</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1689057289295</updated>
</task>
<task id="LOCAL-00006" summary="&#10;功能开发&#10;1：完善用户信息的商户信息">
<created>1689071845317</created>
<option name="number" value="00006" />
......@@ -801,7 +821,14 @@
<option name="project" value="LOCAL" />
<updated>1700703581527</updated>
</task>
<option name="localTasksCounter" value="54" />
<task id="LOCAL-00054" summary="基础搭建&#10;功能开发&#10;合并1.0">
<created>1710984777261</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1710984777261</updated>
</task>
<option name="localTasksCounter" value="55" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
......@@ -815,7 +842,7 @@
<entry key="branch">
<value>
<list>
<option value="dev_xf_" />
<option value="dev1.0" />
</list>
</value>
</entry>
......@@ -834,8 +861,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户审核列表" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商户审核-督导审核-店铺信息" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业APP-商户审核流程粗略完成" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：企业APP-订单修改" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：商品添加" />
......@@ -859,7 +884,9 @@
<MESSAGE value="基础搭建&#10;功能开发&#10;1：完善企业端商户审核" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：bug 修复 修改品牌逻辑" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：bug 修复" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：bug 修复" />
<MESSAGE value="基础搭建&#10;功能开发&#10;合并1.0" />
<MESSAGE value="基础搭建&#10;功能开发&#10;申请修改" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;申请修改" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -879,11 +906,6 @@
<line>256</line>
<option name="timeStamp" value="499" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/http/ApiDisposableObserver.java</url>
<line>59</line>
<option name="timeStamp" value="501" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>229</line>
......@@ -901,7 +923,7 @@
</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>168</line>
<line>173</line>
<option name="timeStamp" value="509" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
......@@ -934,6 +956,56 @@
<line>369</line>
<option name="timeStamp" value="527" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayViewModel.java</url>
<line>241</line>
<option name="timeStamp" value="545" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/electric/ElectricPayViewModel.java</url>
<line>248</line>
<option name="timeStamp" value="547" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/wxapi/WXEntryActivity.java</url>
<line>53</line>
<option name="timeStamp" value="549" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/addproduct/AddProductViewModel.java</url>
<line>123</line>
<option name="timeStamp" value="550" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>214</line>
<option name="timeStamp" value="551" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java</url>
<line>225</line>
<option name="timeStamp" value="553" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>195</line>
<option name="timeStamp" value="555" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java</url>
<line>359</line>
<option name="timeStamp" value="556" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java</url>
<line>362</line>
<option name="timeStamp" value="557" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java</url>
<line>364</line>
<option name="timeStamp" value="558" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt</url>
<line>110</line>
......@@ -1024,6 +1096,14 @@
<line>39</line>
<option name="timeStamp" value="544" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>190</line>
<properties class="me.goldze.mvvmhabit.base.BaseViewModel" method="startPhotoPage">
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="554" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<pin-to-top-manager>
......
app/build.gradle
View file @ 0fcbf78a
......@@ -6,11 +6,11 @@ plugins {
def URL_DEBUG="\"http://49.232.201.130:8004/\""
def URL_RELEASE="\"https://hbhapp.cn/api/\""
def URL_RELEASE="\"https://www.hbhapp.cn/api/\""
def URL_DEBUG_H5="\"http://49.232.201.130:7005\""
def URL_RELEASE_H5="\"https://hbhapp.cn\""
def URL_RELEASE_H5="\"https://www.hbhapp.cn\""
android {
signingConfigs {
......
app/src/main/java/com/xx/merchanthbh/ui/addproduct/AddProductViewModel.java
View file @ 0fcbf78a
......@@ -121,7 +121,7 @@ public class AddProductViewModel extends BaseViewModel<AddProductRequest> {
}
startPhotoPage(true, max, new SelectCallback() {
startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于添加商品图片时读取和写入相册和文件内容", new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList=new ArrayList<>();
......
app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java
View file @ 0fcbf78a
......@@ -203,7 +203,7 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
}
startPhotoPage(true, max, new SelectCallback() {
startPhotoPage(true, max, "申请的是摄像头和照片视频读取权限，用于在诉求场景中读取和写入相册和文件内容",new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>();
......
app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealViewModel.java
View file @ 0fcbf78a
......@@ -138,7 +138,7 @@ public class AppealViewModel extends BaseViewModel<AppealRequest> {
}
startPhotoPage(true, max, new SelectCallback() {
startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于在添诉求场景中读取和写入相册和文件内容",new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>();
......
app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
View file @ 0fcbf78a
......@@ -86,14 +86,14 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
}
}
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
/* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
if (!Environment.isExternalStorageManager()) {
val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
intent.setData(Uri.parse("package:$packageName"))
startActivityForResult(intent, 1024)
}
}
}*/
if (viewModel.isAgree) {
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze2))
} else {
......
app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java
View file @ 0fcbf78a
......@@ -89,7 +89,7 @@ public class AddBrankViewModel extends BaseViewModel<MerchantEnterRequst> {
}
startPhotoPage(true, max, new SelectCallback() {
startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于在添加品牌时读取和写入相册和文件内容", new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>();
......
app/src/main/java/com/xx/merchanthbh/ui/merchantenter/MerchantEnterViewModel.java
View file @ 0fcbf78a
......@@ -133,7 +133,7 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> {
public BindingCommand getPhoto = new BindingCommand(new BindingAction() {
@Override
public void call() {
startPhotoPage(true, new SelectCallback() {
startPhotoPage(true, "申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容",new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
......@@ -438,7 +438,7 @@ public class MerchantEnterViewModel extends BaseViewModel<MerchantEnterRequst> {
public void uploadPic(View view)
{
//选择图片
startPhotoPage(true, new SelectCallback() {
startPhotoPage(true,"申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容", new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
model.upLoadFile(new File(photos.get(0).path)).compose(RxUtils.schedulersTransformer()) //线程调度
......
app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java
View file @ 0fcbf78a
......@@ -81,7 +81,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
public BindingCommand getPhoto = new BindingCommand(new BindingAction() {
@Override
public void call() {
startPhotoPage(true, new SelectCallback() {
startPhotoPage(true, "申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容",new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
......@@ -143,7 +143,7 @@ public class MerchantInfoViewModel extends BaseViewModel<MerchantEnterRequst> {
public void uploadPic(View view)
{
//选择图片
startPhotoPage(true, new SelectCallback() {
startPhotoPage(true,"申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容", new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
model.upLoadFile(new File(photos.get(0).path)).compose(RxUtils.schedulersTransformer()) //线程调度
......
app/src/main/res/layout/activity_material_info.xml
View file @ 0fcbf78a
......@@ -241,7 +241,7 @@
android:layout_width="106dp"
android:layout_height="80dp"
app:layout_constraintTop_toTopOf="parent"
android:onClick="@{viewModel.bigPic}"
android:onClick="@{viewModel.uploadPic}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
pic_url="@{viewModel.merchantInfo.businessLicense}"
......@@ -284,7 +284,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:onClick="@{viewModel.bigPic}"
android:onClick="@{viewModel.uploadPic}"
pic_url="@{viewModel.merchantInfo.operatingPermit}"
android:id="@+id/xup_frm_licence"
android:layout_marginLeft="129dp"
......
consumer/build.gradle
View file @ 0fcbf78a
......@@ -6,11 +6,11 @@ plugins {
def URL_DEBUG="\"http://49.232.201.130:8004/\""
def URL_RELEASE="\"https://hbhapp.cn/api/\""
def URL_RELEASE="\"https://www.hbhapp.cn/api/\""
def URL_DEBUG_H5="\"http://49.232.201.130:7005\""
def URL_RELEASE_H5="\"https://hbhapp.cn\""
def URL_RELEASE_H5="\"https://www.hbhapp.cn\""
android {
signingConfigs {
......
consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java
View file @ 0fcbf78a
......@@ -109,7 +109,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
});
public void choosePhoto() {
startPhotoPage(true, new SelectCallback() {
startPhotoPage(true,"申请的是摄像头和照片视频读取权限，用于设置头像", new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
file = new File(photos.get(0).path);
......@@ -223,7 +223,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
}
public void takePhoto() {
startPhotoPage(true, new SelectCallback() {
startPhotoPage(true, "申请的是摄像头和照片视频读取权限，用于个人头像维护中读取和写入相册和文件内容",new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
......
consumer/src/main/java/com/xx/hbhconsumer/ui/recruit/RecruitDetailActivity.java
View file @ 0fcbf78a
......@@ -101,6 +101,7 @@ public class RecruitDetailActivity extends BaseActivity<ActivityRecruitDetailBin
Manifest.permission.READ_EXTERNAL_STORAGE);//缺少什么权限就写什么权限
if (permission != PackageManager.PERMISSION_GRANTED) {
// We don't have permission so prompt the user
ToastUtils.showShort("申请的是文件读取权限，用于投递简历");
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,}, 0);
}
int permission2 = ActivityCompat.checkSelfPermission(this,
......
consumer/src/main/res/layout/activity_credits_exchange.xml
View file @ 0fcbf78a
......@@ -46,7 +46,7 @@
android:layout_marginLeft="17dp"
android:layout_marginTop="31dp"
android:lineSpacingExtra="10dp"
android:text="为你推荐"
android:text="精选商品"
android:textColor="#FF333333"
android:textSize="20sp"
android:textStyle="bold" />
......
consumer/src/main/res/values/strings.xml
View file @ 0fcbf78a
......@@ -57,7 +57,7 @@
<string name="shop_navigation">店内导航</string>
<string name="shop_services">门店服务</string>
<string name="low_priced_goods">低价好物</string>
<string name="guess_like">猜你喜欢</string>
<string name="guess_like">每日精选</string>
<string name="more">更多</string>
<string name="coupon_collection">优惠券领取</string>
<!--首页模块 店员管理-->
......
hbhbcompany/build.gradle
View file @ 0fcbf78a
......@@ -6,11 +6,11 @@ plugins {
def URL_DEBUG="\"http://49.232.201.130:8004/\""
def URL_RELEASE="\"https://hbhapp.cn/api/\""
def URL_RELEASE="\"https://www.hbhapp.cn/api/\""
def URL_DEBUG_H5="\"http://49.232.201.130:7005\""
def URL_RELEASE_H5="\"https://hbhapp.cn\""
def URL_RELEASE_H5="\"https://www.hbhapp.cn\""
android {
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealEditViewModel.java
View file @ 0fcbf78a
......@@ -206,7 +206,7 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
}
startPhotoPage(true, max, new SelectCallback() {
startPhotoPage(true, max, "申请的是摄像头和照片视频读取权限，用于在添诉求场景中读取和写入相册和文件内容",new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>();
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealHandleViewModel.java
View file @ 0fcbf78a
......@@ -253,7 +253,7 @@ public class AppealHandleViewModel extends BaseViewModel<AppealRequest> {
}
startPhotoPage(true, max, new SelectCallback() {
startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于诉求场景中读取和写入相册和文件内容", new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>();
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealViewModel.java
View file @ 0fcbf78a
......@@ -115,7 +115,7 @@ public class AppealViewModel extends BaseViewModel<AppealRequest> {
}
startPhotoPage(true, max, new SelectCallback() {
startPhotoPage(true, max,"申请的是摄像头和照片视频读取权限，用于在添诉求场景中读取和写入相册和文件内容", new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>();
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/QualityAuditInfoViewModel.java
View file @ 0fcbf78a
......@@ -540,7 +540,7 @@ public class QualityAuditInfoViewModel extends BaseViewModel<QualityAuditRequst>
public void changeLogo(View view )
{
startPhotoPage(false, new SelectCallback() {
startPhotoPage(false, "申请的是摄像头和照片视频读取权限，用于商家信息维护中读取和写入相册和文件内容",new SelectCallback() {
@Override
public void onResult(ArrayList<Photo> photos, boolean isOriginal) {
List<File> fList = new ArrayList<>();
......
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java
View file @ 0fcbf78a
......@@ -204,6 +204,16 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
@Override
public void onChanged(Map<String, Object> o) {
if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
{
ToastUtils.showLong(o.get("pMsg").toString());
}
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
......
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java
View file @ 0fcbf78a
package me.goldze.mvvmhabit.base;
import android.Manifest;
import android.app.ActivityManager;
import android.app.DatePickerDialog;
import android.content.Context;
......@@ -21,6 +22,7 @@ import androidx.lifecycle.ViewModelProviders;
import com.afollestad.materialdialogs.MaterialDialog;
import com.huantansheng.easyphotos.EasyPhotos;
import com.huantansheng.easyphotos.callback.SelectCallback;
import com.tbruyelle.rxpermissions3.RxPermissions;
import com.trello.rxlifecycle4.components.support.RxFragment;
import java.lang.reflect.ParameterizedType;
......@@ -31,6 +33,8 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.disposables.Disposable;
import me.goldze.mvvmhabit.base.BaseViewModel.ParameterField;
import me.goldze.mvvmhabit.bus.Messenger;
......@@ -41,6 +45,7 @@ import com.xx.xxviewlibrary.utils.GlideEngine;
import me.goldze.mvvmhabit.utils.MaterialDialogUtils;
import me.goldze.mvvmhabit.utils.StringUtils;
import me.goldze.mvvmhabit.utils.ToastUtils;
/**
* Created by goldze on 2017/6/15.
......@@ -54,6 +59,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
private NUllDialog nullDialog;
Fragment f = this;
RxPermissions rp;
@Override
public void onCreate(Bundle savedInstanceState) {
......@@ -89,6 +95,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
rp =new RxPermissions(this);
//私有的初始化Databinding和ViewModel方法
initViewDataBinding(viewModelType());
//私有的ViewModel与View的契约事件回调逻辑
......@@ -192,9 +199,48 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
viewModel.getUC().getStartPhotoEvent().observe(this, new Observer<Map<String, Object>>() {
@Override
public void onChanged(Map<String, Object> o) {
if ( !rp.isGranted(Manifest.permission.CAMERA) || !rp.isGranted(Manifest.permission.READ_EXTERNAL_STORAGE))
{
ToastUtils.showShort(o.get("pMsg").toString());
}
rp.request(Manifest.permission.CAMERA,Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(new io.reactivex.rxjava3.core.Observer<Boolean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull Boolean aBoolean) {
if (aBoolean)
{
boolean hasCamera = (boolean) o.get("hasCamera");
SelectCallback callback = (SelectCallback) o.get("callBack");
startPhoto(hasCamera, callback);
}else {
ToastUtils.showShort("请开启拍照，和文件读取权限，否则无法正常使用完整功能");
}
}
@Override
public void onError(@NonNull Throwable e) {
}
@Override
public void onComplete() {
}
});
}
});
......
mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java
View file @ 0fcbf78a
......@@ -188,11 +188,13 @@ public class BaseViewModel<M extends BaseModel> extends AndroidViewModel impleme
* @param hasCamera 是否有照相机功能
* @param callback
*/
public void startPhotoPage(boolean hasCamera, SelectCallback callback)
public void startPhotoPage(boolean hasCamera, String msg,SelectCallback callback)
{
Map<String, Object> photomap = new HashMap<>();
photomap.put("hasCamera", hasCamera);
photomap.put("maxCount", 1);
photomap.put("pMsg",msg);
if (callback != null) {
photomap.put("callBack", callback);
}
......@@ -205,11 +207,12 @@ public class BaseViewModel<M extends BaseModel> extends AndroidViewModel impleme
* @param maxCount 选则最大数量
* @param callback
*/
public void startPhotoPage(boolean hasCamera,int maxCount, SelectCallback callback)
public void startPhotoPage(boolean hasCamera,int maxCount, String msg,SelectCallback callback)
{
Map<String, Object> photomap = new HashMap<>();
photomap.put("hasCamera", hasCamera);
photomap.put("maxCount", maxCount);
photomap.put("pMsg",msg);
if (callback != null) {
photomap.put("callBack", callback);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment