首页替换成直播 第二个替换成社区

然后把首页的推送先注释掉 把包名随便换一个
然后把登录line 还有谷歌登录去了 留fb的
This commit is contained in:
Martin
2024-08-26 10:53:59 +08:00
parent cfb5a5aac2
commit 02dc40b1bf
15 changed files with 45 additions and 37 deletions

View File

@@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:867032862719:android:841a73fdfb6c37453ae1ca",
"android_client_info": {
"package_name": "com.pandora.sy"
"package_name": "com.pandora.cs"
}
},
"oauth_client": [
@@ -17,7 +17,7 @@
"client_id": "867032862719-af2dnojobjd8s6ekdr1is1vev8nk36sv.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pandora.sy",
"package_name": "com.pandora.cs",
"certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
}
},
@@ -25,7 +25,7 @@
"client_id": "867032862719-ohaa1f18e186qpasvgt7qkk1i1pivniq.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pandora.sy",
"package_name": "com.pandora.cs",
"certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
}
},
@@ -33,7 +33,7 @@
"client_id": "867032862719-snpbqruvqcc9fsifjnmm1h3dcgtr8am4.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pandora.sy",
"package_name": "com.pandora.cs",
"certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
}
},

View File

@@ -1281,13 +1281,15 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
return;
}
if (position == 0) {
mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
vh = mainHomeComViewHolder;
} else if (position == 1) {
mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
vh = mainHomeViewHolder;
/* mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播
vh = mMainHomeCommunityViewHolder;*/
/*mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
vh = mainHomeComViewHolder;*/
} else if (position == 1) {
/*mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
vh = mainHomeViewHolder;*/
mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播
vh = mMainHomeCommunityViewHolder;
} else if (position == 2) {
mainMessageViewHolder = new MainMessageViewHolder(this, parent);
vh = mainMessageViewHolder;

View File

@@ -64,6 +64,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
android:layout_marginBottom="21dp">
<LinearLayout
@@ -192,7 +193,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:src="@mipmap/login_line"
android:visibility="visible" />
android:visibility="gone" />
<RelativeLayout
android:layout_width="57dp"
@@ -331,7 +332,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_centerHorizontal="true"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

View File

@@ -47,18 +47,6 @@
android:layout_height="match_parent"
android:layout_weight="1"
app:tbn_checked="true"
app:tbn_icon_array_id="@array/main_tab_home"
app:tbn_icon_size="25dp"
app:tbn_text_color_checked="@color/colorMainTab"
app:tbn_text_color_unchecked="@color/gray1"
app:tbn_text_size="11sp"
app:tbn_tip="@string/main_home" />
<com.yunbao.common.custom.TabButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="60dp"
android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_video"
app:tbn_icon_size="25dp"
app:tbn_text_color_checked="@color/colorMainTab"
@@ -66,6 +54,18 @@
app:tbn_text_size="11sp"
app:tbn_tip="@string/live" />
<com.yunbao.common.custom.TabButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="60dp"
android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_home"
app:tbn_icon_size="25dp"
app:tbn_text_color_checked="@color/colorMainTab"
app:tbn_text_color_unchecked="@color/gray1"
app:tbn_text_size="11sp"
app:tbn_tip="@string/community" />
<com.yunbao.common.custom.TabButton
android:layout_width="0dp"
android:layout_height="match_parent"