yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
然后把首页的推送先注释掉 把包名随便换一个
然后把登录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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Share/src/main/AndroidManifest.xml
View File

@ -4,7 +4,7 @@
> >
<queries> <queries>
<package android:name="com.pandora.sy"/> <package android:name="com.pandora.cs"/>
<package android:name="com.facebook.orca"/> <package android:name="com.facebook.orca"/>
<package <package

2
app/build.gradle
View File

@ -298,7 +298,7 @@ android {
defaultConfig { defaultConfig {
// applicationId "myname.pdlive.shayu" // applicationId "myname.pdlive.shayu"
applicationId "com.pandora.sy" applicationId "com.pandora.cs"
minSdkVersion rootProject.ext.android.minSdkVersion minSdkVersion rootProject.ext.android.minSdkVersion
//版本在这里修改 //版本在这里修改
targetSdkVersion rootProject.ext.android.targetSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion

8
app/google-services.json
View File

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

1
app/src/main/java/com/shayu/phonelive/AppContext.java
View File

@ -292,6 +292,7 @@ public class AppContext extends CommonAppContext {
MessageChatNotifyManager.getInstance().addShieldClass(LoginActivity.class); MessageChatNotifyManager.getInstance().addShieldClass(LoginActivity.class);
MessageChatNotifyManager.getInstance().addShieldClass(RegisterActivity.class); MessageChatNotifyManager.getInstance().addShieldClass(RegisterActivity.class);
MessageChatNotifyManager.getInstance().addShieldClass(UCropActivity.class); MessageChatNotifyManager.getInstance().addShieldClass(UCropActivity.class);
MessageChatNotifyManager.getInstance().addShieldClass(MainActivity.class);
RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() { RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() {

2
common/src/main/AndroidManifest.xml
View File

@ -25,7 +25,7 @@
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.pandora.sy.fileprovider" android:authorities="com.pandora.cs.fileprovider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">
<meta-data <meta-data

2
common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
View File

@ -417,7 +417,7 @@ public class CommonHttpUtil {
.params("purchaseToken", purchaseToken) .params("purchaseToken", purchaseToken)
.params("productId", productId) .params("productId", productId)
.params("orderno", orderno) .params("orderno", orderno)
.params("package_name", "com.pandora.sy") .params("package_name", "com.pandora.cs")
.execute(callback); .execute(callback);
} }

6
common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
View File

@ -83,7 +83,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
if (mNeedCrop) { if (mNeedCrop) {
Uri uri = null; Uri uri = null;
if (Build.VERSION.SDK_INT >= 24) { if (Build.VERSION.SDK_INT >= 24) {
uri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCameraResult); uri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCameraResult);
} else { } else {
uri = Uri.fromFile(mCameraResult); uri = Uri.fromFile(mCameraResult);
} }
@ -195,7 +195,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
mCameraResult = getNewFile(); mCameraResult = getNewFile();
Uri uri = null; Uri uri = null;
if (Build.VERSION.SDK_INT >= 24) { if (Build.VERSION.SDK_INT >= 24) {
uri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCameraResult); uri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCameraResult);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
} else { } else {
uri = Uri.fromFile(mCameraResult); uri = Uri.fromFile(mCameraResult);
@ -255,7 +255,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
startActivityForResult(intent, mCropResultCallback); startActivityForResult(intent, mCropResultCallback);
} catch (Exception e) { } catch (Exception e) {
try { try {
Uri resultUri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCorpResult); Uri resultUri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCorpResult);
if (resultUri == null || mFragment == null || mContext == null) { if (resultUri == null || mFragment == null || mContext == null) {
return; return;
} }

1
common/src/main/res/values-en-rUS/strings.xml
View File

@ -256,6 +256,7 @@
<string name="login_auth_failure">privilege grant failed</string> <string name="login_auth_failure">privilege grant failed</string>
<string name="login_auth_cancle">Authorization cancelled</string> <string name="login_auth_cancle">Authorization cancelled</string>
<string name="live">Live</string> <string name="live">Live</string>
<string name="community">Community</string>
<string name="login_tip_4">Log in</string> <string name="login_tip_4">Log in</string>
<string name="shopmall">shopmall</string> <string name="shopmall">shopmall</string>
<string name="recomment">Hot</string> <string name="recomment">Hot</string>

3
common/src/main/res/values-zh/strings.xml
View File

@ -208,6 +208,7 @@
<string name="login_auth_failure">授權失敗</string> <string name="login_auth_failure">授權失敗</string>
<string name="login_auth_cancle">授權取消</string> <string name="login_auth_cancle">授權取消</string>
<string name="live">直播</string> <string name="live">直播</string>
<string name="community">社區</string>
<string name="shopmall">商城</string> <string name="shopmall">商城</string>
<string name="cust_server">客服</string> <string name="cust_server">客服</string>
<string name="live_anchor">主播</string> <string name="live_anchor">主播</string>
@ -651,7 +652,7 @@
<string name="welcome_pdlive">歡迎來到PDLIVE</string> <string name="welcome_pdlive">歡迎來到PDLIVE</string>
<string name="newcomer">恭喜你獲得了新人獎勵</string> <string name="newcomer">恭喜你獲得了新人獎勵</string>
<string name="FILE_PROVIDER">com.pandora.sy.fileprovider</string> <string name="FILE_PROVIDER">com.pandora.cs.fileprovider</string>
<string name="ren">人</string> <string name="ren">人</string>
<string name="ge">個</string> <string name="ge">個</string>
<string name="count">數量</string> <string name="count">數量</string>

1
common/src/main/res/values/strings.xml
View File

@ -204,6 +204,7 @@
<string name="login_ing">Logon</string> <string name="login_ing">Logon</string>
<string name="login_auth_ing">Authorizing login</string> <string name="login_auth_ing">Authorizing login</string>
<string name="live">Live</string> <string name="live">Live</string>
<string name="community">Community</string>
<string name="login_tip_4">Log in</string> <string name="login_tip_4">Log in</string>
<string name="recomment">Hot</string> <string name="recomment">Hot</string>
<string name="main_type_find">Find</string> <string name="main_type_find">Find</string>

3
lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java
View File

@ -422,8 +422,9 @@ public class SWAuManager extends BaseCacheManager {
public void preloadChannel(List<LiveBean> uids){ public void preloadChannel(List<LiveBean> uids){
for (int i = 0; i <uids.size(); i++) { for (int i = 0; i <uids.size(); i++) {
L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName());
int code = mRtcEngine.preloadChannel(CommonAppConfig.SWToken,getChannelName(uids.get(i).getUid()),Integer.parseInt(CommonAppConfig.getInstance().getUid())); int code = mRtcEngine.preloadChannel(CommonAppConfig.SWToken,getChannelName(uids.get(i).getUid()),Integer.parseInt(CommonAppConfig.getInstance().getUid()));
L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName()+" code "+code); //L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName()+" code "+code);
} }
} }
} }

8
main/google-services.json
View File

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

12
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

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

5
main/src/main/res/layout/activity_entry.xml
View File

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

24
main/src/main/res/layout/view_homemain.xml
View File

@ -47,18 +47,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
app:tbn_checked="true" 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_array_id="@array/main_tab_video"
app:tbn_icon_size="25dp" app:tbn_icon_size="25dp"
app:tbn_text_color_checked="@color/colorMainTab" app:tbn_text_color_checked="@color/colorMainTab"
@ -66,6 +54,18 @@
app:tbn_text_size="11sp" app:tbn_text_size="11sp"
app:tbn_tip="@string/live" /> 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 <com.yunbao.common.custom.TabButton
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"