diff --git a/baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java b/baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java index 1c08e0a..41b37a5 100755 --- a/baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java +++ b/baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java @@ -89,6 +89,11 @@ public class CoreAdapter<M, B> extends RecyclerView.Adapter<BaseViewHolder> { } } + public void setViewType(@LayoutRes int type) { + this.viewType = type; + } + + public void setTypeSelector(TypeSelector mTypeSelector) { this.mTypeSelector = mTypeSelector; this.viewType = Constants.FLAG_MULTI_VH; diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java index f6f8fe4..25dd0e2 100644 --- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java +++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java @@ -90,6 +90,13 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD } } }); + mBind.orderRemark.post(() -> { + if (UIUtils.isOverFlowed(mBind.orderRemark)) { + mBind.tvLookMore.setVisibility(View.VISIBLE); + } else { + mBind.tvLookMore.setVisibility(View.GONE); + } + }); mBind.tvOrderState.setText(getStaus(detail.getStatus())); mBind.tvLookMore.setOnClickListener(o -> lookMore()); diff --git a/orderCenter/src/main/res/layout/fragment_multi_detail.xml b/orderCenter/src/main/res/layout/fragment_multi_detail.xml index b9bff08..ff93906 100644 --- a/orderCenter/src/main/res/layout/fragment_multi_detail.xml +++ b/orderCenter/src/main/res/layout/fragment_multi_detail.xml @@ -179,7 +179,7 @@ android:id="@+id/tv_fujian" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/tv_remark" + android:layout_below="@+id/rl_info_detail" android:layout_marginBottom="10dp" android:layout_marginTop="15dp" android:text="@string/order_attachment" @@ -190,7 +190,7 @@ android:id="@+id/ll_fujian" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@+id/tv_remark" + android:layout_below="@+id/rl_info_detail" android:layout_marginBottom="10dp" android:layout_marginLeft="19dp" android:layout_marginTop="@dimen/dp_15"