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

Merge branch 'dev_6.5.2'

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
This commit is contained in:
zlzw
2023-05-17 16:20:10 +08:00
parent e28c6228ad 82b3b23470
commit c1c8921f59
50 changed files with 1926 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@ import com.yunbao.common.interfaces.ActivityResultCallback;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.interfaces.ImageResultCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L;
@@ -53,6 +54,7 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
import com.yunbao.main.http.MainHttpUtil;
import com.yunbao.share.ui.InvitePopDialog;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -83,6 +85,7 @@ public class RewardActivity extends AbsActivity {
@Override
protected void main() {
Bus.getOn(this);
String url = getIntent().getStringExtra(Constants.URL);
L.e("H5---10>" + url);
LinearLayout rootView = (LinearLayout) findViewById(R.id.rootView);
@@ -330,6 +333,7 @@ public class RewardActivity extends AbsActivity {
@Override
protected void onDestroy() {
Bus.getOff(this);
if (mWebView != null) {
ViewGroup parent = (ViewGroup) mWebView.getParent();
if (parent != null) {
@@ -420,6 +424,10 @@ public class RewardActivity extends AbsActivity {
} else if (TextUtils.equals(event.getMethod(), "openUpdataAutograph")) {
isUpdataUser = true;
forwardSign();
}else if (event.getMethod().equals("androidInviteShare")) {
new InvitePopDialog(mContext)
.setUrl(event.getData())
.showDialog();
}
}
}