feat：图标更换

m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/fragment/PublishQuestionAndTrendFragment.java

@@ -266,7 +266,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
             } else {
                 adapter.notifyDataSetChanged();
             }
-            publish_trend_img_rcv.setLayoutManager(new GridLayoutManager(activity, 4));
+            publish_trend_img_rcv.setLayoutManager(new GridLayoutManager(activity, 3));
             publish_trend_img_rcv.setAdapter(adapter);
             adapter.setOnItemClickLister(new DynamicPublishImageAdapter.OnItemClickLister() {
                 @Override

m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/TrendsHomeFragment.java

@@ -357,11 +357,11 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
             vpContent.setCurrentItem(2);
         } else if (view.getId() == R.id.publish_trend_btn) {
             ActionCountUtils.Companion.count(YDL_USER_ASK_QUESTIONS_BUTTON_CLICK);
+            if (DynamicIn.INSTANCE.loginByOneKeyLogin(getActivity(), true)) {
                 trendsAndQuestionDialog = new TrendsAndQuestionDialog(requireContext(), new TrendsQuestionListener() {
                     @Override
                     public void publishTrends() {
                         //发布动态
-                    if (DynamicIn.INSTANCE.loginByOneKeyLogin(getActivity(), true)) {
                         Intent intent = new Intent(getActivity().getApplicationContext(), PublishTrendActivity.class);
                         //默认改为今日打卡
                         Bundle bundle = new Bundle();
@@ -372,12 +372,10 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
                         startActivity(intent);
 //                        PublishTrendActivityTrends.Companion.start(requireContext(),"44","今日打卡");
                     }
-                }
 
                     @Override
                     public void publishQuestion() {
                         //发布问题
-                    if (DynamicIn.INSTANCE.loginByOneKeyLogin(getActivity(), true)) {
                         Intent intent = new Intent(getActivity().getApplicationContext(), PublishTrendActivity.class);
                         //默认改为今日打卡
                         Bundle bundle = new Bundle();
@@ -387,10 +385,9 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
                         intent.putExtra("bundle", bundle);
                         startActivity(intent);
                     }
-                }
                 });
                 trendsAndQuestionDialog.show();
-
+            }
         } else if (view.getId() == R.id.trends_tv_mind_more) {
             ActionCountUtils.Companion.count(YDL_USER_THOUGHTS_GROUP_MORE_CLICK);
             Intent intent = new Intent(getActivity(), AllTopicActivity.class);

m-dynamic/src/main/res/layout/dynamic_fragment_publish_trend.xml

@@ -33,6 +33,11 @@
                 android:textColorHint="#bfbfbf"
                 android:textSize="24sp"
                 tools:text="标题：说说你的标题：说说你的标题：说说你的困惑标题：说说你的困标题：说说你的困惑标题：说说你的困惑困惑标题：说说你的困惑" />
+       <androidx.core.widget.NestedScrollView
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"
+           android:paddingBottom="50dp"
+           >
            <RelativeLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@@ -103,9 +108,6 @@
                        android:layout_marginTop="15dp"
                        android:background="@color/platform_new_divide_color" />
 
-
-
-
                    <androidx.cardview.widget.CardView
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
@@ -162,8 +164,7 @@
                </RelativeLayout>
 
            </RelativeLayout>
-
-
+       </androidx.core.widget.NestedScrollView>
         </RelativeLayout>
     <include
         android:layout_width="match_parent"