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

6.5.4礼物冠名

Browse Source
This commit is contained in:
18401019693
2023-08-22 10:13:57 +08:00
parent 2332255b37
commit 3b351ffad8
46 changed files with 115 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/java/com/yunbao/main/activity/BindUserActivity.java
View File

@@ -272,9 +272,9 @@ public class BindUserActivity extends AbsActivity {
} else if (i == R.id.btn_register) {
register();
} else if (i == R.id.btn_tip2) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1);
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false);
} else if (i == R.id.btn_tip3) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2);
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false);
} else if (i == R.id.btn_goto_updata) {
lt_now_bind.setVisibility(View.GONE);
lt_first_bind.setVisibility(View.VISIBLE);

2
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@@ -411,7 +411,7 @@ public class EditProfileActivity extends AbsActivity {
@Override
public void onClick(View v) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
WebViewActivity.forward(mContext, url);
WebViewActivity.forward(mContext, url,false);
dialog.dismiss();
}
});

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

@@ -208,14 +208,14 @@ public class EntryActivity extends AppCompatActivity {
btn_tip1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY);
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY,false);
}
});
btn_tip.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1);
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1,false);
}
});
@@ -268,7 +268,7 @@ public class EntryActivity extends AppCompatActivity {
if (data.getType().equals("0")) {
LoginManager.getInstance().logInWithReadPermissions(EntryActivity.this, Arrays.asList("public_profile"));
} else {
WebViewActivity.forward(EntryActivity.this, data.getLink() + "?");
WebViewActivity.forward(EntryActivity.this, data.getLink() + "?",false);
}
}
@@ -387,7 +387,7 @@ public class EntryActivity extends AppCompatActivity {
public void onClick(View v) {
if (!"".equals(kefuUrl)) {
Constants.LoginKefu = true;
WebViewActivity.forward(EntryActivity.this, kefuUrl);
WebViewActivity.forward(EntryActivity.this, kefuUrl,false);
}
}
});

2
main/src/main/java/com/yunbao/main/activity/LoginActivity.java
View File

@@ -239,7 +239,7 @@ public class LoginActivity extends AbsActivity {
//登录即代表同意服务和隐私条款
private void forwardTip() {
WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY);
WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY,false);
}

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

@@ -279,7 +279,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
} else if (getIntent().getStringExtra("type") != null && getIntent().getStringExtra("type").equals("8")) {
WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true);
WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true,false);
}
FirebaseMessaging.getInstance().getToken()
.addOnCompleteListener(new OnCompleteListener<String>() {

4
main/src/main/java/com/yunbao/main/activity/MyCoinActivity.java
View File

@@ -297,10 +297,10 @@ public class MyCoinActivity extends AbsActivity implements OnItemClickListener<C
int i = v.getId();
if (i == R.id.btn_tip) {
//充值协议
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_PRIVCAY + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_PRIVCAY + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),false);
}else if (i == R.id.btn_charge_explain) {
//充值说明
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_EXPLAIN + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
WebViewActivity.forward(mContext, HtmlConfig.CHARGE_EXPLAIN + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),false);
}
}

2
main/src/main/java/com/yunbao/main/activity/MyProfitActivity.java
View File

@@ -159,7 +159,7 @@ public class MyProfitActivity extends AbsActivity implements View.OnClickListene
* 提现记录
*/
private void cashRecord() {
WebViewActivity.forward(mContext, HtmlConfig.CASH_RECORD + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
WebViewActivity.forward(mContext, HtmlConfig.CASH_RECORD + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"),false);
}

2
main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java
View File

@@ -324,7 +324,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service");
if (userBean.getLink() != null && !"".equals(userBean.getLink())) {
WebViewActivity.forward(mContext, userBean.getLink());
WebViewActivity.forward(mContext, userBean.getLink(),false);
} else {
startActivity(new Intent(mContext, SystemMessageActivity.class)
.putExtra("type", userBean.getType())

4
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@@ -281,9 +281,9 @@ public class RegisterActivity extends AbsActivity {
} else if (i == R.id.btn_register) {
register();
} else if (i == R.id.btn_tip2) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1);
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false);
} else if (i == R.id.btn_tip3) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2);
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false);
}
}

