Skip to content

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

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

# Conflicts:
#	.idea/workspace.xml
#	app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java
parents d6cd65b6 0fcbf78a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 469 additions and 158 deletions
.idea/workspace.xml
View file @ ea1d9555
This diff is collapsed.
app/build.gradle
View file @ ea1d9555
......@@ -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 {
......
app/src/main/java/com/xx/merchanthbh/ui/addproduct/AddProductViewModel.java
View file @ ea1d9555
......@@ -137,7 +137,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 @ ea1d9555
......@@ -202,7 +202,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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -52,11 +52,6 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
}
var agreementContext: String = ""
override fun onStart() {
super.onStart()
}
override fun initData() {
//检查版本
......@@ -64,7 +59,6 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
// 获得协议内容
viewModel.getProtocols()
SPUtils.getInstance().clear()
super.initData()
/*强制更新标识位变更--重置用户登录*/
StaticData.updateLogin = 1
......@@ -127,25 +121,25 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
if (viewModel.isAgree)
{
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze2))
}else{
} else {
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze1))
}
binding.ivLoginAgreement.setOnClickListener()
{
if (viewModel.isAgree)
{
viewModel.isAgree=false
if (viewModel.isAgree) {
viewModel.isAgree = false
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze1))
}else{
viewModel.isAgree=true
} else {
viewModel.isAgree = true
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze2))
}
}
var sp:SpannableStringBuilder= SpannableStringBuilder("我已阅读并同意《用户协议》、《隐私条款》")
var sp: SpannableStringBuilder =
SpannableStringBuilder("我已阅读并同意《用户协议》、《隐私条款》")
// sp.setSpan(ForegroundColorSpan(getColor(R.color.text_grey_blue)),7,20,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
binding.tvLoginAgree.setMovementMethod(LinkMovementMethod.getInstance());
binding.tvLoginAgree.setHighlightColor(0)
......@@ -154,9 +148,8 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
override fun onClick(view: View) {
if (StaticData.Protocols.size>=5)
{
var bundle:Bundle= Bundle();
if (StaticData.Protocols.size >= 5) {
var bundle: Bundle = Bundle();
bundle.putString("title", "用户协议")
bundle.putString("URL", RetrofitClient.baseH5Url + StaticData.Protocols.get(4))
startActivity(CommWabActivity::class.java, bundle)
......@@ -166,17 +159,16 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
override fun updateDrawState(ds: TextPaint) {
ds.setColor(getColor(R.color.text_grey_blue))
ds.isUnderlineText=false
ds.isUnderlineText = false
}
},7,13,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
}, 7, 13, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
sp.setSpan(object : ClickableSpan() {
override fun onClick(view: View) {
if (StaticData.Protocols.size>=3)
{
var bundle:Bundle= Bundle();
if (StaticData.Protocols.size >= 3) {
var bundle: Bundle = Bundle();
bundle.putString("title", "隐私条款")
bundle.putString("URL", RetrofitClient.baseH5Url + StaticData.Protocols.get(2))
startActivity(CommWabActivity::class.java, bundle)
......@@ -185,12 +177,12 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
override fun updateDrawState(ds: TextPaint) {
ds.setColor(getColor(R.color.text_grey_blue))
ds.isUnderlineText=false
ds.isUnderlineText = false
}
},14,20,Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
}, 14, 20, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
binding.tvLoginAgree.text=sp
binding.tvLoginAgree.text = sp
}
......@@ -200,7 +192,7 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
override fun initViewModel(): LoginViewModel {
val lm: LoginRequest = LoginRequest()
return LoginViewModel(application,lm)
return LoginViewModel(application, lm)
}
}
\ No newline at end of file
app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java
View file @ ea1d9555
......@@ -89,7 +89,7 @@ public class AddBrankViewModel extends BaseViewModel<MerchantEnterRequst> {
}
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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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/login/LoginViewModel.java
View file @ ea1d9555
......@@ -145,7 +145,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
@Override
public void call() {
Bundle bundle = new Bundle();
bundle.putString("basic", "8");
bundle.putString("basic", "14");
bundle.putString("basicName", "隐私条款");
startActivity(UserAgreementActivity.class, bundle);
}
......
consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java
View file @ ea1d9555
......@@ -109,7 +109,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
});
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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -255,7 +255,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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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 @ ea1d9555
......@@ -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/BaseViewModel.java
View file @ ea1d9555
......@@ -190,11 +190,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);
}
......@@ -207,11 +209,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