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

pdlive6.6.6版本改动合并

Browse Source
This commit is contained in:
18401019693
2024-04-11 13:11:32 +08:00
parent 80d89c8c0b
commit b31ec9cddf
209 changed files with 9450 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/java/com/yunbao/main/activity/CustomerServiceWebViewActivity.java
View File

@@ -91,7 +91,7 @@ public class CustomerServiceWebViewActivity extends AbsActivity {
params.bottomMargin = getNavigationBarHeight(mContext);
}*/
//mWebView.setLayoutParams(params);
// mWebView.setOverScrollMode(View.OVER_SCROLL_IF_CONTENT_SCROLLS);
// mWebView.setOverScrollMode(View.OVER_SCROLL_IF_CONTENT_SCROLLS);
mWebView.setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -242,7 +242,7 @@ public class CustomerServiceWebViewActivity extends AbsActivity {
}
protected boolean canGoBack() {
if (!isKefu(mWebView.getUrl()==null?"":mWebView.getUrl())) {
if (!isKefu(mWebView.getUrl() == null ? "" : mWebView.getUrl())) {
mWebView.loadUrl("javascript:userBackShowPraise()");
return false;
}
@@ -253,7 +253,7 @@ public class CustomerServiceWebViewActivity extends AbsActivity {
@Override
public void onBackPressed() {
if (!isKefu(mWebView.getUrl()==null?"":mWebView.getUrl())) {
if (!isKefu(mWebView.getUrl() == null ? "" : mWebView.getUrl())) {
finish();
return;
}

1
main/src/main/java/com/yunbao/main/activity/FindPwdActivity.java
View File

@@ -370,6 +370,7 @@ public class FindPwdActivity extends AbsActivity {
IMLoginModel model = GsonUtils.fromJson(info[0], IMLoginModel.class);
IMLoginManager.get(mContext).setupLoginUser(model);
CommonAppConfig.getInstance().setLoginInfo(uid, token, true);
IMLoginManager.get(mContext).setupLoginUser(model);
getBaseUserInfo();
} else {
if (!TextUtils.isEmpty(msg)) {

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

@@ -13,6 +13,8 @@ import android.app.PendingIntent;
import android.content.ClipData;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -759,6 +761,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public void onKickedOffline() {
super.onKickedOffline();
Log.i("tx", "腾讯云服务器踢出登录");
CommonAppConfig.getInstance().clearLoginInfo();
LoginActivity.forward();
@@ -846,15 +849,19 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
private void showStartDialog() {
if (isReady == true) {
MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
dialogFragment.setMainStartChooseCallback(true, this);
dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
} else {
ToastUtil.show("正在初始化，請稍等....");
}
if (isReady == true) {
MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
dialogFragment.setMainStartChooseCallback(true, this);
dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
} else {
ToastUtil.show("正在初始化，請稍等....");
}
}
/**
* 检查版本更新
*/

38
main/src/main/java/com/yunbao/main/activity/MainHomeCommunityActivity.java
View File

@@ -8,25 +8,36 @@ import androidx.fragment.app.FragmentTransaction;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.lzf.easyfloat.EasyFloat;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.AnchorStartLiveBean;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.views.floatingview.APPEasyFloat;
import com.yunbao.main.R;
import com.yunbao.main.dialog.AnchorStartLiveNotifyDialog;
import com.yunbao.main.fragment.MainHomeCommunityVideoFragment;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
/**
* 短剧
*/
@Route(path = RouteUtil.PATH_COMMUNITY_Activity)
public class MainHomeCommunityActivity extends AbsActivity {
private List<AnchorStartLiveBean> startListNotifyList = new ArrayList<>();
@Override
protected int getLayoutId() {
return R.layout.activity_main_home_community;
}
@Override
protected void main() {
EventBus.getDefault().register(this);
Window window = getWindow();
window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
@@ -42,11 +53,34 @@ public class MainHomeCommunityActivity extends AbsActivity {
}
APPEasyFloat.getInstance().dismiss(mContext);
MobclickAgent.onEvent(mContext, "short_drama_entrance", "短剧");
}
@Override
public void onDestroy() {
super.onDestroy();
EventBus.getDefault().unregister(this);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onNotifyAnchorLive(AnchorStartLiveBean bean) {
if (!IMLoginManager.get(mContext).isLiveNotifySettings()) return;
if (startListNotifyList.isEmpty()) {
startListNotifyList.add(bean);
notifyLiveFlot();
} else {
startListNotifyList.add(bean);
}
}
private void notifyLiveFlot() {
if (startListNotifyList.iterator().hasNext()) {
AnchorStartLiveBean bean = startListNotifyList.iterator().next();
new AnchorStartLiveNotifyDialog(mContext, bean).setOnDismissListener(dialog -> {
startListNotifyList.remove(bean);
if (startListNotifyList.iterator().hasNext()) {
notifyLiveFlot();
}
}).showDialog();
}
}
}

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

@@ -292,7 +292,7 @@ public class ZhuangBanActivity extends AbsActivity {
Intent intent = new Intent(context, ZhuangBanActivity.class);
Log.i("tag1212", url);
intent.putExtra(Constants.URL, url + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
if (url.contains("Noble/index.html") || url.contains("Grade/index.html")) {
if (url.contains("Noble/index.html") || url.contains("Grade/index.html")|| url.contains("Guard/index.html")) {
intent.putExtra("title", "");
}
context.startActivity(intent);

20
main/src/main/java/com/yunbao/main/adapter/MainHomeFollowAdapter.java
View File

@@ -7,11 +7,13 @@ import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.yunbao.common.Constants;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.main.R;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.main.utils.MainIconUtil;
@@ -64,6 +66,7 @@ public class MainHomeFollowAdapter extends RefreshAdapter<LiveBean> {
TextView mTitle;
TextView mNum;
ImageView mType;
private View redPacket, dragon_money;
public Vh(View itemView) {
super(itemView);
@@ -73,6 +76,8 @@ public class MainHomeFollowAdapter extends RefreshAdapter<LiveBean> {
mTitle = (TextView) itemView.findViewById(R.id.title);
mNum = (TextView) itemView.findViewById(R.id.num);
mType = (ImageView) itemView.findViewById(R.id.type);
redPacket = itemView.findViewById(R.id.red_packet);
dragon_money = itemView.findViewById(R.id.dragon_money);
itemView.setOnClickListener(mOnClickListener);
}
@@ -101,6 +106,21 @@ public class MainHomeFollowAdapter extends RefreshAdapter<LiveBean> {
mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
}
// mType.setImageResource(MainIconUtil.getLiveTypeIcon(bean.getType()));
RelativeLayout.LayoutParams dragon_moneyLayoutParams = (RelativeLayout.LayoutParams) dragon_money.getLayoutParams();
if (bean.getRedPacketStatus() == 1) {
dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(55);
redPacket.setVisibility(View.VISIBLE);
} else {
dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(25);
redPacket.setVisibility(View.GONE);
}
if (bean.getSendMoneyLongStatus() == 1) {
dragon_money.setLayoutParams(dragon_moneyLayoutParams);
dragon_money.setVisibility(View.VISIBLE);
} else {
dragon_money.setVisibility(View.GONE);
}
}
}

15
main/src/main/java/com/yunbao/main/adapter/MainHomeRemFollLiveAdapter.java
View File

@@ -7,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -19,6 +20,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.formatBigNum;
import com.yunbao.main.R;
import com.yunbao.main.utils.MainIconUtil;
@@ -79,11 +81,12 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
ImageView dr_pk_ico;
View views;
ImageView bgs;
private View redPacket;
private View redPacket, dragon_money;
public Vh(View itemView) {
super(itemView);
redPacket = itemView.findViewById(R.id.red_packet);
dragon_money = itemView.findViewById(R.id.dragon_money);
live_info_view = (LinearLayout) itemView.findViewById(R.id.live_info_view);
mCover = (ImageView) itemView.findViewById(R.id.cover);
mName = (TextView) itemView.findViewById(R.id.name);
@@ -222,10 +225,20 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
if (bean.getIs_week() != null && bean.getIs_week().equals("1")) {
views.setVisibility(View.GONE);
}
RelativeLayout.LayoutParams dragon_moneyLayoutParams = (RelativeLayout.LayoutParams) dragon_money.getLayoutParams();
if (bean.getRedPacketStatus() == 1) {
dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(55);
redPacket.setVisibility(View.VISIBLE);
} else {
dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(25);
redPacket.setVisibility(View.GONE);
}
if (bean.getSendMoneyLongStatus() == 1) {
dragon_money.setLayoutParams(dragon_moneyLayoutParams);
dragon_money.setVisibility(View.VISIBLE);
} else {
dragon_money.setVisibility(View.GONE);
}
}

41
main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
View File

@@ -5,10 +5,14 @@ import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
@@ -25,6 +29,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.PluginManager;
@@ -36,7 +41,6 @@ import com.yunbao.live.LiveConfig;
import com.yunbao.live.activity.LiveAnchorActivity;
import com.yunbao.live.activity.LiveRyAnchorActivity;
import com.yunbao.live.bean.LiveKsyConfigBean;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.main.R;
import com.yunbao.main.activity.CommunitySendActivity;
import com.yunbao.main.activity.MyWebViewActivity;
@@ -278,12 +282,12 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
if ("2".equals(mBeautySdkType)) {
Constants.myIntoIndex = 2;
Intent intent = new Intent(mContext, MyWebViewActivity.class);
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1" + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
CommonAppContext.getTopActivity().startActivity(intent);
} else {
Constants.myIntoIndex = 2;
Intent intent = new Intent(mContext, MyWebViewActivity.class);
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1" + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
CommonAppContext.getTopActivity().startActivity(intent);
}*/
}
@@ -298,9 +302,14 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
int i = v.getId();
if (i == R.id.btn_close) {
} else if (i == R.id.btn_live) {
if (mCallback != null) {
MobclickAgent.onEvent(mContext, "home_page_broadcast", "点击开播按钮");
mCallback.onLiveClick();
if (isWifiProxy(mContext) || checkVPN((ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE))) {
ToastUtil.show(WordUtil.isNewZh()?"檢測開啓了VPN或者代理，請先關閉VPN或者代理再開播。":
"It is detected that VPN or proxy is turned on. Please turn off VPN or proxy before starting the broadcast.");
} else {
if (mCallback != null) {
MobclickAgent.onEvent(mContext, "home_page_broadcast", "点击开播按钮");
mCallback.onLiveClick();
}
}
} else if (i == R.id.btn_video) {
if (mCallback != null) {
@@ -309,7 +318,27 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
}
}
}
private boolean isWifiProxy(Context context) {
final boolean IS_ICS_OR_LATER = Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH;
String proxyAddress;
int proxyPort;
if (IS_ICS_OR_LATER) {
proxyAddress = System.getProperty("http.proxyHost");
String portStr = System.getProperty("http.proxyPort");
proxyPort = Integer.parseInt((portStr != null ? portStr : "-1"));
} else {
proxyAddress = android.net.Proxy.getHost(context);
proxyPort = android.net.Proxy.getPort(context);
}
return (!TextUtils.isEmpty(proxyAddress)) && (proxyPort != -1);
}
private boolean checkVPN(ConnectivityManager connMgr) {
//don't know why always returns null:
NetworkInfo networkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_VPN);
boolean isVpnConn = networkInfo == null ? false : networkInfo.isConnected();
return isVpnConn;
}
@Override
public void onDestroy() {
super.onDestroy();

12
main/src/main/java/com/yunbao/main/fragment/MainHomeCommunityVideoFragment.java
View File

@@ -33,6 +33,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.bean.CoolConfig;
import com.yunbao.common.bean.NativeCallbackModel;
import com.yunbao.common.dialog.CinemaTicketPopupWindow;
import com.yunbao.common.dialog.SkitCheckInWasSuccessfulPopup;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.fragment.BaseFragment;
import com.yunbao.common.http.HttpCallback;
@@ -226,6 +227,17 @@ public class MainHomeCommunityVideoFragment extends BaseFragment {
System.out.println("code = " + code + ", msg = " + msg + ", info = " + Arrays.toString(info));
if (code == 0) {
mWebView.loadUrl(JSONObject.parseObject(info[0]).getString("url"));
String sign_ok = JSONObject.parseObject(info[0]).getString("sign_ok");
if (TextUtils.equals(sign_ok,"1")){
new XPopup.Builder(mContext)
.dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true
.asCustom(new SkitCheckInWasSuccessfulPopup(mContext))
.show();
}
// new XPopup.Builder(mContext)
// .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true
// .asCustom(new SkitCheckInWasSuccessfulPopup(mContext))
// .show();
}
}
});

1
main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
View File

@@ -135,7 +135,6 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
public void onClick(View v) {
if (viewPager != null) {
if (index == 1) {
MobclickAgent.onEvent(mContext, "short_drama_entrance", "短剧");
RouteUtil.forwardCommunityActivity();
} else {
viewPager.setCurrentItem(index);

16
main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java
View File

@@ -3,7 +3,9 @@ package com.yunbao.main.views;
import android.content.Context;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -32,7 +34,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
private ImageView mCover, liveType, mLiveIco, mType, pkico, drPkIco, pkAvatar, viewBg;
private ImageView bgs;
private View views;
private View redPacket;
private View redPacket, dragon_money;
private TextView mLiveState, mTitle, mName, mNum;
public MainHomeLiveItemViewHolder(@NonNull View itemView) {
@@ -42,6 +44,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
itemView.findViewById(R.id.lt_week_list).setVisibility(View.GONE);
mCover = itemView.findViewById(R.id.cover);
redPacket = itemView.findViewById(R.id.red_packet);
dragon_money = itemView.findViewById(R.id.dragon_money);
bgs = itemView.findViewById(R.id.bgs);
liveType = itemView.findViewById(R.id.live_type);
views = itemView.findViewById(R.id.views);
@@ -64,6 +67,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
* @param position 下标
*/
public void loadViewDate(LiveBean bean, int position, int height, OnItemClickListener listener) {
dragon_money.setVisibility(View.GONE);
Context mContext = itemView.getContext();
itemView.setTag(position);
liveType.setImageDrawable(null);
@@ -149,10 +153,20 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
} else {
viewBg.setVisibility(View.GONE);
}
RelativeLayout.LayoutParams dragon_moneyLayoutParams = (RelativeLayout.LayoutParams) dragon_money.getLayoutParams();
if (bean.getRedPacketStatus() == 1) {
dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(55);
redPacket.setVisibility(View.VISIBLE);
} else {
dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(25);
redPacket.setVisibility(View.GONE);
}
if (bean.getSendMoneyLongStatus() == 1) {
dragon_money.setLayoutParams(dragon_moneyLayoutParams);
dragon_money.setVisibility(View.VISIBLE);
} else {
dragon_money.setVisibility(View.GONE);
}
RxView.clicks(itemView)
.throttleFirst(2, TimeUnit.SECONDS) // 才发送 2s内第1次点击按钮的事件

33
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@@ -1,15 +1,21 @@
package com.yunbao.main.views;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.HorizontalScrollView;
import android.widget.ImageView;
import android.widget.TextView;
import com.lxj.xpopup.XPopup;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.dialog.SkitCheckInWasSuccessfulPopup;
import com.yunbao.common.event.FloatWarOrderEvent;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.MessageSayHiNotifyManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.main.R;
import org.greenrobot.eventbus.EventBus;
@@ -27,6 +33,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
private final String mPageName = "home_page";
private ImageView img_trophy;
private boolean floatWarOrder;
private TextView tvPlay;
public boolean isFloatWarOrder() {
return floatWarOrder;
@@ -49,13 +56,22 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy);
/* img_trophy.setOnLongClickListener(new View.OnLongClickListener() {
// img_trophy.setOnLongClickListener(new View.OnLongClickListener() {
// @Override
// public boolean onLongClick(View view) {
// new XPopup.Builder(mContext)
// .asCustom(new SkitCheckInWasSuccessfulPopup(mContext))
// .show();
// return true;
// }
// });
findViewById(R.id.tvPlay).setOnClickListener(new View.OnClickListener() {
@Override
public boolean onLongClick(View view) {
return true;
public void onClick(View v) {
MobclickAgent.onEvent(mContext, "home_page_short_drama", "首页短剧按钮");
RouteUtil.forwardCommunityActivity();
}
});*/
});
}
public void setCurPosition(int position) {
@@ -141,12 +157,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
@Override
protected String[] getTitles() {
return new String[]{
mContext.getString(R.string.follow),
mContext.getString(R.string.hot),
mContext.getString(R.string.recomment),
mContext.getString(R.string.main_tabs_red_packet),
};
return new String[]{mContext.getString(R.string.follow), mContext.getString(R.string.hot), mContext.getString(R.string.recomment), mContext.getString(R.string.main_tabs_red_packet),};
}

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

@@ -11,6 +11,7 @@ import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -106,7 +107,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
private TextView btnCopy;
private SVGAImageView gift_svga;
private View v_noble;
private LinearLayout lt_noble;
private FrameLayout lt_noble;
// private LinearLayout btnUserNoble;
private ImageView user_noble_ico, good_nub_ico, img_lv_pic;
private TextView user_noble_text, user_noble_time, tv_setting;
@@ -164,7 +165,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
user_noble_text = (TextView) findViewById(R.id.user_noble_text);
img_setting = (ImageView) findViewById(R.id.img_setting);
v_noble = (View) findViewById(R.id.v_noble);
lt_noble = (LinearLayout) findViewById(R.id.lt_noble);
lt_noble = (FrameLayout) findViewById(R.id.lt_noble);
user_noble_time = (TextView) findViewById(R.id.user_noble_time);
banner_me = (Banner) findViewById(R.id.banner_me);
lt_advertisement = (LinearLayout) findViewById(R.id.lt_advertisement);
@@ -179,6 +180,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
findViewById(R.id.lt_noble).setOnClickListener(this);
findViewById(R.id.lt_name).setOnClickListener(this);
findViewById(R.id.signature).setOnClickListener(this);
findViewById(R.id.lt_guard).setOnClickListener(this);
btnCopy.setOnClickListener(new View.OnClickListener() {
@Override
@@ -310,8 +312,8 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
ImgLoader.displayAvatar(mContext, u.getAvatar(), mAvatar);
mName.setText(u.getUserNiceName());
if (!"0".endsWith(u.getNoble_id())) {
user_noble_text.setText(mContext.getResources().getString(R.string.now_noble) + u.getNoble_name());
user_noble_time.setText(mContext.getResources().getString(R.string.now_noble_time) + u.getNoble_end_time());
user_noble_text.setText(u.getNoble_name());
user_noble_time.setText(u.getNoble_end_time());
} else {
user_noble_text.setText(WordUtil.isNewZh() ? "貴族中心" : "VIP Center");
user_noble_time.setText(mContext.getResources().getString(R.string.open_noble_text));
@@ -355,7 +357,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
if (u.getDress().getMedal() != null) {
Log.e("tag", u.getDress().getMedal());
ImgLoader.display(mContext, u.getDress().getMedal(), user_noble_ico);
ImgLoader.displayWithError(mContext, u.getDress().getMedal(), user_noble_ico,R.mipmap.icon_vip_gold);
} else {
user_noble_ico.setImageResource(R.mipmap.icon_vip_gold);
}
@@ -547,6 +549,13 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
UserBean u = CommonAppConfig.getInstance().getUserBean();
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
ZhuangBanActivity.forward(mContext, url, false);
} else if (i == R.id.lt_guard) {
MobclickAgent.onEvent(mContext, "my_guard_btn", "我的-守护点击次数及人数");
Constants.isTitle = true;
UserBean u = CommonAppConfig.getInstance().getUserBean();
String url = CommonAppConfig.HOST + "/h5/Guard/index.html?token=" + CommonAppConfig.getInstance().getToken()
+ "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
ZhuangBanActivity.forward(mContext, url, false);
}

63
main/src/main/res/layout/item_main_home_follow.xml
View File

@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<com.yunbao.common.custom.MyRelativeLayout5
xmlns:android="http://schemas.android.com/apk/res/android"
<com.yunbao.common.custom.MyRelativeLayout5 xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="5dp"
>
android:layout_marginTop="5dp">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/cover"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
app:riv_corner_radius="5dp"
/>
app:riv_corner_radius="5dp" />
<com.yunbao.common.custom.RatioRoundImageView
android:layout_width="match_parent"
@@ -22,30 +20,28 @@
android:src="@mipmap/bg_main_item_bottom"
app:ri_ratio="0.5"
app:riv_corner_radius_bottom_left="5dp"
app:riv_corner_radius_bottom_right="5dp"
/>
app:riv_corner_radius_bottom_right="5dp" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="6dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="8dp"
android:layout_marginTop="6dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="6dp"
android:scaleType="centerCrop"
app:riv_oval="true"
/>
app:riv_oval="true" />
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignTop="@id/avatar"
android:layout_marginRight="10dp"
android:layout_alignParentRight="true"
android:layout_marginTop="7dp"
android:layout_marginRight="10dp"
android:drawablePadding="4dp"
android:gravity="center"
android:singleLine="true"
@@ -53,8 +49,7 @@
android:textSize="13sp"
app:dt_left_drawable="@mipmap/icon_main_live_num"
app:dt_left_height="14dp"
app:dt_left_width="14dp"
/>
app:dt_left_width="14dp" />
<TextView
@@ -62,15 +57,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignTop="@id/avatar"
android:layout_marginRight="10dp"
android:layout_marginTop="6dp"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@id/num"
android:layout_toRightOf="@id/avatar"
android:ellipsize="end"
android:singleLine="true"
android:textColor="#fff"
android:textSize="14sp"
/>
android:textSize="14sp" />
<TextView
android:id="@+id/title"
@@ -78,15 +72,14 @@
android:layout_height="wrap_content"
android:layout_above="@id/avatar"
android:layout_marginLeft="10dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:layout_marginRight="20dp"
android:ellipsize="end"
android:includeFontPadding="false"
android:maxLines="2"
android:textColor="#fff"
android:textSize="14sp"
android:textStyle="bold"
/>
android:textStyle="bold" />
<ImageView
android:id="@+id/type"
@@ -94,7 +87,29 @@
android:layout_height="16dp"
android:layout_above="@id/title"
android:layout_marginLeft="10dp"
android:scaleType="fitXY"
/>
android:scaleType="fitXY" />
<ImageView
android:id="@+id/dragon_money"
android:layout_width="25dp"
android:layout_height="30dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="25dp"
android:layout_marginTop="55dp"
android:visibility="gone"
app:srcCompat="@mipmap/icon_live_dragon_money"
tools:visibility="visible" />
<ImageView
android:id="@+id/red_packet"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="20dp"
android:layout_marginTop="25dp"
android:visibility="gone"
app:srcCompat="@mipmap/icon_red_packet"
tools:visibility="visible" />
</com.yunbao.common.custom.MyRelativeLayout5>

12
main/src/main/res/layout/item_main_home_lives.xml
View File

@@ -286,6 +286,18 @@
</com.xj.marqueeview.MarqueeView>
<ImageView
android:id="@+id/dragon_money"
android:layout_width="25dp"
android:layout_height="30dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="25dp"
android:layout_marginTop="55dp"
android:visibility="gone"
app:srcCompat="@mipmap/icon_live_dragon_money"
tools:visibility="visible" />
<ImageView
android:id="@+id/red_packet"
android:layout_width="30dp"

104
main/src/main/res/layout/view_main_home.xml
View File

@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/white"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
@@ -18,52 +19,73 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="37dp"
android:layout_marginTop="20dp"
app:layout_scrollFlags="scroll|enterAlways">
<ImageView
android:id="@+id/btn_search"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="45dp"
android:layout_marginBottom="2dp"
android:contentDescription="TODO"
android:onClick="mainClick"
android:padding="9dp"
android:src="@mipmap/icon_main_search" />
<ImageView
android:id="@+id/img_trophy"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="2dp"
android:contentDescription="TODO"
android:onClick="mainClick"
android:padding="6dp" />
<FrameLayout
<HorizontalScrollView
android:id="@+id/view_horizontal"
android:layout_toStartOf="@id/ijiasdw"
android:layout_width="match_parent"
android:layout_height="37dp"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:layout_toLeftOf="@id/btn_search">
android:layout_height="match_parent"
android:orientation="horizontal"
android:scrollbars="none">
<net.lucode.hackware.magicindicator.MagicIndicator
android:id="@+id/indicator"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:orientation="horizontal">
<net.lucode.hackware.magicindicator.MagicIndicator
android:id="@+id/indicator"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
</FrameLayout>
<TextView
android:id="@+id/tvPlay"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:paddingTop="1dp"
android:text="@string/main_type_theater"
android:textColor="#B1B1B1"
android:layout_marginBottom="3dp"
android:textSize="16dp"
android:textStyle="bold" />
</LinearLayout>
</HorizontalScrollView>
<LinearLayout
android:id="@+id/ijiasdw"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true">
<ImageView
android:id="@+id/btn_search"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="2dp"
android:contentDescription="TODO"
android:onClick="mainClick"
android:padding="9dp"
android:src="@mipmap/icon_main_search" />
<ImageView
android:id="@+id/img_trophy"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="2dp"
android:contentDescription="TODO"
android:onClick="mainClick"
android:padding="6dp" />
</LinearLayout>
</RelativeLayout>

194
main/src/main/res/layout/view_main_me.xml
View File

@@ -496,77 +496,151 @@
</LinearLayout>
<LinearLayout
android:id="@+id/lt_noble"
android:layout_width="match_parent"
android:layout_height="81dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="12dp"
android:layout_marginRight="15dp"
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center">
<ImageView
android:id="@+id/user_noble_ico"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginLeft="21dp"
android:src="@mipmap/icon_vip_gold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
<FrameLayout
android:id="@+id/lt_noble"
android:layout_width="0dp"
android:layout_height="81dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="12dp"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center|left"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/user_noble_text"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/textColor"
android:textSize="16sp"
android:textStyle="bold" />
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="14dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false">
<TextView
android:id="@+id/user_noble_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="@string/open_noble_text"
android:textColor="@color/gray1"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:id="@+id/user_noble_ico"
android:layout_width="48dp"
android:layout_height="45dp"
android:src="@mipmap/icon_vip_gold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
<TextView
android:id="@+id/user_noble_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text=""
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/user_noble_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/open_noble_text"
android:textColor="#000000"
android:textSize="12sp" />
</LinearLayout>
<View
android:id="@+id/v_noble"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginRight="30dp"
android:background="@mipmap/icon_more_gray"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:visibility="gone" />
</FrameLayout>
<View
android:id="@+id/v_noble"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginRight="30dp"
android:background="@mipmap/icon_more_gray"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false" />
android:layout_height="1dp" />
<FrameLayout
android:id="@+id/lt_guard"
android:layout_width="0dp"
android:layout_height="81dp"
android:layout_marginTop="12dp"
android:layout_marginRight="15dp"
android:layout_weight="1"
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="14dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false">
<ImageView
android:layout_width="48dp"
android:layout_height="45dp"
android:src="@mipmap/icon_guard_me" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/live_guard"
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/guard_for_your_beloved_one"
android:textColor="#000000"
android:textSize="12sp" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

BIN
main/src/main/res/mipmap-mdpi/icon_vip_gold.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 23 KiB