2
main/src/main/java/com/yunbao/main/activity/SettingActivity.java
View File

@@ -321,7 +321,7 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
if (bean.getId() == 17) {//意见反馈要在url上加版本号和设备号
href += "&version=" + android.os.Build.VERSION.RELEASE + "&model=" + android.os.Build.MODEL;
}
WebViewActivity.forward(mContext, href);
WebViewActivity.forward(mContext, href,false);
}
}

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

@@ -37,7 +37,6 @@ import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.IMLoginManager;
@@ -53,7 +52,6 @@ import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.main.R;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -400,16 +398,9 @@ public class ZhuangBanActivity extends AbsActivity {
MicStatusManager.getInstance().showDownMicDialog(mContext);
return;
}
if (!"".endsWith(Constants.mStream)) {
finish();
if(MicStatusManager.getInstance().isMic(liveUid)){
MicStatusManager.getInstance().showDownMicDialog(mContext);
return;
}
EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
} else {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
}
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
finish();
}

2
main/src/main/java/com/yunbao/main/adapter/SystemMessageAdapter.java
View File

@@ -95,7 +95,7 @@ public class SystemMessageAdapter extends RecyclerView.Adapter {
forward(mContext, model1.getType(), "", model1.getTitle(), "");
} else if ("3".equals(model1.getType())) {
if (model1.getLink() != null && !"".equals(model1.getLink())) {
WebViewActivity.forward(mContext, model1.getLink());
WebViewActivity.forward(mContext, model1.getLink(),false);
} else {
forward(mContext, model1.getType(), "", model1.getTitle(), "");
}

2
main/src/main/java/com/yunbao/main/dialog/ReturnUserDialog.java
View File

@@ -78,7 +78,7 @@ public class ReturnUserDialog extends AbsDialogFragment {
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
}
});

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

@@ -426,7 +426,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
}
showLoadingDialog();
if (link.contains("http")) {
WebViewActivity.forward(mContext, link, true);
WebViewActivity.forward(mContext, link, true,false);
} else {
gotoLive(link);
}

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

@@ -463,13 +463,13 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
RewardActivity.forward(mContext, url);
} else if (bean.getId() == 4) {
url = HtmlConfig.SHOP + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
WebViewActivity.forward(mContext, url);
WebViewActivity.forward(mContext, url, false);
} else if (bean.getId() == 3) {//我的等级
Constants.myIntoIndex = 2;
Constants.isTitle = false;
ZhuangBanActivity.forward(mContext, url);
} else {
WebViewActivity.forward(mContext, url);
WebViewActivity.forward(mContext, url, false);
}
}
@@ -494,7 +494,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index";
RewardActivity.forward(mContext, url);
} else if (i == R.id.rt_kefu) {
WebViewActivity.forward(mContext, beanKefu.getHref());
WebViewActivity.forward(mContext, beanKefu.getHref(), false);
} else if (i == R.id.rt_setting) {
forwardSetting();
} else if (i == R.id.lt_noble) {
@@ -594,7 +594,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true;
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
WebViewActivity.forward(mContext, url, false);
WebViewActivity.forward(mContext, url, false, false);
}
}
}

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

@@ -148,7 +148,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
@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() + "&for";
WebViewActivity.forward(mContext, url);
WebViewActivity.forward(mContext, url,false);
}
});
//用户等级
@@ -156,7 +156,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
@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();
WebViewActivity.forward(mContext, url);
WebViewActivity.forward(mContext, url,false);
}
});
@@ -372,7 +372,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
Log.i("tsa", url);
RewardActivity.forward(mContext, url);
} else {
WebViewActivity.forward(mContext, url);
WebViewActivity.forward(mContext, url,false);
}
}
@@ -400,7 +400,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
} else if (i == R.id.btn_gold) {
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
} else if (i == R.id.rt_kefu) {
WebViewActivity.forward(mContext, beanKefu.getHref());
WebViewActivity.forward(mContext, beanKefu.getHref(),false);
} else if (i == R.id.rt_setting) {
forwardSetting();
} else if (i == R.id.v_noble) {