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

调整礼物UI

Browse Source 
新增新人签到弹框
This commit is contained in:
zlzw
2022-10-12 16:05:33 +08:00
parent 62dc81d971
commit d86e68060c
15 changed files with 216 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@@ -70,6 +70,7 @@ import com.yunbao.live.dialog.LiveMicUserDialogFragment;
import com.yunbao.live.dialog.LiveTotalDialog;
import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
import com.yunbao.live.dialog.SidebarLiveAudience;
import com.yunbao.live.dialog.SignDialogFragment;
import com.yunbao.live.event.LinkMicTxAccEvent;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveRoomChangeEvent;
@@ -344,7 +345,10 @@ public class LiveAudienceActivity extends LiveActivity {
manager.mLiveAudienceViewHolder.openNewPeopleDialog();
}
}
public void openSignWindow(String icon,String name,String desc){
SignDialogFragment fragment=new SignDialogFragment();
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "SignWindow");
}
/**
* 打开礼物窗口
*/

2
live/src/main/java/com/yunbao/live/adapter/GiftTopAdapter.java
View File

@@ -99,7 +99,7 @@ public class GiftTopAdapter extends RecyclerView.Adapter<GiftTopAdapter.Vh> {
if(position == choice){
mName.setTextColor(Color.parseColor("#FFBE41"));
}else{
mName.setTextColor(Color.parseColor("#FFFFFF"));
mName.setTextColor(Color.parseColor("#B6B6B6"));
}
}
}

34
live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
View File

@@ -4,6 +4,8 @@ import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.text.TextUtils;
import android.util.Log;
import android.view.Display;
@@ -28,6 +30,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.bean.JsWishBean;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
@@ -47,6 +50,10 @@ import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
public class LiveHDDialogFragment extends AbsDialogFragment {
private WebView mWebView;
@@ -151,6 +158,11 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, bundle.getInt("height", -1));
mWebView.setLayoutParams(params);
}
if (bundle.getInt("width", -1) != -1) {
ViewGroup.LayoutParams params = mWebView.getLayoutParams();
params.width = bundle.getInt("width", -1);
mWebView.setLayoutParams(params);
}
mWebView.loadUrl(bundle.getString("url"));
mWebView.setWebViewClient(new WebViewClient() {
@Override
@@ -163,10 +175,24 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
@Override
public void onPageFinished(WebView view, String url) {
webHeight = view.getContentHeight();
view.loadUrl("javascript:window.androidObject.setHeight(document.body.clientHeight,document.body.clientWidth)");
}
});
if (bundle.getBoolean("banScrollY", false)) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
mWebView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
@Override
public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
mWebView.scrollTo(0, scrollY);//只改变Y值，即限制左右滑动
}
});
}
}
}
private long webHeight = 0;
//js调用原生
public class JsInteration {
@JavascriptInterface
@@ -258,6 +284,14 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
}
@JavascriptInterface
public void androidSignGift(String name, String desc,String icon) {
((LiveAudienceActivity) mContext).openSignWindow(icon, name, desc);
}
@JavascriptInterface
public void setHeight(String height, String width) {
}
}
private LiveRoomCheckLivePresenter mCheckLivePresenter;

91
live/src/main/java/com/yunbao/live/dialog/SignDialogFragment.java Normal file
View File

@@ -0,0 +1,91 @@
package com.yunbao.live.dialog;
import android.app.Dialog;
import android.os.Bundle;
import android.view.Gravity;
import android.view.Window;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.live.R;
public class SignDialogFragment extends AbsDialogFragment {
String icon;
String name;
String desc;
@Override
protected int getLayoutId() {
return R.layout.dialog_live_sign;
}
@Override
protected int getDialogStyle() {
return R.style.dialog2;
}
@Override
protected boolean canCancel() {
return true;
}
@Override
protected void setWindowAttributes(Window window) {
window.setWindowAnimations(R.style.bottomToTopAnim);
WindowManager.LayoutParams params = window.getAttributes();
params.width = DpUtil.dp2px(250);
params.height = WindowManager.LayoutParams.WRAP_CONTENT;
params.gravity = Gravity.CENTER;
window.setAttributes(params);
}
public void setIcon(String icon) {
this.icon = icon;
}
public void setName(String name) {
this.name = name;
}
public void setDesc(String desc) {
this.desc = desc;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return super.onCreateDialog(savedInstanceState);
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
TextView mName = (TextView) findViewById(R.id.live_sign_desc);
TextView mDesc = (TextView) findViewById(R.id.sign_desc);
ImageView mIcon = (ImageView) findViewById(R.id.icon_sign);
Button signBtn = (Button) findViewById(R.id.live_sign_btn);
signBtn.setOnClickListener(v -> {
dismiss();
});
mName.setText(name);
mDesc.setText(desc);
ImgLoader.display(mContext,icon,mIcon);
}
@Override
public void show(@NonNull FragmentManager manager, @Nullable String tag) {
super.show(manager, tag);
}
}

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

@@ -368,6 +368,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
+ CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
bundle.putString("url", url);
bundle.putInt("show_type", 0);
bundle.putInt("height",DpUtil.dp2px(530));
bundle.putBoolean("banScrollY",true);
LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment();
liveHDDialogFragment.setArguments(bundle);
liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");