feat：ui修改

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_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("已确认");