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

URL 跳转考虑是否存在?

Browse Source
This commit is contained in:
ningwenqiang 2024-11-02 14:57:48 +08:00
parent 1019bac085
commit 3f03230cd3
12 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
View File

@ -297,11 +297,19 @@ public class WebViewActivity extends AbsActivity {
mIsLive = isLive; mIsLive = isLive;
if (Constants.LoginKefu) { if (Constants.LoginKefu) {
if (addArgs) { if (addArgs) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0); if (url.contains("?")) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
} else {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
}}
} }
if (url.contains("?")) {
url += "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
} else {
url += "?isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
} }
Intent intent = new Intent(context, WebViewActivity.class); Intent intent = new Intent(context, WebViewActivity.class);
intent.putExtra(Constants.URL, url + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); intent.putExtra(Constants.URL, url);
context.startActivity(intent); context.startActivity(intent);
} }

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

@ -1493,4 +1493,5 @@ Limited ride And limited avatar frame</string>
<string name="interaction_type">Interaction</string> <string name="interaction_type">Interaction</string>
<string name="system_msg">System Message</string> <string name="system_msg">System Message</string>
<string name="user_login_account">Sign in with Phone number</string> <string name="user_login_account">Sign in with Phone number</string>
<string name="live_search_tips">Search for the hosts nickname or ID</string>
</resources> </resources>

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

@ -1623,4 +1623,5 @@
<string name="interaction_type">互動</string> <string name="interaction_type">互動</string>
<string name="system_msg">系統消息</string> <string name="system_msg">系統消息</string>
<string name="user_login_account">使用手機號登錄</string> <string name="user_login_account">使用手機號登錄</string>
<string name="live_search_tips">搜索主播暱稱或ID</string>
</resources> </resources>

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

@ -1432,6 +1432,6 @@ Limited ride And limited avatar frame</string>
<string name="system_msg">System Message</string> <string name="system_msg">System Message</string>
<string name="user_login_account">Sign in with Phone number</string> <string name="user_login_account">Sign in with Phone number</string>
<string name="live_search_tips">Search for the hosts nickname or ID</string>
</resources> </resources>

11
live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
View File

@ -299,10 +299,19 @@ public class WebViewActivityMedal extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs) { public static void forward(Context context, String url, boolean addArgs) {
if (addArgs) { if (addArgs) {
if (url.contains("?")) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
} else {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
}
}
if (url.contains("?")) {
url += "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
} else {
url += "?isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
} }
Intent intent = new Intent(context, WebViewActivityMedal.class); Intent intent = new Intent(context, WebViewActivityMedal.class);
intent.putExtra(Constants.URL, url + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); intent.putExtra(Constants.URL, url);
context.startActivity(intent); context.startActivity(intent);
} }

11
main/src/main/java/com/yunbao/main/activity/RewardActivity.java
View File

@ -319,11 +319,20 @@ public class RewardActivity extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs) { public static void forward(Context context, String url, boolean addArgs) {
if (addArgs) { if (addArgs) {
if (url.contains("?")) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
} else {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
}
} }
Intent intent = new Intent(context, RewardActivity.class); Intent intent = new Intent(context, RewardActivity.class);
if (url.contains("?")) {
url += "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
} else {
url += "?isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
}
Log.i("tag", url); Log.i("tag", url);
intent.putExtra(Constants.URL, url+ "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); intent.putExtra(Constants.URL, url);
context.startActivity(intent); context.startActivity(intent);
} }

9
main/src/main/java/com/yunbao/main/activity/ThreeDistributActivity.java
View File

@ -9,7 +9,9 @@ import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.provider.MediaStore; import android.provider.MediaStore;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -271,7 +273,12 @@ public class ThreeDistributActivity extends AbsActivity implements View.OnClickL
public static void forward(Context context, String title, String url) { public static void forward(Context context, String title, String url) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); if (url.contains("?")) {
url += "&uid=" + CommonAppConfig.getInstance().getUid();
} else {
url += "?uid=" + CommonAppConfig.getInstance().getUid();
}
url += "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
Intent intent = new Intent(context, ThreeDistributActivity.class); Intent intent = new Intent(context, ThreeDistributActivity.class);
intent.putExtra(Constants.URL, url); intent.putExtra(Constants.URL, url);
intent.putExtra(Constants.TIP, title); intent.putExtra(Constants.TIP, title);

8
main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
View File

@ -322,11 +322,15 @@ public class ZhuangBanActivity extends AbsActivity {
} else { } else {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"); url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
} }
} }
Intent intent = new Intent(context, ZhuangBanActivity.class); Intent intent = new Intent(context, ZhuangBanActivity.class);
if (url.contains("?")) {
url += "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
} else {
url += "?isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
}
Log.i("tag1212", url); Log.i("tag1212", url);
intent.putExtra(Constants.URL, url + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); intent.putExtra(Constants.URL, url);
if (url.contains("Noble/index.html") || url.contains("Grade/index.html") || url.contains("Guard/index.html")) { if (url.contains("Noble/index.html") || url.contains("Grade/index.html") || url.contains("Guard/index.html")) {
intent.putExtra("title", ""); intent.putExtra("title", "");
} }

