新功能页面基本完成2

@@ -58,6 +58,8 @@ public class CreatorHomePageActivity extends BasePBActivity {
     LinearLayout ll_unjoin_quanyi;
     @BindView(R.id.ll_joined_quanyi)
     LinearLayout ll_joined_quanyi;
+    @BindView(R.id.ll_zhanwei)
+    LinearLayout ll_zhanwei;
 
     @BindView(R.id.tv_join_chuangzuozhe)
     TextView tv_join_chuangzuozhe;
@@ -79,15 +81,17 @@ public class CreatorHomePageActivity extends BasePBActivity {
         Log.e("is_creator1111",is_creator + "");
         if (is_creator == 0){
             //没有加入创作者计划
-            ll_unjoin_quanyi.setVisibility(View.VISIBLE);
-            ll_joined_quanyi.setVisibility(View.GONE);
+//            ll_unjoin_quanyi.setVisibility(View.VISIBLE);
+//            ll_joined_quanyi.setVisibility(View.GONE);
             tv_join_chuangzuozhe.setVisibility(View.VISIBLE);
+            ll_zhanwei.setVisibility(View.VISIBLE);
             tabLayout.setVisibility(View.GONE);
             viewPager.setVisibility(View.GONE);
         }else if (is_creator == 1){
             //加入了创作者计划
-            ll_unjoin_quanyi.setVisibility(View.GONE);
-            ll_joined_quanyi.setVisibility(View.VISIBLE);
+//            ll_unjoin_quanyi.setVisibility(View.GONE);
+//            ll_joined_quanyi.setVisibility(View.GONE);
+            ll_zhanwei.setVisibility(View.GONE);
             tv_join_chuangzuozhe.setVisibility(View.GONE);
             tabLayout.setVisibility(View.VISIBLE);
             viewPager.setVisibility(View.VISIBLE);

@@ -142,8 +142,8 @@ public class CreatorOpusAdapter extends BaseRvAdapter<MomentModel> {
 
             //权限：look=广场可见，my=自己可见，index=主页可见
             holder.setText(R.id.tv_permission, data.getAuth().equals("look") ? "广场可见" : data.getAuth().equals("my") ? "自己可见" : "主页可见")
-                    .setVisibility(R.id.iv_option, data.getUser_id() == Config.USER_ID ? View.VISIBLE : View.GONE)
-                    .setVisibility(R.id.tv_permission, data.getUser_id() == Config.USER_ID ? View.VISIBLE : View.GONE)
+                    .setVisibility(R.id.iv_option, View.VISIBLE)
+                    .setVisibility(R.id.tv_permission, View.VISIBLE)
                     .setVisibility(R.id.iv_header, View.GONE)
                     .setVisibility(R.id.tv_name, View.GONE)
                     .setVisibility(R.id.iv_vip, View.GONE)
@@ -156,8 +156,8 @@ public class CreatorOpusAdapter extends BaseRvAdapter<MomentModel> {
                             (data.getRen_id() != 0 || data.getStudent_id() == 1) ?
                                     View.VISIBLE : View.GONE);
         } else {
-            holder.setVisibility(R.id.iv_option, data.getUser_id() == Config.USER_ID ? View.GONE : View.VISIBLE)
-                    .setVisibility(R.id.tv_permission, View.GONE)
+            holder.setVisibility(R.id.iv_option, View.VISIBLE)
+                    .setVisibility(R.id.tv_permission, View.VISIBLE)
 //                    .setVisibility(R.id.iv_header, View.VISIBLE)
 //                    .setVisibility(R.id.tv_name, View.VISIBLE)
                     .setVisibility(R.id.iv_vip, data.getUser().getVip_id() == 1 ? View.VISIBLE : View.GONE)

@@ -98,7 +98,7 @@ public class CreatorOpusFragment extends BaseListFragment<CreatorOpusAdapter, Mo
     @Override
     public CreatorOpusAdapter getAdapter() {
         return adapter == null ?
-                new CreatorOpusAdapter(mContext, false)
+                new CreatorOpusAdapter(mContext, true)
                         .setSuggest(type == TYPE_SUGGEST || type == TYPE_CITY || type == TYPE_SCHOOL)
                 : adapter;
     }

@@ -291,7 +291,7 @@ public class DataAnalysisFansFragment extends BaseFragment implements OnChartVal
 
     @Override
     public void onNothingSelected() {
-        
+
     }
 
     @OnClick({R.id.tv_see_fans_data_analysis, R.id.tv_all_area})

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--四个角-->
+    <corners android:radius="50dp"/>
+    <solid android:color="#40191833"/>
+
+</shape>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--四个角-->
+    <corners android:radius="50dp"/>
+    <solid android:color="#FF32D4EB"/>
+
+</shape>
\ No newline at end of file

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--四个角-->
+    <corners android:radius="50dp"/>
+    <solid android:color="#FF40DC9B"/>
+
+</shape>
\ No newline at end of file

@@ -262,10 +262,9 @@
                 android:layout_below="@id/ll_top"
                 android:layout_marginHorizontal="@dimen/dp_17"
                 android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginBottom="@dimen/dp_35"
                 android:background="@drawable/shape_bg_white_12"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -616,7 +615,16 @@
 
             </LinearLayout>
 
-            <!--            已经加入创作者的布局👇-->
+            <LinearLayout
+                android:id="@+id/ll_zhanwei"
+                android:layout_marginTop="@dimen/dp_35"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            </LinearLayout>
+
+            <!--            已经加入创作者的布局👇  2021.09.18修改为不显示这里了-->
             <LinearLayout
                 android:id="@+id/ll_joined_quanyi"
                 android:layout_width="match_parent"
@@ -627,7 +635,7 @@
                 android:layout_marginBottom="@dimen/dp_12"
                 android:background="@drawable/shape_bg_white_12"
                 android:orientation="vertical"
-                android:visibility="visible">
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -669,6 +677,7 @@
 
             <!--            已经加入创作者的布局👇-->
             <com.google.android.material.tabs.TabLayout
+                android:layout_marginTop="@dimen/dp_12"
                 android:id="@+id/tab_layout"
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
@@ -685,7 +694,6 @@
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_5"
                 android:visibility="visible" />
         </LinearLayout>
 

@@ -44,7 +44,7 @@
                 android:text="刚刚"
                 android:textColor="#79191833"
                 android:textSize="@dimen/sp_12"
-                android:visibility="visible" />
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/iv_vip"
@@ -64,9 +64,10 @@
                 android:layout_toEndOf="@id/iv_header"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <TextView
+                    android:visibility="gone"
                     android:id="@+id/tv_top"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -82,12 +83,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:text="-"
+                    android:text="刚刚"
                     android:textColor="@color/textBlackB3"
                     android:textSize="@dimen/sp_12" />
             </LinearLayout>
 
             <TextView
+                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
@@ -112,6 +114,7 @@
             android:src="@mipmap/icon_menu" />
 
         <TextView
+            android:text="广场可见"
             android:id="@+id/tv_permission"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"