刘朕 / social_app · 提交

转到一个项目

作者 liyan
提交 f6d1ca384bdf69bbfd022fe586a0c4a8baf244db 1 个父辈 39f337a6

新功能页面基本完成2

内嵌 并排对比
正在显示 9 个修改的文件 包含 57 行增加 和 18 行删除
@@ -58,6 +58,8 @@ public class CreatorHomePageActivity extends BasePBActivity { @@ -58,6 +58,8 @@ public class CreatorHomePageActivity extends BasePBActivity {
58 LinearLayout ll_unjoin_quanyi; 58 LinearLayout ll_unjoin_quanyi;
59 @BindView(R.id.ll_joined_quanyi) 59 @BindView(R.id.ll_joined_quanyi)
60 LinearLayout ll_joined_quanyi; 60 LinearLayout ll_joined_quanyi;
  61 + @BindView(R.id.ll_zhanwei)
  62 + LinearLayout ll_zhanwei;
61 63
62 @BindView(R.id.tv_join_chuangzuozhe) 64 @BindView(R.id.tv_join_chuangzuozhe)
63 TextView tv_join_chuangzuozhe; 65 TextView tv_join_chuangzuozhe;
@@ -79,15 +81,17 @@ public class CreatorHomePageActivity extends BasePBActivity { @@ -79,15 +81,17 @@ public class CreatorHomePageActivity extends BasePBActivity {
79 Log.e("is_creator1111",is_creator + ""); 81 Log.e("is_creator1111",is_creator + "");
80 if (is_creator == 0){ 82 if (is_creator == 0){
81 //没有加入创作者计划 83 //没有加入创作者计划
82 - ll_unjoin_quanyi.setVisibility(View.VISIBLE);  
83 - ll_joined_quanyi.setVisibility(View.GONE); 84 +// ll_unjoin_quanyi.setVisibility(View.VISIBLE);
  85 +// ll_joined_quanyi.setVisibility(View.GONE);
84 tv_join_chuangzuozhe.setVisibility(View.VISIBLE); 86 tv_join_chuangzuozhe.setVisibility(View.VISIBLE);
  87 + ll_zhanwei.setVisibility(View.VISIBLE);
85 tabLayout.setVisibility(View.GONE); 88 tabLayout.setVisibility(View.GONE);
86 viewPager.setVisibility(View.GONE); 89 viewPager.setVisibility(View.GONE);
87 }else if (is_creator == 1){ 90 }else if (is_creator == 1){
88 //加入了创作者计划 91 //加入了创作者计划
89 - ll_unjoin_quanyi.setVisibility(View.GONE);  
90 - ll_joined_quanyi.setVisibility(View.VISIBLE); 92 +// ll_unjoin_quanyi.setVisibility(View.GONE);
  93 +// ll_joined_quanyi.setVisibility(View.GONE);
  94 + ll_zhanwei.setVisibility(View.GONE);
91 tv_join_chuangzuozhe.setVisibility(View.GONE); 95 tv_join_chuangzuozhe.setVisibility(View.GONE);
92 tabLayout.setVisibility(View.VISIBLE); 96 tabLayout.setVisibility(View.VISIBLE);
93 viewPager.setVisibility(View.VISIBLE); 97 viewPager.setVisibility(View.VISIBLE);
@@ -142,8 +142,8 @@ public class CreatorOpusAdapter extends BaseRvAdapter<MomentModel> { @@ -142,8 +142,8 @@ public class CreatorOpusAdapter extends BaseRvAdapter<MomentModel> {
142 142
143 //权限：look=广场可见，my=自己可见，index=主页可见 143 //权限：look=广场可见，my=自己可见，index=主页可见
144 holder.setText(R.id.tv_permission, data.getAuth().equals("look") ? "广场可见" : data.getAuth().equals("my") ? "自己可见" : "主页可见") 144 holder.setText(R.id.tv_permission, data.getAuth().equals("look") ? "广场可见" : data.getAuth().equals("my") ? "自己可见" : "主页可见")
145 - .setVisibility(R.id.iv_option, data.getUser_id() == Config.USER_ID ? View.VISIBLE : View.GONE)  
146 - .setVisibility(R.id.tv_permission, data.getUser_id() == Config.USER_ID ? View.VISIBLE : View.GONE) 145 + .setVisibility(R.id.iv_option, View.VISIBLE)
  146 + .setVisibility(R.id.tv_permission, View.VISIBLE)
147 .setVisibility(R.id.iv_header, View.GONE) 147 .setVisibility(R.id.iv_header, View.GONE)
148 .setVisibility(R.id.tv_name, View.GONE) 148 .setVisibility(R.id.tv_name, View.GONE)
149 .setVisibility(R.id.iv_vip, View.GONE) 149 .setVisibility(R.id.iv_vip, View.GONE)
@@ -156,8 +156,8 @@ public class CreatorOpusAdapter extends BaseRvAdapter<MomentModel> { @@ -156,8 +156,8 @@ public class CreatorOpusAdapter extends BaseRvAdapter<MomentModel> {
156 (data.getRen_id() != 0 || data.getStudent_id() == 1) ? 156 (data.getRen_id() != 0 || data.getStudent_id() == 1) ?
157 View.VISIBLE : View.GONE); 157 View.VISIBLE : View.GONE);
158 } else { 158 } else {
159 - holder.setVisibility(R.id.iv_option, data.getUser_id() == Config.USER_ID ? View.GONE : View.VISIBLE)  
160 - .setVisibility(R.id.tv_permission, View.GONE) 159 + holder.setVisibility(R.id.iv_option, View.VISIBLE)
  160 + .setVisibility(R.id.tv_permission, View.VISIBLE)
161 // .setVisibility(R.id.iv_header, View.VISIBLE) 161 // .setVisibility(R.id.iv_header, View.VISIBLE)
162 // .setVisibility(R.id.tv_name, View.VISIBLE) 162 // .setVisibility(R.id.tv_name, View.VISIBLE)
163 .setVisibility(R.id.iv_vip, data.getUser().getVip_id() == 1 ? View.VISIBLE : View.GONE) 163 .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 @@ -98,7 +98,7 @@ public class CreatorOpusFragment extends BaseListFragment<CreatorOpusAdapter, Mo
98 @Override 98 @Override
99 public CreatorOpusAdapter getAdapter() { 99 public CreatorOpusAdapter getAdapter() {
100 return adapter == null ? 100 return adapter == null ?
101 - new CreatorOpusAdapter(mContext, false) 101 + new CreatorOpusAdapter(mContext, true)
102 .setSuggest(type == TYPE_SUGGEST || type == TYPE_CITY || type == TYPE_SCHOOL) 102 .setSuggest(type == TYPE_SUGGEST || type == TYPE_CITY || type == TYPE_SCHOOL)
103 : adapter; 103 : adapter;
104 } 104 }
@@ -291,7 +291,7 @@ public class DataAnalysisFansFragment extends BaseFragment implements OnChartVal @@ -291,7 +291,7 @@ public class DataAnalysisFansFragment extends BaseFragment implements OnChartVal
291 291
292 @Override 292 @Override
293 public void onNothingSelected() { 293 public void onNothingSelected() {
294 - 294 +
295 } 295 }
296 296
297 @OnClick({R.id.tv_see_fans_data_analysis, R.id.tv_all_area}) 297 @OnClick({R.id.tv_see_fans_data_analysis, R.id.tv_all_area})
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <!--四个角-->
  5 + <corners android:radius="50dp"/>
  6 + <solid android:color="#40191833"/>
  7 +
  8 +</shape>
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <!--四个角-->
  5 + <corners android:radius="50dp"/>
  6 + <solid android:color="#FF32D4EB"/>
  7 +
  8 +</shape>
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <!--四个角-->
  5 + <corners android:radius="50dp"/>
  6 + <solid android:color="#FF40DC9B"/>
  7 +
  8 +</shape>
@@ -262,10 +262,9 @@ @@ -262,10 +262,9 @@
262 android:layout_below="@id/ll_top" 262 android:layout_below="@id/ll_top"
263 android:layout_marginHorizontal="@dimen/dp_17" 263 android:layout_marginHorizontal="@dimen/dp_17"
264 android:layout_marginTop="@dimen/dp_12" 264 android:layout_marginTop="@dimen/dp_12"
265 - android:layout_marginBottom="@dimen/dp_35"  
266 android:background="@drawable/shape_bg_white_12" 265 android:background="@drawable/shape_bg_white_12"
267 android:orientation="vertical" 266 android:orientation="vertical"
268 - android:visibility="gone"> 267 + android:visibility="visible">
269 268
270 <TextView 269 <TextView
271 android:layout_width="wrap_content" 270 android:layout_width="wrap_content"
@@ -616,7 +615,16 @@ @@ -616,7 +615,16 @@
616 615
617 </LinearLayout> 616 </LinearLayout>
618 617
619 - <!-- 已经加入创作者的布局👇--> 618 + <LinearLayout
  619 + android:id="@+id/ll_zhanwei"
  620 + android:layout_marginTop="@dimen/dp_35"
  621 + android:orientation="vertical"
  622 + android:layout_width="match_parent"
  623 + android:layout_height="wrap_content">
  624 +
  625 + </LinearLayout>
  626 +
  627 + <!-- 已经加入创作者的布局👇 2021.09.18修改为不显示这里了-->
620 <LinearLayout 628 <LinearLayout
621 android:id="@+id/ll_joined_quanyi" 629 android:id="@+id/ll_joined_quanyi"
622 android:layout_width="match_parent" 630 android:layout_width="match_parent"
@@ -627,7 +635,7 @@ @@ -627,7 +635,7 @@
627 android:layout_marginBottom="@dimen/dp_12" 635 android:layout_marginBottom="@dimen/dp_12"
628 android:background="@drawable/shape_bg_white_12" 636 android:background="@drawable/shape_bg_white_12"
629 android:orientation="vertical" 637 android:orientation="vertical"
630 - android:visibility="visible"> 638 + android:visibility="gone">
631 639
632 <TextView 640 <TextView
633 android:layout_width="wrap_content" 641 android:layout_width="wrap_content"
@@ -669,6 +677,7 @@ @@ -669,6 +677,7 @@
669 677
670 <!-- 已经加入创作者的布局👇--> 678 <!-- 已经加入创作者的布局👇-->
671 <com.google.android.material.tabs.TabLayout 679 <com.google.android.material.tabs.TabLayout
  680 + android:layout_marginTop="@dimen/dp_12"
672 android:id="@+id/tab_layout" 681 android:id="@+id/tab_layout"
673 android:layout_width="match_parent" 682 android:layout_width="match_parent"
674 android:layout_height="44dp" 683 android:layout_height="44dp"
@@ -685,7 +694,6 @@ @@ -685,7 +694,6 @@
685 android:id="@+id/viewPager" 694 android:id="@+id/viewPager"
686 android:layout_width="match_parent" 695 android:layout_width="match_parent"
687 android:layout_height="wrap_content" 696 android:layout_height="wrap_content"
688 - android:layout_marginTop="@dimen/dp_5"  
689 android:visibility="visible" /> 697 android:visibility="visible" />
690 </LinearLayout> 698 </LinearLayout>
691 699
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 android:text="刚刚" 44 android:text="刚刚"
45 android:textColor="#79191833" 45 android:textColor="#79191833"
46 android:textSize="@dimen/sp_12" 46 android:textSize="@dimen/sp_12"
47 - android:visibility="visible" /> 47 + android:visibility="gone" />
48 48
49 <ImageView 49 <ImageView
50 android:id="@+id/iv_vip" 50 android:id="@+id/iv_vip"
@@ -64,9 +64,10 @@ @@ -64,9 +64,10 @@
64 android:layout_toEndOf="@id/iv_header" 64 android:layout_toEndOf="@id/iv_header"
65 android:gravity="center_vertical" 65 android:gravity="center_vertical"
66 android:orientation="horizontal" 66 android:orientation="horizontal"
67 - android:visibility="gone"> 67 + android:visibility="visible">
68 68
69 <TextView 69 <TextView
  70 + android:visibility="gone"
70 android:id="@+id/tv_top" 71 android:id="@+id/tv_top"
71 android:layout_width="wrap_content" 72 android:layout_width="wrap_content"
72 android:layout_height="wrap_content" 73 android:layout_height="wrap_content"
@@ -82,12 +83,13 @@ @@ -82,12 +83,13 @@
82 android:layout_width="wrap_content" 83 android:layout_width="wrap_content"
83 android:layout_height="wrap_content" 84 android:layout_height="wrap_content"
84 android:singleLine="true" 85 android:singleLine="true"
85 - android:text="-" 86 + android:text="刚刚"
86 android:textColor="@color/textBlackB3" 87 android:textColor="@color/textBlackB3"
87 android:textSize="@dimen/sp_12" /> 88 android:textSize="@dimen/sp_12" />
88 </LinearLayout> 89 </LinearLayout>
89 90
90 <TextView 91 <TextView
  92 + android:visibility="gone"
91 android:layout_width="wrap_content" 93 android:layout_width="wrap_content"
92 android:layout_height="wrap_content" 94 android:layout_height="wrap_content"
93 android:layout_alignParentEnd="true" 95 android:layout_alignParentEnd="true"
@@ -112,6 +114,7 @@ @@ -112,6 +114,7 @@
112 android:src="@mipmap/icon_menu" /> 114 android:src="@mipmap/icon_menu" />
113 115
114 <TextView 116 <TextView
  117 + android:text="广场可见"
115 android:id="@+id/tv_permission" 118 android:id="@+id/tv_permission"
116 android:layout_width="wrap_content" 119 android:layout_width="wrap_content"
117 android:layout_height="wrap_content" 120 android:layout_height="wrap_content"