Skip to content

android / dayu

Go to a project
Commit 527970eb by xuxuan
Options

服务技能

parent 5ddff038
Inline Side-by-side
Showing with 210 additions and 35 deletions
orderCenter/src/main/java/com/dayu/order/ui/activity/CheckInTakePhotoActivity.java
......@@ -4,6 +4,7 @@ import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.order.R;
......@@ -37,6 +38,9 @@ public class CheckInTakePhotoActivity extends BaseActivity<CheckInTakePhotoPrese
if (mSelectList != null) {
photoPath = mSelectList.get(0).getRealPath();
GlideImageLoader.loadDrawable(this, photoPath, mBind.photo);
mBind.cameraButton.setVisibility(View.GONE);
mBind.selectPhoto.setVisibility(View.VISIBLE);
}
break;
}
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -275,6 +275,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvCount.setVisibility(holder.tvPrice.getVisibility());
holder.tvDaysCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setText(item.getReferenceTime() + "天");
holder.itemTextUserName.setVisibility(View.GONE);
holder.itemTextUserPhone.setVisibility(View.GONE);
}else{
holder.itemTextPhone.setVisibility(View.VISIBLE);
......@@ -363,7 +365,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvCount.setVisibility(holder.tvPrice.getVisibility());
holder.tvDaysCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setText(item.getReferenceTime() + "天");
holder.itemTextUserName.setVisibility(View.GONE);
holder.itemTextUserPhone.setVisibility(View.GONE);
if (item.getSubStatus() == 6) {
holder.tvErrorState.setText(mContext.getString(R.string.check_upon_delivery));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_line));
......@@ -493,6 +497,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvCount.setVisibility(holder.tvPrice.getVisibility());
holder.tvDaysCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setText(item.getReferenceTime() + "天");
holder.itemTextUserName.setVisibility(View.GONE);
holder.itemTextUserPhone.setVisibility(View.GONE);
}
break;
default:
......
orderCenter/src/main/res/layout/activity_check_in_take_photo_layout.xml
......@@ -37,13 +37,28 @@
</RelativeLayout>
<ImageView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:id="@+id/photo"
android:src="@drawable/photo_default"
/>
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/photo"
/>
<Button
android:id="@+id/camera_button"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:background="@drawable/icon_camera_black"
android:onClick="@{()->presenter.selectPhoto()}"/>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -67,6 +82,7 @@
android:text="选择图片"
android:textStyle="bold"
android:textColor="@color/white"
android:visibility="gone"
android:textSize="16sp" />
<TextView
android:id="@+id/submit"
......
userCenter/src/main/java/com/dayu/usercenter/adapter/SelfLicenceAdapter.java
......@@ -22,19 +22,26 @@ public class SelfLicenceAdapter extends CoreAdapter<SelfLicenceBean, ItemUserLic
GlideImageLoader.loadFit(mContext, holder.ivImg, item.getUrl(), R.drawable.icon_img_default);
holder.tvTitle.setText("【证书名称】 : "+item.getName());
// holder.tvCompany.setText(getStatusDesc(item.getStatus()));
holder.tvCompany.setText(" 颁证机构: " + item.getProviderName());
holder.tvCompany.setText(" 颁发机构: " + item.getProviderName());
if (item.getStatus() == 3) {
holder.tvCompany.setTextColor(mContext.getResources().getColor(R.color.common_red));
} else {
holder.tvCompany.setTextColor(mContext.getResources().getColor(R.color.color_69));
}
if (item.getStatus() == 1 || item.getStatus() == 3){
holder.tvLicenceStatus.setVisibility(View.VISIBLE);
holder.tvLicenceStatus.setText(getStatusDesc(item.getStatus()));
}else {
holder.tvLicenceStatus.setVisibility(View.GONE);
}
holder.ivArrow.setVisibility(View.GONE);
}
private String getStatusDesc(int status) {
switch (status) {
case 1:
return "待审核";
return "平台审核中";
case 2:
return "审核通过";
case 3:
......
userCenter/src/main/java/com/dayu/usercenter/model/UploadSelfLicenceData.java
package com.dayu.usercenter.model;
import com.dayu.usercenter.model.bean.ServiceSaveTypeBean;
import java.util.List;
public class UploadSelfLicenceData {
public int engineerId ;
public String engineerName;
......@@ -9,6 +13,9 @@ public class UploadSelfLicenceData {
public int status = 1 ;
public int id;
public List<ServiceSaveTypeBean> labelList;
public UploadSelfLicenceData() {
}
......@@ -25,4 +32,13 @@ public class UploadSelfLicenceData {
this.name = name;
this.url = url;
}
public UploadSelfLicenceData(int engineerId, String engineerName, String engineerMobile, String name, String url, List<ServiceSaveTypeBean>labelList) {
this.engineerId = engineerId;
this.engineerName = engineerName;
this.engineerMobile = engineerMobile;
this.name = name;
this.url = url;
this.labelList = labelList;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/ServiceSaveBean.java
......@@ -63,4 +63,8 @@ public class ServiceSaveBean {
public ServiceSaveBean(String lowestPriceDay){
this.lowestPriceDay = lowestPriceDay;
}
public ServiceSaveBean(List<Long> labelIds){
this.labelIds = labelIds;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/ServiceSaveTypeBean.java 0 → 100644
package com.dayu.usercenter.model.bean;
public class ServiceSaveTypeBean {
private long labelId;
private String labelName;
public ServiceSaveTypeBean(long labelId, String labelName){
this.labelId = labelId;
this.labelName = labelName;
}
public long getLabelId() {
return labelId;
}
public void setLabelId(long labelId) {
this.labelId = labelId;
}
public String getLabelName() {
return labelName;
}
public void setLabelName(String labelName) {
this.labelName = labelName;
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
......@@ -27,6 +27,7 @@ import com.dayu.usercenter.event.RefreshUserRecordEvent;
import com.dayu.usercenter.model.SaveSceneData;
import com.dayu.usercenter.model.bean.BusinessSceneBean;
import com.dayu.usercenter.model.bean.ServiceSaveBean;
import com.dayu.usercenter.model.bean.ServiceSaveTypeBean;
import com.dayu.usercenter.model.bean.ServiceTypeBean;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.ToastUtils;
......@@ -82,7 +83,7 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
mBind.tvSubmit.setOnClickListener(v -> saveData());
initData();
initRefresh();
initAddrListener();
// initAddrListener();
}
private void initRefresh() {
......@@ -129,15 +130,15 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
.subscribe(mPresenter.baseObserver(data -> {
savedTypeDatas = data.getLabels();
setTypeAdapter();
showDaySelect(data.getLowestPriceDay());
mBind.province.setText(provinceName = data.getProvinceName());
mBind.city.setText(cityName = data.getCityName());
mBind.area.setText(areaName = data.getDistrictName());
getTreeAddrData(data.getProvinceId(), 2, false);
getTreeAddrData(data.getCityId(), 3, false);
provinceId = data.getProvinceId();
cityId = data.getCityId();
areaId = data.getDistrictId();
// showDaySelect(data.getLowestPriceDay());
// mBind.province.setText(provinceName = data.getProvinceName());
// mBind.city.setText(cityName = data.getCityName());
// mBind.area.setText(areaName = data.getDistrictName());
// getTreeAddrData(data.getProvinceId(), 2, false);
// getTreeAddrData(data.getCityId(), 3, false);
// provinceId = data.getProvinceId();
// cityId = data.getCityId();
// areaId = data.getDistrictId();
}));
//服务类型数据
Api.getService(UserService2.class).getServiceType(1).compose(Api.applySchedulers())
......@@ -241,19 +242,22 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
private void saveType(List<Long> ids) {
if (ids.size() == 0)
return;
if (TextUtils.isEmpty(provinceName) || TextUtils.isEmpty(cityName) || TextUtils.isEmpty(areaName)) {
ToastUtils.showShortToast("请先选择城市");
return;
}
// if (TextUtils.isEmpty(provinceName) || TextUtils.isEmpty(cityName) || TextUtils.isEmpty(areaName)) {
// ToastUtils.showShortToast("请先选择城市");
// return;
//
// }
showDialog();
ServiceSaveBean saveBean = new ServiceSaveBean(
dayPrice,
provinceId, provinceName,
cityId, cityName,
areaId, areaName,
ids
);
// ServiceSaveBean saveBean = new ServiceSaveBean(
// dayPrice,
// provinceId, provinceName,
// cityId, cityName,
// areaId, areaName,
// ids
// );
ServiceSaveBean saveBean = new ServiceSaveBean(ids);
Api.getService(UserService2.class).saveServiceTypeNew(saveBean, mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(bool -> {
ToastUtils.showShortToast(bool ? R.string.save_success : R.string.save_fail);
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java
......@@ -2,7 +2,12 @@ package com.dayu.usercenter.ui.activity2;
import android.content.Intent;
import android.text.TextUtils;
import android.widget.CheckBox;
import androidx.recyclerview.widget.GridLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.api.Api;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.base.ui.activity.BaseActivity;
......@@ -13,6 +18,9 @@ import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityUploadSelfLicenceBinding;
import com.dayu.usercenter.event.UploadSelfLicenceEvent;
import com.dayu.usercenter.model.UploadSelfLicenceData;
import com.dayu.usercenter.model.bean.BusinessSceneBean;
import com.dayu.usercenter.model.bean.ServiceSaveTypeBean;
import com.dayu.usercenter.model.bean.ServiceTypeBean;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.MediaChooseUtils;
import com.luck.picture.lib.basic.PictureSelector;
......@@ -22,6 +30,7 @@ import com.luck.picture.lib.entity.LocalMedia;
import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import okhttp3.MediaType;
......@@ -36,6 +45,10 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act
private boolean isEdit;
int lid;
List<ServiceTypeBean> typeDatas = new ArrayList<>();
List<ServiceSaveTypeBean> selectedTypeDatas = new ArrayList<>();
BaseQuickAdapter<ServiceTypeBean, BaseViewHolder> typeAdapter;
@Override
public void setPresenter() {
......@@ -65,6 +78,36 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act
});
mBind.btnUpload.setOnClickListener(view -> preSubmit());
mBind.rlImg.setOnClickListener(view -> MediaChooseUtils.chooseSigleImg(this));
initData();
}
//服务产品类型
private void setTypeAdapter() {
typeAdapter = new BaseQuickAdapter<ServiceTypeBean, BaseViewHolder>(R.layout.item_business_type, typeDatas) {
@Override
protected void convert(BaseViewHolder helper, ServiceTypeBean item) {
CheckBox cbItem = helper.getView(R.id.cb_item);
cbItem.setText(item.getName());
cbItem.setChecked(item.isSelected());
cbItem.setOnCheckedChangeListener((compoundButton, b) -> {
item.setSelected(b);
});
}
};
mBind.rvType.setLayoutManager(new GridLayoutManager(this, 2));
mBind.rvType.setAdapter(typeAdapter);
}
private void initData() {
showDialog();
//服务类型数据
Api.getService(UserService2.class).getServiceType(1).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(datas -> {
typeDatas = datas;
setTypeAdapter();
}, responeThrowable -> {
}));
}
private void preSubmit(){
......@@ -73,6 +116,14 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act
showToast("请输入认证名称");
return;
}
selectedTypeDatas.clear();
//服务类型
for (ServiceTypeBean typeBean : typeDatas) {
if (typeBean.isSelected())
selectedTypeDatas.add(new ServiceSaveTypeBean(typeBean.getLabelId(), typeBean.getLabelName()));
}
if (isEdit && !TextUtils.isEmpty(imgEditUrl)){
imgUrl = imgEditUrl;
reUpload();
......@@ -118,7 +169,7 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act
}
//上传认证资料
private void reUpload() {
UploadSelfLicenceData data = new UploadSelfLicenceData(mUserId,mUserInfo.getAccountName(),mUserInfo.getMobile(), content, imgUrl);
UploadSelfLicenceData data = new UploadSelfLicenceData(mUserId,mUserInfo.getAccountName(),mUserInfo.getMobile(), content, imgUrl, selectedTypeDatas);
data.id = lid;
Api.getService(UserService2.class).reUploadSelfLicence(data).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(success -> {
......
userCenter/src/main/res/drawable/btn_red_rect_bord.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="2dp"
android:color="#ff5a4b" />
<corners android:radius="0dp" />
</shape>
\ No newline at end of file
userCenter/src/main/res/layout/activity_business_detail.xml
......@@ -201,8 +201,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_exam"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="60dp"/>
android:layout_height="wrap_content"/>
<TextView
android:layout_width="match_parent"
android:layout_height="35dp"
......
userCenter/src/main/res/layout/activity_upload_self_licence.xml
......@@ -84,6 +84,14 @@
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="15dp"
android:overScrollMode="never" />
<Button
android:id="@+id/btn_upload"
android:layout_width="match_parent"
......
userCenter/src/main/res/layout/item_user_licence_new.xml
......@@ -34,14 +34,37 @@
android:maxLines="2"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
>
<TextView
android:id="@+id/tv_company"
android:layout_width="0dp"
android:layout_weight="1"
style="@style/sale_item_text"
android:layout_marginTop="10dp"
android:text=""
android:text="颁发机构：石佛额哈否发到你十大s"
android:maxLines="2"
/>
<TextView
android:id="@+id/tv_licence_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="平台审核中"
android:layout_gravity="center_vertical"
android:background="@drawable/btn_red_rect_bord"
android:paddingBottom="3dp"
android:paddingTop="3dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textColor="#ff5a4b"
android:textStyle="bold"/>
</LinearLayout>
</LinearLayout>
<RelativeLayout
......
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 sign in to comment