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

修改H5链接

Browse Source 
修改首页底部导航栏尺寸
This commit is contained in:
Martin 2024-09-14 10:30:00 +08:00
parent 602417f45d
commit 9d8bef398a
8 changed files with 39 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/google_online/google-services.json
View File

@ -1,65 +1,41 @@
{
"project_info": {
"project_number": "822566078854",
"project_id": "pdlvenew",
"storage_bucket": "pdlvenew.appspot.com"
"project_number": "163991854180",
"project_id": "poyo-597a0",
"storage_bucket": "poyo-597a0.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
"mobilesdk_app_id": "1:163991854180:android:c6d4c189e941c4b1da9371",
"android_client_info": {
"package_name": "com.pdsylive.yo"
}
},
"oauth_client": [
{
"client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
"client_id": "163991854180-lcd5n8kk2q9pv3bktp0ch2e3s2tl4mhs.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdsylive.yo",
"certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
"certificate_hash": "5dda5ab9aee4b4a8d357b6a953cb331c8f34d1cf"
}
},
{
"client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdsylive.yo",
"certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
}
},
{
"client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdsylive.yo",
"certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
}
},
{
"client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdsylive.yo",
"certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
}
},
{
"client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
"client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI"
"current_key": "AIzaSyBjHYkGdAIx9kh-FQ88eLLL6g6KGa8c7bw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
"client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
"client_type": 3
}
]

42
app/src/google_test/google-services.json
View File

@ -1,65 +1,41 @@
{
"project_info": {
"project_number": "822566078854",
"project_id": "pdlvenew",
"storage_bucket": "pdlvenew.appspot.com"
"project_number": "163991854180",
"project_id": "poyo-597a0",
"storage_bucket": "poyo-597a0.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
"mobilesdk_app_id": "1:163991854180:android:c6d4c189e941c4b1da9371",
"android_client_info": {
"package_name": "com.pdsylive.yo"
}
},
"oauth_client": [
{
"client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
"client_id": "163991854180-lcd5n8kk2q9pv3bktp0ch2e3s2tl4mhs.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdsylive.yo",
"certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
"certificate_hash": "5dda5ab9aee4b4a8d357b6a953cb331c8f34d1cf"
}
},
{
"client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdsylive.yo",
"certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
}
},
{
"client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdsylive.yo",
"certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
}
},
{
"client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdsylive.yo",
"certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
}
},
{
"client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
"client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI"
"current_key": "AIzaSyBjHYkGdAIx9kh-FQ88eLLL6g6KGa8c7bw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
"client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
"client_type": 3
}
]

6
common/src/main/java/com/yunbao/common/HtmlConfig.java
View File

@ -11,8 +11,8 @@ public class HtmlConfig {
public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=705";
//注册用户协议
public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";
public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3";
public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=706";
public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/h5/page/index.html?id=705";
//直播间贡献榜
public static final String LIVE_LIST = CommonAppConfig.HOST + "/index.php?g=Appapi&m=contribute&a=index&uid=";
@ -48,7 +48,7 @@ public class HtmlConfig {
public static final String PERSONAL = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/Personal";
//我的徽章 右上角问号
public static final String MEDAL_QUESTION = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Fans&a=rule&isfans=1";
public static final String MEDAL_QUESTION = CommonAppConfig.HOST + "/h5/fans/rule.html?isfans=1";
//我的明细
public static final String DETAIL = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Detail&a=index";

2
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@ -237,7 +237,7 @@ public class RouteUtil {
* 跳转到充值页面
*/
public static void forwardMyCoin(Context context) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=zhifu&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
String url = CommonAppConfig.HOST + "/h5/mall/zhifu.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
ARouter.getInstance().build(PATH_COIN).withString("url", url).navigation();
}

4
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@ -729,8 +729,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
* 观众打开主播的整蛊惑单窗口
*/
public void openZGListWindow() {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Turntable&a=tricky";
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
String url = CommonAppConfig.HOST + "/h5/activity/Turntable/index.html?";
url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
Log.i("tag", url);
Bundle bundle1 = new Bundle();

2
live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
View File

@ -450,7 +450,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
if (model != null && model.getWishlist().size() > 0) {
BannerBean bannerModel = new BannerBean();
bannerModel.setShow_type("2");
bannerModel.setLink(CommonAppConfig.HOST + "/index.php");
bannerModel.setLink(CommonAppConfig.HOST + "/h5/wish/index.html");
bannerModel.setImageUrl(model.getImg());
addWishList(bannerModel);

8
main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java
View File

@ -153,16 +153,16 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
mLevelAnchor.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0") + "&for";
WebViewActivity.forward(mContext, url, false);
/*String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0") + "&for";
WebViewActivity.forward(mContext, url, false);*/
}
});
//用户等级
mLevel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
WebViewActivity.forward(mContext, url, false);
/* String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
WebViewActivity.forward(mContext, url, false);*/
}
});

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

@ -16,7 +16,7 @@
android:id="@+id/rt_main_tab"
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="55dp"
android:layout_height="50dp"
android:layout_alignParentBottom="true">
<ImageView
@ -28,7 +28,7 @@
<RelativeLayout
android:id="@+id/bottom"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_height="50dp"
android:layout_alignParentBottom="true">
<com.yunbao.common.custom.TabButtonGroup
@ -43,44 +43,44 @@
android:layout_weight="1"
app:tbn_checked="true"
app:tbn_icon_array_id="@array/main_tab_home"
app:tbn_icon_size="28dp"
app:tbn_icon_size="24dp"
app:tbn_tip="@string/main_tab_main"
app:tbn_text_color_checked="#FFFF4598"
app:tbn_text_color_unchecked="#FF101420"
app:tbn_text_size="11sp" />
app:tbn_text_size="9sp" />
<com.yunbao.common.custom.TabButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_video"
app:tbn_icon_size="28dp"
app:tbn_icon_size="24dp"
app:tbn_tip="@string/main_tab_yule"
app:tbn_text_color_checked="#FFFF4598"
app:tbn_text_color_unchecked="#FF101420"
app:tbn_text_size="11sp" />
app:tbn_text_size="9sp" />
<com.yunbao.common.custom.TabButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_list"
app:tbn_icon_size="28dp"
app:tbn_icon_size="24dp"
app:tbn_tip="@string/main_tab_guangchang"
app:tbn_text_color_checked="#FFFF4598"
app:tbn_text_color_unchecked="#FF101420"
app:tbn_text_size="11sp" />
app:tbn_text_size="9sp" />
<com.yunbao.common.custom.TabButton
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_chat"
app:tbn_icon_size="28dp"
app:tbn_icon_size="24dp"
app:tbn_tip="@string/main_me"
app:tbn_text_color_checked="#FFFF4598"
app:tbn_text_color_unchecked="#FF101420"
app:tbn_text_size="11sp" />
app:tbn_text_size="9sp" />
</com.yunbao.common.custom.TabButtonGroup>