Skip to content

Y
YDL-Component-Medical
Commit b0e55560 by 霍志良
Options

feat：ui修改

parent b28342dd
Showing with 127 additions and 122 deletions
m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/fragment/PublishQuestionAndTrendFragment.java
......@@ -15,6 +15,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Parcelable;
import androidx.cardview.widget.CardView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
......@@ -130,6 +131,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
private LinearLayout ll_to_expert;
private ImageView publish_anonymity_iv;
private RelativeLayout publish_trend_ad_rel;
private CardView publish_trend_ad_relcardView;
private ImageView publish_trend_ad_iv;
private ImageView iv_fm;
private ImageView iv_to_expert;
......@@ -322,6 +324,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
if (!"".equals(Test_url) && Test_url != null && !"".equals(Test_cover) && Test_cover != null && !"".equals(Test_title) && Test_title != null) {
publish_trend_img_rcv.setVisibility(View.GONE);
publish_trend_ad_rel.setVisibility(View.VISIBLE);
publish_trend_ad_relcardView.setVisibility(View.VISIBLE);
GlideApp.with(activity)
.load(Test_cover)
.placeholder(R.drawable.dynamic_default_img)
......@@ -336,6 +339,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
} else {
publish_trend_img_rcv.setVisibility(View.VISIBLE);
publish_trend_ad_rel.setVisibility(View.GONE);
publish_trend_ad_relcardView.setVisibility(View.GONE);
publish_trend_bottom_img_iv.setImageResource(R.drawable.dynamic_edit_img);
head_dir = RxFileTool.getStorageDirectory(activity) + "/img/publish_img/";
......@@ -424,6 +428,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
trends_publish_question=getRootView().findViewById(R.id.trends_publish_question);
ll_bottom_img_emoji=getRootView().findViewById(R.id.ll_bottom_img_emoji);
publish_trend_ad_rel = getRootView().findViewById(R.id.publish_trend_ad_rel);
publish_trend_ad_relcardView = getRootView().findViewById(R.id.publish_trend_ad_relcardview);
iv_fm = getRootView().findViewById(R.id.iv_fm);
publish_trend_ad_iv = getRootView().findViewById(R.id.publish_trend_ad_iv);
publish_trend_ad_tv = getRootView().findViewById(R.id.publish_trend_ad_tv);
......@@ -537,15 +542,15 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
Rect rect=new Rect();
trends_publish_question.getWindowVisibleDisplayFrame(rect);
if (isMiuiFullScreen()){
ll_bottom_img_emoji.layout(0,
rect.height()-ll_bottom_img_emoji.getHeight()-160,
ll_bottom_img_emoji.getWidth(),rect.height());
}else{
ll_bottom_img_emoji.layout(0,
rect.height()-ll_bottom_img_emoji.getHeight()- getNavigationBarHeight(getContext()),
ll_bottom_img_emoji.getWidth(),rect.height());
}
// if (isMiuiFullScreen()){
// ll_bottom_img_emoji.layout(0,
// rect.height()-ll_bottom_img_emoji.getHeight()-160,
// ll_bottom_img_emoji.getWidth(),rect.height());
// }else{
// ll_bottom_img_emoji.layout(0,
// rect.height()-ll_bottom_img_emoji.getHeight()- getNavigationBarHeight(getContext()),
// ll_bottom_img_emoji.getWidth(),rect.height());
// }
}
}
});
......
m-dynamic/src/main/res/layout/dynamic_activity_trend.xml
......@@ -27,11 +27,14 @@
android:layout_height="wrap_content"
android:textColor="@color/platform_color_333333"
android:text="取消"
android:padding="@dimen/platform_dp_5"
android:paddingBottom="@dimen/platform_dp_5"
android:paddingTop="@dimen/platform_dp_5"
android:paddingRight="@dimen/platform_dp_5"
android:id="@+id/mBackIv"
android:layout_centerInParent="true"
android:layout_alignParentLeft="true"
android:layout_marginStart="@dimen/platform_dp_16"
android:layout_marginStart="@dimen/platform_dp_15"
android:includeFontPadding="false"
android:textSize="@dimen/platform_sp_16"
>
......
m-dynamic/src/main/res/layout/dynamic_fragment_publish_trend.xml
......@@ -2,56 +2,58 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/trends_publish_question"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dynamic_white"
android:focusable="true"
android:id="@+id/trends_publish_question"
android:focusableInTouchMode="true"
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="50dp"
>
android:paddingBottom="50dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/dynamic_white"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@color/dynamic_white">
app:layout_constraintTop_toTopOf="parent">
<EditText
android:id="@+id/publish_trend_title_editext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@color/dynamic_white"
android:gravity="center_vertical"
android:hint="请输入困扰您的问题"
android:minHeight="50dp"
android:maxLength="35"
android:minHeight="50dp"
android:paddingLeft="15dp"
android:layout_alignParentTop="true"
android:paddingTop="13dp"
android:paddingRight="15dp"
android:paddingBottom="13dp"
android:textColor="@color/dynamic_text_trend_title_black"
android:textColorHint="#bfbfbf"
android:textSize="18sp"
android:textSize="24sp"
tools:text="标题：说说你的标题：说说你的标题：说说你的困惑标题：说说你的困标题：说说你的困惑标题：说说你的困惑困惑标题：说说你的困惑" />
<View
android:id="@+id/lineTitle"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="15dp"
android:layout_below="@+id/publish_trend_title_editext"
android:layout_marginLeft="15dp"
android:layout_marginTop="6dp"
android:background="#eae9e9" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_below="@id/lineTitle"
>
android:orientation="vertical">
<EditText
android:id="@+id/publish_trend_content_editext"
......@@ -69,7 +71,8 @@
android:paddingLeft="15dp"
android:textColor="@color/dynamic_text_trend_title_black"
android:textColorHint="#bfbfbf"
android:textSize="14sp" />
android:textSize="17sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/publish_trend_img_rcv"
android:layout_width="match_parent"
......@@ -79,107 +82,102 @@
android:paddingLeft="@dimen/platform_dp_12"
android:paddingRight="@dimen/platform_dp_12"
android:visibility="gone" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/publish_trend_img_rcv"
android:layout_margin="15dp">
<TextView
android:id="@+id/publish_trend_bottom_topic_tv"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:background="@drawable/dynamic_bg_topic"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="# 选择话题"
android:textColor="#999999"
android:textSize="13sp" />
<TextView
android:id="@+id/publish_trend_content_num_tv"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_alignParentRight="true"
android:layout_marginRight="12dp"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:text="0/1000"
android:textColor="#bbbbbb"
android:textSize="15sp" />
<View
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@+id/publish_trend_content_num_tv"
android:layout_marginTop="8dp"
android:background="#eae9e9" />
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/line"
android:layout_marginLeft="1dp"
android:layout_marginTop="15dp"
android:layout_marginRight="1dp"
android:layout_marginBottom="@dimen/platform_dp_1"
android:elevation="1dp"
app:cardCornerRadius="6dp">
<RelativeLayout
android:id="@+id/publish_trend_ad_rel"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@color/platform_color_F7F7F7"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/publish_trend_ad_iv"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerVertical="true"
android:scaleType="fitXY"
android:src="@drawable/dynamic_default_img" />
<ImageView
android:id="@+id/iv_fm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/publish_trend_ad_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_toRightOf="@+id/publish_trend_ad_iv"
android:maxLines="2"
android:text="测测你的童年阴影"
android:textColor="#333"
android:textSize="15sp" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
<include
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/white"
android:paddingLeft="@dimen/platform_dp_15"
android:paddingTop="@dimen/platform_dp_5"
android:paddingRight="@dimen/platform_dp_15"
android:paddingBottom="@dimen/platform_dp_5"
android:id="@+id/rl_topic"
app:layout_constraintBottom_toTopOf="@id/ll_bottom_img_emoji">
<TextView
android:id="@+id/publish_trend_bottom_topic_tv"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:background="@drawable/dynamic_bg_topic"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="# 选择话题"
android:textColor="#999999"
android:textSize="13sp" />
<TextView
android:id="@+id/publish_trend_content_num_tv"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_alignParentRight="true"
android:layout_marginRight="12dp"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:text="0/1000"
android:textColor="#bbbbbb"
android:textSize="15sp" />
<androidx.cardview.widget.CardView
android:id="@+id/publish_trend_ad_relcardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/publish_trend_content_num_tv"
android:visibility="gone"
app:cardCornerRadius="6dp">
<RelativeLayout
android:id="@+id/publish_trend_ad_rel"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@color/platform_color_F7F7F7"
android:visibility="gone">
<ImageView
android:id="@+id/publish_trend_ad_iv"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerVertical="true"
android:scaleType="fitXY"
android:src="@drawable/dynamic_default_img" />
<ImageView
android:id="@+id/iv_fm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/publish_trend_ad_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_toRightOf="@+id/publish_trend_ad_iv"
android:maxLines="2"
android:text="测测你的童年阴影"
android:textColor="#333"
android:textSize="15sp" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
</RelativeLayout>
<include
android:id="@+id/ll_bottom_img_emoji"
layout="@layout/dynamic_layout_publish_trend_bottom" />
layout="@layout/dynamic_layout_publish_trend_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
m-dynamic/src/main/res/layout/dynamic_publish_img_item.xml
......@@ -26,9 +26,8 @@
android:id="@+id/item_publish_cancel_iv"
android:layout_width="22dp"
android:layout_height="22dp"
android:padding="@dimen/platform_dp_5"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:src="@drawable/platform_img_delete" />
android:src="@drawable/delete_dynamic" />
</com.ydl.ydlcommon.view.SquareRelativeLayout>
m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderConfirmOrder.java
......@@ -104,7 +104,7 @@ public class MsgViewHolderConfirmOrder extends MsgViewHolderBase {
orderId = customAttachment.orderId;
serviceId = customAttachment.serviceId;
flag = customAttachment.status;
ToastUtil.toastShort("flag:"+flag);
if (flag == 1) {
// 1代表已确认，0代表待确认
tv_submit.setText("已确认");
......
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