Skip to content

android / dayu

Go to a project
Commit f9ec9f0c by mReturn
Options

个人中心页面布局改版

parent 106937d5
Inline Side-by-side
Showing with 48 additions and 47 deletions
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -132,6 +132,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -132,6 +132,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
}); });
holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment)); holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment));
time = item.getAppointmentTime(); time = item.getAppointmentTime();
setTimeStatus(holder,item, time);
break; break;
case 2://待预约 case 2://待预约
if (!haveCustomer) { if (!haveCustomer) {
...@@ -355,7 +356,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -355,7 +356,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
//根据时间状态设置不同颜色 //根据时间状态设置不同颜色
private void setTimeStatus(FragmentOrderdoingItemBinding holder, Order item, String time) { private void setTimeStatus(FragmentOrderdoingItemBinding holder, Order item, String time) {
if (item.getAlerted() == 2){ if (item.getAlerted() == 2 && (item.getStatus() == 1 || item.getStatus() == 2)){
holder.itemTody.setTextColor(Color.parseColor("#FF5A4B")); holder.itemTody.setTextColor(Color.parseColor("#FF5A4B"));
holder.itemTime.setTextColor(Color.parseColor("#FF5A4B")); holder.itemTime.setTextColor(Color.parseColor("#FF5A4B"));
holder.tvAlert.setVisibility(View.VISIBLE); holder.tvAlert.setVisibility(View.VISIBLE);
......
userCenter/src/main/res/layout/fragment_home_user.xml
...@@ -288,12 +288,54 @@ ...@@ -288,12 +288,54 @@
android:id="@+id/tv_send_card" android:id="@+id/tv_send_card"
style="@style/btn_common" style="@style/btn_common"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginLeft="40dp" android:layout_marginLeft="15dp"
android:layout_marginTop="15dp" android:layout_marginTop="10dp"
android:layout_marginRight="40dp" android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/btn_blue_commom" android:background="@drawable/btn_blue_commom"
android:text="@string/send_user_card" /> android:text="@string/send_user_card" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:orientation="horizontal">
<TextView
android:id="@+id/apply_part"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="2"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:onClick="@{()->presenter.dumpToInvate()}"
android:text="@string/invate_new_reward"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:onClick="@{()->presenter.toInviteRecord()}"
android:text="@string/invite_record"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/btn_dark_red"
android:gravity="center"
android:onClick="@{()->presenter.invateProvider()}"
android:text="@string/invate_provider_title"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -489,49 +531,7 @@ ...@@ -489,49 +531,7 @@
android:focusable="false" android:focusable="false"
android:focusableInTouchMode="false" /> android:focusableInTouchMode="false" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:orientation="horizontal">
<TextView
android:id="@+id/apply_part"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_weight="2"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:onClick="@{()->presenter.dumpToInvate()}"
android:text="@string/invate_new_reward"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:onClick="@{()->presenter.toInviteRecord()}"
android:text="@string/invite_record"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/btn_dark_red"
android:gravity="center"
android:onClick="@{()->presenter.invateProvider()}"
android:text="@string/invate_provider_title"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout> </LinearLayout>
</android.support.v4.widget.NestedScrollView> </android.support.v4.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout> </com.scwang.smartrefresh.layout.SmartRefreshLayout>
......
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