Skip to content

android / dayu

Go to a project
Commit 40422755 by xuxuan
Options

按天用工单UI修改，个人中心UI修改

parent 5298ab57
Inline Side-by-side
Showing with 314 additions and 122 deletions
.idea/gradle.xml 100755 → 100644
......@@ -4,9 +4,8 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
......@@ -29,8 +28,7 @@
<option value="$PROJECT_DIR$/wheelview" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
<option name="offlineMode" value="true" />
......
.idea/misc.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
......
.idea/modules.xml deleted 100755 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/dayu-saas-android.iml" filepath="$PROJECT_DIR$/.idea/modules/dayu-saas-android.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/IDCardLib/dayu-saas-android.IDCardLib.iml" filepath="$PROJECT_DIR$/.idea/modules/IDCardLib/dayu-saas-android.IDCardLib.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/dayu-saas-android.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/dayu-saas-android.app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/baseSDK/dayu-saas-android.baseSDK.iml" filepath="$PROJECT_DIR$/.idea/modules/baseSDK/dayu-saas-android.baseSDK.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/beauty/dayu-saas-android.beauty.iml" filepath="$PROJECT_DIR$/.idea/modules/beauty/dayu-saas-android.beauty.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/camera/dayu-saas-android.camera.iml" filepath="$PROJECT_DIR$/.idea/modules/camera/dayu-saas-android.camera.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/captcha/dayu-saas-android.captcha.iml" filepath="$PROJECT_DIR$/.idea/modules/captcha/dayu-saas-android.captcha.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/learnCenter/dayu-saas-android.learnCenter.iml" filepath="$PROJECT_DIR$/.idea/modules/learnCenter/dayu-saas-android.learnCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/liveModule/dayu-saas-android.liveModule.iml" filepath="$PROJECT_DIR$/.idea/modules/liveModule/dayu-saas-android.liveModule.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/locationComponent/dayu-saas-android.locationComponent.iml" filepath="$PROJECT_DIR$/.idea/modules/locationComponent/dayu-saas-android.locationComponent.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/managercenter/dayu-saas-android.managercenter.iml" filepath="$PROJECT_DIR$/.idea/modules/managercenter/dayu-saas-android.managercenter.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/messageCenter/dayu-saas-android.messageCenter.iml" filepath="$PROJECT_DIR$/.idea/modules/messageCenter/dayu-saas-android.messageCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/orderCenter/dayu-saas-android.orderCenter.iml" filepath="$PROJECT_DIR$/.idea/modules/orderCenter/dayu-saas-android.orderCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/pickerview/dayu-saas-android.pickerview.iml" filepath="$PROJECT_DIR$/.idea/modules/pickerview/dayu-saas-android.pickerview.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/provider/dayu-saas-android.provider.iml" filepath="$PROJECT_DIR$/.idea/modules/provider/dayu-saas-android.provider.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/saleCenter/dayu-saas-android.saleCenter.iml" filepath="$PROJECT_DIR$/.idea/modules/saleCenter/dayu-saas-android.saleCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/userCenter/dayu-saas-android.userCenter.iml" filepath="$PROJECT_DIR$/.idea/modules/userCenter/dayu-saas-android.userCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/wheelview/dayu-saas-android.wheelview.iml" filepath="$PROJECT_DIR$/.idea/modules/wheelview/dayu-saas-android.wheelview.iml" />
</modules>
</component>
</project>
\ No newline at end of file
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -45,21 +45,21 @@ public class Constants {
/**
* dev环境配置.
*/
// public static String ENVIROMENT = "debug";
// public static String PHOTO = "dev";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.94.101.239:3112";
// public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
// public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
// public static boolean IS_DEBUG = true;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 239; //小绿人商家id
// public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
public static String ENVIROMENT = "debug";
public static String PHOTO = "dev";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.94.101.239:3112";
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public static boolean IS_DEBUG = true;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 239; //小绿人商家id
public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
/**
......@@ -85,21 +85,21 @@ public class Constants {
/**
* 正式环境.
*/
public static String ENVIROMENT = "release";
public static String PHOTO = "online";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.dayuspm.com";
public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id
public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
// public static String ENVIROMENT = "release";
// public static String PHOTO = "online";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.dayuspm.com";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id
// public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
/**
......
baseSDK/src/main/java/com/dayu/utils/UtilsDate.java
......@@ -57,6 +57,8 @@ public class UtilsDate {
// 格式：年-月
public static final String MONTG_DATE_FORMAT = "yyyy-MM";
// 格式：x月x日
public static final String MON_DAY_FORMAT = "M月d日";
// 年的加减
public static final int SUB_YEAR = Calendar.YEAR;
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
......@@ -72,6 +72,15 @@ public class Order implements Serializable{
private double receiveOrderCommission;
private int source;
private String finishedDays;
private String referenceTime;
public String getReferenceTime() {
return referenceTime;
}
public void setReferenceTime(String referenceTime) {
this.referenceTime = referenceTime;
}
public String getFinishedDays() {
return finishedDays;
......
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingContract.java
......@@ -32,6 +32,8 @@ public interface ReceivingContract {
public abstract void receiveOrderSuccess(int orders, String appointmentTime);
public abstract void receiveOrderSuccess(int orders, String appointmentTime, int createSource);
}
}
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
......@@ -70,6 +70,25 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
refresh();
} else if ("ORDER0042".equals(responeThrowable.subCode)) {
mView.showNoCashDialog(responeThrowable.message);
} else if ("ORDER0046".equals(responeThrowable.subCode)) {
mView.showNoCashDialog(responeThrowable.message);
}
}));
}
public void receive(int orders, int engineer, String appointmentTime , int createdSource) {
OrderApiFactory.receiveOrder(orders, engineer).subscribe(baseObserverByU(
aBoolean -> {
// MobclickAgent.onEvent(BaseApplication.getContext(), "get_serviceOrder");
mView.showToast(R.string.receive_order_success);
receiveOrderSuccess(orders, appointmentTime, createdSource);
}, responeThrowable -> {
if ("ORDER0002".equals(responeThrowable.subCode) || "ORDER0003".equals(responeThrowable.subCode)) {
refresh();
} else if ("ORDER0042".equals(responeThrowable.subCode)) {
mView.showNoCashDialog(responeThrowable.message);
} else if ("ORDER0046".equals(responeThrowable.subCode)) {
mView.showNoCashDialog(responeThrowable.message);
}
}));
}
......@@ -82,7 +101,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
if (createdSource == 4 && cash > 0) {
mView.showCashDialog(cash, engineer, orders, appointmentTime);
} else {
receive(orders, engineer, appointmentTime);
receive(orders, engineer, appointmentTime, createdSource);
}
} else {
mView.showVerifyDialog(data.getSubCode(), data.getMsg(), data.getData());
......@@ -119,6 +138,31 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
}
@Override
public void receiveOrderSuccess(int orders, String appointmentTime, int createdSource) {
int num = mTotalRows - 1;
getReceivingData();
// mView.dumpBack();
mDisPosable = Observable.timer(300, TimeUnit.MILLISECONDS).
observeOn(AndroidSchedulers.mainThread()).
subscribe(aLong -> {
if (createdSource == 7 || createdSource == 8){
//按天用工单马上接单，跳转到待服务列表，不提示【马上预约】弹窗
EventBus.getDefault().post(new SwtichOrderFragment(2));
}else {
EventBus.getDefault().post(new SwtichOrderFragment(1));
}
EventBus.getDefault().post(new RefreshTab(0));
// EventBus.getDefault().post(new RefreshReceivingNum(num < 0 ? 0 : num));
EventBus.getDefault().post(new RefreshApoiment(-1));
if (!TextUtils.isEmpty(appointmentTime) && createdSource != 7 && createdSource != 8) { //订单详情页接单则不弹框提示.
mView.showOrderDialog(orders, appointmentTime);
}
mDisPosable.dispose();
});
}
@Override
public void refresh() {
mPage = 1;
getReceivingData();
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -2,17 +2,21 @@ package com.dayu.order.ui.adapter;
import static com.dayu.utils.UtilsDate.FORMAT_ONE;
import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
import static com.dayu.utils.UtilsDate.MON_DAY_FORMAT;
import android.Manifest;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface;
import android.location.Address;
import android.net.Uri;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import com.alibaba.android.arouter.launcher.ARouter;
import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
......@@ -166,6 +170,17 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.redeploy.setVisibility(View.GONE);
// }
holder.itemTextDizhi.setPadding(0, 0, 0, UIUtils.dp2px(20));
if (7 == item.getSource() || 8 == item.getSource()){
//按天用工单
holder.tvOrderTime.setText(R.string.start_day);
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams)holder.tvOrderTime.getLayoutParams();
params.topMargin += 20;
holder.tvOrderTime.setLayoutParams(params);
holder.tvCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setText(item.getReferenceTime() + "天");
}
break;
case 2://待预约
if (!haveCustomer) {
......@@ -291,6 +306,17 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
time = item.getConfirmDoorTime();
setTimeStatus(holder, item, time);
if (7 == item.getSource() || 8 == item.getSource()){
//按天用工单
holder.tvOrderTime.setText(R.string.start_day);
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams)holder.tvOrderTime.getLayoutParams();
params.topMargin += 20;
holder.tvOrderTime.setLayoutParams(params);
holder.tvCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setText(item.getReferenceTime() + "天");
}
break;
case 4://待处理
holder.tvItemProcess.setVisibility(View.GONE);
......@@ -433,6 +459,16 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvSettlementDate.setText(CommonUtils.getYearData(item.getSettlementDate()));
time = item.getConfirmDoorTime();
if (7 == item.getSource() || 8 == item.getSource()){
//按天用工单
holder.tvOrderTime.setText(R.string.start_day);
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams)holder.tvOrderTime.getLayoutParams();
params.topMargin += 20;
holder.tvOrderTime.setLayoutParams(params);
holder.tvCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setVisibility(View.VISIBLE);
holder.tvDaysCount.setText(item.getReferenceTime() + "天");
}
break;
default:
break;
......@@ -446,6 +482,15 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.itemTody.setText(UtilsDate.getDayOrIsToday(time));
holder.itemTime.setText(dateTime);
holder.itemTime.setVisibility(View.VISIBLE);
if (7 == item.getSource() || 8 == item.getSource()){
//按天用工单 展示开始日期
holder.itemTime.setText("");
dateTime = UtilsDate.changeFormat(time, FORMAT_ONE, MON_DAY_FORMAT);
holder.itemTody.setText(dateTime);
holder.itemTody.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
holder.itemTody.setTextColor(Color.parseColor("#3faafc"));
}
}
int errorState = item.getExcptionCode();
......
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
......@@ -199,14 +199,44 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
android:layout_weight="1"
android:layout_weight="3"
android:ellipsize="end"
android:maxLines="1"
android:text="xxxxxvvvvvvvvvvvvvvvvvvv"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/size_login_hint_text"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_days_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="10dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="3天"
android:visibility="gone"
android:layout_weight="1"
android:textColor="@color/common_red"
android:textSize="@dimen/size_login_hint_text"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:ellipsize="end"
android:gravity="right"
android:maxEms="7"
android:maxLines="1"
android:text="共"
android:visibility="gone"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/size_login_hint_text"/>
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
orderCenter/src/main/res/values/strings.xml
......@@ -51,4 +51,47 @@
<string name="query_str">查询</string>
<string name="query_result_count">相关联的知识共有%d条</string>
<string name="help_tool">辅助工具</string>
<string name="start_day">开始日期</string>
<!-- Strings used for fragments for navigation -->
<string name="first_fragment_label">First Fragment</string>
<string name="second_fragment_label">Second Fragment</string>
<string name="next">Next</string>
<string name="previous">Previous</string>
<string name="lorem_ipsum">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris
volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus
dui nec risus. Maecenas non sodales nisi, vel dictum dolor. Class aptent taciti sociosqu ad
litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse blandit eleifend
diam, vel rutrum tellus vulputate quis. Aliquam eget libero aliquet, imperdiet nisl a,
ornare ex. Sed rhoncus est ut libero porta lobortis. Fusce in dictum tellus.\n\n
Suspendisse interdum ornare ante. Aliquam nec cursus lorem. Morbi id magna felis. Vivamus
egestas, est a condimentum egestas, turpis nisl iaculis ipsum, in dictum tellus dolor sed
neque. Morbi tellus erat, dapibus ut sem a, iaculis tincidunt dui. Interdum et malesuada
fames ac ante ipsum primis in faucibus. Curabitur et eros porttitor, ultricies urna vitae,
molestie nibh. Phasellus at commodo eros, non aliquet metus. Sed maximus nisl nec dolor
bibendum, vel congue leo egestas.\n\n
Sed interdum tortor nibh, in sagittis risus mollis quis. Curabitur mi odio, condimentum sit
amet auctor at, mollis non turpis. Nullam pretium libero vestibulum, finibus orci vel,
molestie quam. Fusce blandit tincidunt nulla, quis sollicitudin libero facilisis et. Integer
interdum nunc ligula, et fermentum metus hendrerit id. Vestibulum lectus felis, dictum at
lacinia sit amet, tristique id quam. Cras eu consequat dui. Suspendisse sodales nunc ligula,
in lobortis sem porta sed. Integer id ultrices magna, in luctus elit. Sed a pellentesque
est.\n\n
Aenean nunc velit, lacinia sed dolor sed, ultrices viverra nulla. Etiam a venenatis nibh.
Morbi laoreet, tortor sed facilisis varius, nibh orci rhoncus nulla, id elementum leo dui
non lorem. Nam mollis ipsum quis auctor varius. Quisque elementum eu libero sed commodo. In
eros nisl, imperdiet vel imperdiet et, scelerisque a mauris. Pellentesque varius ex nunc,
quis imperdiet eros placerat ac. Duis finibus orci et est auctor tincidunt. Sed non viverra
ipsum. Nunc quis augue egestas, cursus lorem at, molestie sem. Morbi a consectetur ipsum, a
placerat diam. Etiam vulputate dignissim convallis. Integer faucibus mauris sit amet finibus
convallis.\n\n
Phasellus in aliquet mi. Pellentesque habitant morbi tristique senectus et netus et
malesuada fames ac turpis egestas. In volutpat arcu ut felis sagittis, in finibus massa
gravida. Pellentesque id tellus orci. Integer dictum, lorem sed efficitur ullamcorper,
libero justo consectetur ipsum, in mollis nisl ex sed nisl. Donec maximus ullamcorper
sodales. Praesent bibendum rhoncus tellus nec feugiat. In a ornare nulla. Donec rhoncus
libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus
vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim.
</string>
</resources>
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
......@@ -143,7 +143,8 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
//已保存服务类型数据
Api.getService(UserService2.class).getRelationCategory(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> {
showDaySelect(data.getLowestPriceDay());
// showDaySelect(data.getLowestPriceDay());
mBind.tvPrice.setText(data.getLowestPriceDay() + "元/天");
}));
......
userCenter/src/main/res/layout/activity_business_type.xml
......@@ -51,6 +51,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal">
<TextView
......@@ -78,6 +79,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:orientation="horizontal">
<View
......@@ -94,6 +96,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal">
<TextView
......@@ -155,6 +158,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:orientation="horizontal">
<View
......@@ -188,6 +192,7 @@
android:text="我的服务技能:"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/size_login_hint_text"
android:visibility="gone"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
......
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -267,6 +267,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ll_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/ll_score"
......@@ -292,6 +293,32 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/ll_star"
android:layout_alignLeft="@id/ll_star"
android:layout_marginTop="9.3dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lowest_price"
android:textColor="@color/cl_home_title_text_color"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_13"
android:layout_toRightOf="@id/tv_age"
android:textColor="@color/cl_home_title_text_color"
android:textSize="12sp" />
</LinearLayout>
</RelativeLayout>
......@@ -361,81 +388,90 @@
android:textSize="@dimen/sp_16"
android:visibility="gone" />
<TextView
style="@style/sale_item_text"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/personal_center_selector"
android:gravity="center"
android:text="我的服务区域"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginTop="5dp"
android:gravity="center_vertical"
android:paddingStart="15dp"
android:paddingEnd="15dp">
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/personal_center_selector"
android:orientation="vertical">
<TextView
android:id="@+id/province"
android:layout_width="0dp"
style="@style/sale_item_text"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/bg_input_black_react"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
android:paddingEnd="10dp"
android:text="请选择省"
android:layout_marginTop="10dp"
android:gravity="center"
android:textStyle="bold"
android:text="设置我的服务区域"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<TextView
android:id="@+id/city"
android:layout_width="0dp"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/bg_input_black_react"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:drawablePadding="10dp"
android:layout_marginTop="5dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:paddingEnd="10dp"
android:text="@string/setlect_ciy_hint"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
android:layout_gravity="center"
android:paddingStart="15dp"
android:paddingEnd="15dp">
<TextView
android:id="@+id/area"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="right"
android:layout_weight="1"
android:background="@drawable/bg_input_black_react"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:paddingEnd="10dp"
android:text="请选择区"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<TextView
android:id="@+id/province"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
android:paddingEnd="10dp"
android:text="请选择省"
android:textColor="@color/cl_home_button"
android:textSize="15dp"
android:textStyle="bold" />
<TextView
android:id="@+id/city"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:paddingEnd="10dp"
android:text="@string/setlect_ciy_hint"
android:textStyle="bold"
android:textColor="@color/cl_home_button"
android:textSize="15dp" />
<TextView
android:id="@+id/area"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_gravity="right"
android:layout_weight="1"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:paddingEnd="10dp"
android:text="请选择区"
android:textStyle="bold"
android:textColor="@color/cl_home_button"
android:textSize="15dp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:visibility="gone">
<TextView
style="@style/sale_item_text"
......
userCenter/src/main/res/values/strings.xml
......@@ -50,10 +50,11 @@
<string name="add_service_wechat">添加客服微信获得更多派单</string>
<string name="copy_wechat_num">复制微信号</string>
<string name="send_user_card">发微信名片给客户</string>
<string name="user_level">等级</string>
<string name="user_level">服务等级</string>
<string name="user_level1">金牌师傅</string>
<string name="user_level2">银牌师傅</string>
<string name="user_level3">铜牌师傅</string>
<string name="user_level4">普通师傅</string>
<string name="apply_fetch">申请提现</string>
<string name="lowest_price">工费标准</string>
</resources>
userCenter/src/main/res/values/styles.xml
......@@ -23,6 +23,8 @@
<item name="android:layout_marginTop">@dimen/dp_11</item>
<item name="android:textColor">@color/cl_home_title_text_color</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="tv_user_bottom2">
......@@ -31,6 +33,7 @@
<item name="android:layout_marginTop">2dp</item>
<item name="android:textColor">@color/cl_home_button</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="ll_service_wechat" parent="ll_horizontal">
......
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