6
main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
View File

@ -526,7 +526,7 @@ public class MainHttpUtil {
HttpClient.getInstance().get("ylahuoquduanxiyanzhengma", MainHttpConsts.GET_REGISTER_CODE) HttpClient.getInstance().get("ylahuoquduanxiyanzhengma", MainHttpConsts.GET_REGISTER_CODE)
.params("mobile", mobile) .params("mobile", mobile)
.params("sign", sign) .params("sign", sign)
.params("source", "1") .params("source", "4")
.params("langue", WordUtil.isNewZh()?"chinese":"english") .params("langue", WordUtil.isNewZh()?"chinese":"english")
.execute(callback); .execute(callback);
} }
@ -549,7 +549,7 @@ public class MainHttpUtil {
.params("Ticket", Ticket) .params("Ticket", Ticket)
.params("MacAddress", macUitl.getNewMac()) .params("MacAddress", macUitl.getNewMac())
.params("Imei", uuid) .params("Imei", uuid)
.params("source", "2") .params("source", "4")
.params("langue", WordUtil.isNewZh()?"chinese":"english") .params("langue", WordUtil.isNewZh()?"chinese":"english")
.execute(callback); .execute(callback);
} }
@ -659,7 +659,7 @@ public class MainHttpUtil {
HttpClient.getInstance().get("ylahuoquduanxiyanzhengma", MainHttpConsts.GET_FIND_PWD_CODE) HttpClient.getInstance().get("ylahuoquduanxiyanzhengma", MainHttpConsts.GET_FIND_PWD_CODE)
.params("mobile", mobile) .params("mobile", mobile)
.params("country_code", country_code) .params("country_code", country_code)
.params("source", "2") .params("source", "4")
.params("langue", WordUtil.isNewZh()?"chinese":"english") .params("langue", WordUtil.isNewZh()?"chinese":"english")
.execute(callback); .execute(callback);
} }

2
main/src/main/java/com/yunbao/main/views/LiveOptFollAgent.java
View File

@ -11,12 +11,10 @@ import com.yunbao.common.bean.AnchorRecommendModel;
import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.custom.CommonRefreshView; import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.main.activity.MainActivity; import com.yunbao.main.activity.MainActivity;
import com.yunbao.main.activity.WeekWebViewActivity; import com.yunbao.main.activity.WeekWebViewActivity;
import com.yunbao.main.adapter.MainHomeLiveAdapter; import com.yunbao.main.adapter.MainHomeLiveAdapter;
import com.yunbao.main.adapter.MainHomeRemFollLiveAdapter;
import com.yunbao.main.http.MainHttpConsts; import com.yunbao.main.http.MainHttpConsts;
import com.yunbao.main.http.MainHttpUtil; import com.yunbao.main.http.MainHttpUtil;

13
main/src/main/res/layout/item_main_home_lives_pola.xml
View File

@ -99,7 +99,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:drawablePadding="4dp" android:drawablePadding="4dp"
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
@ -109,7 +109,8 @@
app:dt_left_drawable="@mipmap/ic_yola_live_fire" app:dt_left_drawable="@mipmap/ic_yola_live_fire"
app:dt_left_height="14dp" app:dt_left_height="14dp"
app:dt_left_width="14dp" app:dt_left_width="14dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="@+id/name"
app:layout_constraintTop_toTopOf="@+id/name"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
tools:text="880k" /> tools:text="880k" />
@ -123,9 +124,9 @@
android:textColor="#fff" android:textColor="#fff"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/num" android:layout_marginBottom="11dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/num" app:layout_constraintBottom_toBottomOf="parent"
tools:text="mame" /> tools:text="mame" />
<TextView <TextView
@ -139,6 +140,7 @@
android:maxLines="1" android:maxLines="1"
android:textColor="#99ffffff" android:textColor="#99ffffff"
android:textSize="10sp" android:textSize="10sp"
android:visibility="gone"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/name" app:layout_constraintBottom_toTopOf="@+id/name"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -162,6 +164,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/title" app:layout_constraintBottom_toTopOf="@+id/title"
android:visibility="gone"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:riv_border_color="@color/color_white" app:riv_border_color="@color/color_white"
@ -190,7 +193,7 @@
android:id="@+id/live_info_view" android:id="@+id/live_info_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:constraint_referenced_ids="cover,bgs,live_type,views,tv_live_ico,tv_live_state,type,title,name,num"/> app:constraint_referenced_ids="cover,bgs,live_type,views,tv_live_ico,tv_live_state,type,name,num"/>
<!-- 这里从下面开始布局 这里是周星榜的--> <!-- 这里从下面开始布局 这里是周星榜的-->
<ViewFlipper <ViewFlipper

2
main/src/main/res/layout/view_main_home2.xml
View File

@ -66,7 +66,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:text="搜主播名字" android:text="@string/live_search_tips"
android:textColor="#99000000" android:textColor="#99000000"
android:textSize="12sp" android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/btn_search" app:layout_constraintBottom_toBottomOf="@+id/btn_search"