修改完善资料和礼物点击

调整排行榜神秘人隐藏关注按钮导致整体UI下降

Share/.gitignore

@@ -0,0 +1 @@
+/build

Share/build.gradle

@@ -0,0 +1,73 @@
+apply plugin: 'com.android.library'
+apply plugin: 'img-optimizer'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+
+android {
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    packagingOptions {
+        pickFirst "lib/armeabi/libyuvutils.so"
+        pickFirst "lib/arm64-v8a/libyuvutils.so"
+        pickFirst "lib/armeabi-v7a/libyuvutils.so"
+        pickFirst "lib/armeabi/libyuvtools.so"
+        pickFirst "lib/arm64-v8a/libyuvtools.so"
+        pickFirst "lib/armeabi-v7a/libyuvtools.so"
+        exclude "lib/arm64-v8a/libmmcv_api_handgesture.so"
+        exclude "lib/arm64-v8a/libmmcv_api_express.so"
+        exclude "lib/arm64-v8a/libMediaEncoder.so"
+        exclude "lib/arm64-v8a/libarcore_sdk_c.so"
+        exclude "lib/arm64-v8a/libmediadecoder.so"
+        exclude "lib/arm64-v8a/libMediaMuxer.so"
+        exclude "lib/arm64-v8a/libarcore_sdk_jni.so"
+        exclude "lib/arm64-v8a/libMediaUtils.so"
+        exclude "lib/arm64-v8a/libcosmosffmpeg.so"
+
+    }
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
+        manifestPlaceholders = rootProject.ext.manifestPlaceholders
+        ndk {
+            abiFilters "armeabi-v7a", "arm64-v8a"
+        }
+    }
+    aaptOptions {
+        cruncherEnabled = false
+        useNewCruncher = false
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+repositories {
+    flatDir {
+        dirs 'libs', '../libs'
+    }
+}
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation rootProject.ext.dependencies["appcompat-androidx"]
+    implementation rootProject.ext.dependencies["recyclerview-androidx"]
+    //common
+    implementation project(path: ':common')
+    //Twitter
+    implementation 'com.twitter.sdk.android:twitter:3.1.1'
+    //facebook & Messenger
+    implementation 'com.facebook.android:facebook-share:15.2.0'
+
+
+
+}

Share/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

Share/src/androidTest/java/com/yunbao/share/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.yunbao.share;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.yunbao.share.test", appContext.getPackageName());
+    }
+}

Share/src/main/AndroidManifest.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.pdlive.shayu">
+
+    <queries>
+        <package android:name="com.pdlive.shayu"/>
+        <package android:name="com.facebook.orca"/>
+
+        <package
+            android:name="com.facebook.composer" />
+
+        <package
+            android:name="com.facebook.katana" />
+        <package
+            android:name="com.facebook.messenger" />
+        <provider
+            android:authorities="com.facebook.katana.provider.PlatformProvider"
+            tools:ignore="ExportedContentProvider" />
+
+    </queries>
+    <application android:allowBackup="true">
+        <activity
+            android:name="com.facebook.FacebookActivity"
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" />
+
+        <provider
+            android:name="com.facebook.FacebookContentProvider"
+            android:authorities="com.facebook.app.FacebookContentProvider2011402032399020"
+            android:exported="true" />
+        <receiver
+            android:name="com.yunbao.share.receiver.TwitterResultReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.twitter.sdk.android.tweetcomposer.UPLOAD_SUCCESS" />
+                <action android:name="com.twitter.sdk.android.tweetcomposer.UPLOAD_FAILURE" />
+                <action android:name="com.twitter.sdk.android.tweetcomposer.TWEET_COMPOSE_CANCEL" />
+            </intent-filter>
+        </receiver>
+    </application>
+
+</manifest>

Share/src/main/java/com/yunbao/share/AbsShareInterface.java

@@ -0,0 +1,34 @@
+package com.yunbao.share;
+
+import android.content.Context;
+import android.content.IntentFilter;
+import android.net.Uri;
+
+import androidx.core.content.FileProvider;
+
+import com.twitter.sdk.android.tweetcomposer.TweetUploadService;
+import com.yunbao.share.bean.ShareBuilder;
+import com.yunbao.share.receiver.TwitterResultReceiver;
+
+import java.io.File;
+
+public abstract class AbsShareInterface {
+    protected final Context mContext;
+
+    public AbsShareInterface(Context context) {
+        this.mContext = context;
+        IntentFilter filter = new IntentFilter(TweetUploadService.UPLOAD_SUCCESS);
+        filter.addAction(TweetUploadService.UPLOAD_FAILURE);
+        filter.addAction(TweetUploadService.TWEET_COMPOSE_CANCEL);
+        context.registerReceiver(new TwitterResultReceiver(), filter);
+    }
+
+    public abstract void share(ShareBuilder builder, ICallback callback);
+
+    public Uri fileToUri(File file){
+        return  FileProvider.getUriForFile(mContext,
+                mContext.getPackageName() + ".fileprovider",
+                file
+        );
+    }
+}

Share/src/main/java/com/yunbao/share/ICallback.java

@@ -0,0 +1,6 @@
+package com.yunbao.share;
+
+public interface ICallback {
+    void onSuccess();
+    void onFailure();
+}

Share/src/main/java/com/yunbao/share/adapters/ShareAppAdapter.java

@@ -0,0 +1,130 @@
+package com.yunbao.share.adapters;
+
+import android.content.Context;
+import android.os.Environment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.pdlive.shayu.R;
+import com.yunbao.share.ICallback;
+import com.yunbao.share.bean.ShareBuilder;
+import com.yunbao.share.platform.FacebookShare;
+import com.yunbao.share.platform.Instagram;
+import com.yunbao.share.platform.Line;
+import com.yunbao.share.platform.MessengerShare;
+import com.yunbao.share.platform.TwitterShare;
+import com.yunbao.share.platform.WhatsApp;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShareAppAdapter extends RecyclerView.Adapter<ShareAppAdapter.AppViewHolder> {
+    private Context mContext;
+    private List<ShareBuilder> list;
+
+    public ShareAppAdapter(Context mContext) {
+        list = new ArrayList<>();
+        this.mContext = mContext;
+    }
+
+    public void setList(List<ShareBuilder> list) {
+        this.list = list;
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public AppViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new AppViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_share_app, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull AppViewHolder holder, int position) {
+        ShareBuilder builder = list.get(position);
+        switch (builder.getType()) {
+            case ShareBuilder.APP_FACEBOOK:
+                holder.setData(builder, R.mipmap.icon_share_facebook, R.string.dialog_share_app_facebook);
+                break;
+            case ShareBuilder.APP_LINE:
+                holder.setData(builder, R.mipmap.icon_share_line, R.string.dialog_share_app_line);
+                break;
+            case ShareBuilder.APP_TWITTER:
+                holder.setData(builder, R.mipmap.icon_share_twitter, R.string.dialog_share_app_twitter);
+                break;
+            case ShareBuilder.APP_WHATSAPP:
+                holder.setData(builder, R.mipmap.icon_share_whatsapp, R.string.dialog_share_app_whatsapp);
+                break;
+            case ShareBuilder.APP_MESSENGER:
+                holder.setData(builder, R.mipmap.icon_share_messenger, R.string.dialog_share_app_messenger);
+                break;
+            case ShareBuilder.APP_INSTAGRAM:
+                holder.setData(builder, R.mipmap.icon_share_instagram, R.string.dialog_share_app_instagram);
+                break;
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    public static class AppViewHolder extends RecyclerView.ViewHolder {
+        ImageView icon;
+        TextView title;
+
+        public AppViewHolder(@NonNull View itemView) {
+            super(itemView);
+            icon = itemView.findViewById(R.id.share_app_icon);
+            title = itemView.findViewById(R.id.share_app_name);
+        }
+
+        public void setData(ShareBuilder bean, @DrawableRes int iconId, @StringRes int appName) {
+            icon.setImageResource(iconId);
+            title.setText(appName);
+            itemView.setOnClickListener(v -> {
+                switch (bean.getType()) {
+                    case ShareBuilder.APP_FACEBOOK:
+                        new FacebookShare(itemView.getContext()).share(bean, new ShareCallback());
+                        break;
+                    case ShareBuilder.APP_LINE:
+                        new Line(itemView.getContext()).share(bean, new ShareCallback());
+                        break;
+                    case ShareBuilder.APP_TWITTER:
+                        new TwitterShare(itemView.getContext()).share(bean, new ShareCallback());
+                        break;
+                    case ShareBuilder.APP_WHATSAPP:
+                        new WhatsApp(itemView.getContext()).share(bean, new ShareCallback());
+                        break;
+                    case ShareBuilder.APP_MESSENGER:
+                        new MessengerShare(itemView.getContext()).share(bean, new ShareCallback());
+                        break;
+                    case ShareBuilder.APP_INSTAGRAM:
+                        new Instagram(itemView.getContext()).share(bean, new ShareCallback());
+                        break;
+                }
+            });
+        }
+
+        private static class ShareCallback implements ICallback {
+
+            @Override
+            public void onSuccess() {
+
+            }
+
+            @Override
+            public void onFailure() {
+
+            }
+        }
+    }
+}

Share/src/main/java/com/yunbao/share/bean/ShareBuilder.java

@@ -0,0 +1,140 @@
+package com.yunbao.share.bean;
+
+import androidx.annotation.NonNull;
+
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.CommonAppContext;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.StringUtil;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Locale;
+
+public class ShareBuilder {
+    public static final int APP_FACEBOOK = 0;
+    public static final int APP_LINE = 1;
+    public static final int APP_TWITTER = 2;
+    public static final int APP_WHATSAPP = 3;
+    public static final int APP_MESSENGER = 4;
+    public static final int APP_INSTAGRAM = 5;
+
+    private String text;
+    private String link;
+    private File file;
+    private int type;
+    private String uid;
+    private String anchorId;
+    private String anchorName;
+    private String anchorAvatar;
+
+    public static String createLiveShareLink(String shareUid, String anchorId, String anchorName, String anchorAvatar) {
+        try {
+            return String.format(CommonAppConfig.HOST +
+                            "/h5/activity/FriendInvitation/liveShare.html?user_id=%s&anchor_id=%s&anchor_name=%s&anchor_avatar=%s&isGoogle=%s",
+                    shareUid,
+                    anchorId,
+                    URLEncoder.encode(anchorName, "UTF-8"),
+                    URLEncoder.encode(anchorAvatar, "UTF-8"),
+                    CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0"
+            ) ;
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String createInviteLink(String shareUid) {
+        return String.format("https://www.pdlive.com/public/app/download/index.html?user_id=%s&isGoogle=%s",
+                shareUid,
+                CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0"
+        );
+    }
+
+    public static ShareBuilder builder(int type) {
+        return new ShareBuilder(type);
+    }
+
+    private ShareBuilder(int type) {
+        this.type = type;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getAnchorId() {
+        return anchorId;
+    }
+
+    public void setAnchorId(String anchorId) {
+        this.anchorId = anchorId;
+    }
+
+    public String getAnchorName() {
+        return anchorName;
+    }
+
+    public void setAnchorName(String anchorName) {
+        this.anchorName = anchorName;
+    }
+
+    public String getAnchorAvatar() {
+        return anchorAvatar;
+    }
+
+    public void setAnchorAvatar(String anchorAvatar) {
+        this.anchorAvatar = anchorAvatar;
+    }
+
+    public ShareBuilder setText(String text) {
+        this.text = text;
+        return this;
+    }
+
+    public ShareBuilder setLink(String link) {
+        this.link = link;
+        return this;
+    }
+
+    public ShareBuilder setFile(File file) {
+        this.file = file;
+        return this;
+    }
+
+    public String getText() {
+        if (StringUtil.isEmpty(text)) {
+            return getLink();
+        }
+        return text + "\n" + getLink();
+    }
+
+    public String getLink() {
+        if (StringUtil.isEmpty(link)) {
+            link = createLiveShareLink(uid, anchorId, anchorName, anchorAvatar);
+        }
+        return link;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "ShareBuilder{" +
+                "text='" + text + '\'' +
+                ", link='" + link + '\'' +
+                ", file=" + file +
+                '}';
+    }
+}

Share/src/main/java/com/yunbao/share/platform/FacebookShare.java

@@ -0,0 +1,48 @@
+package com.yunbao.share.platform;
+
+import android.app.Activity;
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.CallbackManager;
+import com.facebook.FacebookCallback;
+import com.facebook.FacebookException;
+import com.facebook.share.Sharer;
+import com.facebook.share.model.ShareLinkContent;
+import com.facebook.share.widget.ShareDialog;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.share.AbsShareInterface;
+import com.yunbao.share.ICallback;
+import com.yunbao.share.bean.ShareBuilder;
+
+public class FacebookShare extends AbsShareInterface {
+    public static CallbackManager callbackManager;
+    public FacebookShare(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void share(ShareBuilder builder, ICallback callback) {
+        callbackManager= CallbackManager.Factory.create();
+        ShareLinkContent content = new ShareLinkContent.Builder()
+                .setContentUrl(Uri.parse(builder.getLink()))
+                .build();
+        ShareDialog dialog=new ShareDialog((Activity) mContext);
+        dialog.registerCallback(callbackManager, new FacebookCallback<Sharer.Result>() {
+            @Override
+            public void onSuccess(Sharer.Result result) {
+            }
+
+            @Override
+            public void onCancel() {
+            }
+
+            @Override
+            public void onError(@NonNull FacebookException e) {
+            }
+        });
+        dialog.show(content);
+    }
+}

Share/src/main/java/com/yunbao/share/platform/Instagram.java

@@ -0,0 +1,27 @@
+package com.yunbao.share.platform;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import com.yunbao.share.AbsShareInterface;
+import com.yunbao.share.ICallback;
+import com.yunbao.share.bean.ShareBuilder;
+
+public class Instagram extends AbsShareInterface {
+    public Instagram(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void share(ShareBuilder builder, ICallback callback) {
+        String type = "image/*";
+        Intent share = new Intent(Intent.ACTION_SEND);
+        Uri uri = fileToUri(builder.getFile());
+        share.setType(type);
+        share.putExtra(Intent.EXTRA_STREAM, uri);
+        share.setPackage("com.instagram.android");
+        mContext.startActivity(Intent.createChooser(share, "Share to"));
+        callback.onSuccess();
+    }
+}

Share/src/main/java/com/yunbao/share/platform/Line.java

@@ -0,0 +1,31 @@
+package com.yunbao.share.platform;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import com.yunbao.share.AbsShareInterface;
+import com.yunbao.share.ICallback;
+import com.yunbao.share.bean.ShareBuilder;
+
+import java.net.URLEncoder;
+
+public class Line extends AbsShareInterface {
+
+    public Line(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void share(ShareBuilder builder, ICallback callback) {
+        try {
+            Intent share = new Intent(Intent.ACTION_VIEW, Uri.parse("https://line.me/R/share?text=" + URLEncoder.encode(builder.getText(), "UTF-8")));
+            mContext.startActivity(share);
+            callback.onSuccess();
+        } catch (Exception e) {
+            callback.onFailure();
+            throw new RuntimeException(e);
+        }
+    }
+
+}

Share/src/main/java/com/yunbao/share/platform/MessengerShare.java

@@ -0,0 +1,57 @@
+package com.yunbao.share.platform;
+
+import android.app.Activity;
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.CallbackManager;
+import com.facebook.FacebookCallback;
+import com.facebook.FacebookException;
+import com.facebook.FacebookSdk;
+import com.facebook.share.Sharer;
+import com.facebook.share.model.ShareLinkContent;
+import com.facebook.share.widget.MessageDialog;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.share.AbsShareInterface;
+import com.yunbao.share.ICallback;
+import com.yunbao.share.bean.ShareBuilder;
+
+public class MessengerShare extends AbsShareInterface {
+    public static CallbackManager callbackManager;
+
+    public MessengerShare(Context context) {
+        super(context);
+        FacebookSdk.setIsDebugEnabled(true);
+    }
+
+    @Override
+    public void share(ShareBuilder builder, ICallback callback) {
+        callbackManager = CallbackManager.Factory.create();
+        ShareLinkContent content = new ShareLinkContent.Builder()
+                .setContentUrl(Uri.parse(builder.getLink()))
+                .build();
+        MessageDialog dialog = new MessageDialog((Activity) mContext);
+        dialog.registerCallback(callbackManager, new FacebookCallback<Sharer.Result>() {
+            @Override
+            public void onSuccess(Sharer.Result result) {
+                callback.onSuccess();
+            }
+
+            @Override
+            public void onCancel() {
+            }
+
+            @Override
+            public void onError(@NonNull FacebookException e) {
+                e.printStackTrace();
+            }
+        });
+        if(dialog.canShow(content)) {
+            dialog.show(content);
+        }else{
+            callback.onFailure();
+        }
+    }
+}

Share/src/main/java/com/yunbao/share/platform/TwitterShare.java

@@ -0,0 +1,73 @@
+package com.yunbao.share.platform;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import com.twitter.sdk.android.core.Twitter;
+import com.yunbao.share.AbsShareInterface;
+import com.yunbao.share.ICallback;
+import com.yunbao.share.bean.ShareBuilder;
+
+import java.net.URLEncoder;
+
+public class TwitterShare extends AbsShareInterface {
+    public TwitterShare(Context context) {
+        super(context);
+        Twitter.initialize(context);
+
+    }
+
+    @Override
+    public void share(ShareBuilder date, ICallback callback) {
+
+/*
+        new TwitterAuthClient().authorize((Activity) mContext, new Callback<TwitterSession>() {
+            @Override
+            public void success(Result<TwitterSession> result) {
+                //获取以下登录成功返回信息进行登录验证
+
+                //获取登录用户信息
+                final TwitterSession activeSession=TwitterCore.getInstance().getSessionManager().getActiveSession();
+                Intent intent = new ComposerActivity.Builder(mContext)
+                        .session(activeSession)
+                        .image(fileToUri(date.getFile()))
+                        .text(date.getText())
+                        .hashtags("#twitter")
+                        .createIntent();
+                mContext.startActivity(intent);
+
+            }
+            @Override
+            public void failure(TwitterException e) {
+            }
+        });*/
+       /* TweetComposer.Builder builder;
+        if (date.getFile() == null) {
+            try {
+                builder=new TweetComposer.Builder(mContext)
+                        .text(date.getText())
+                        .url(new URL(date.getLink()));
+            } catch (MalformedURLException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            builder = new TweetComposer.Builder(mContext)
+                    .text(date.getText())
+                    .image(fileToUri(date.getFile()));
+        }
+        builder.show();*/
+        try {
+            Intent sendIntent = new Intent();
+            sendIntent.setAction(Intent.ACTION_VIEW);
+            sendIntent.putExtra(Intent.EXTRA_TEXT, date.getText());
+          //  sendIntent.setType("text/plain");
+            //sendIntent.setPackage("com.twitter.composer.ComposerShareActivity");
+            sendIntent.setData(Uri.parse("https://twitter.com/intent/tweet?text=" +URLEncoder.encode(date.getText(),"UTF-8")));
+            mContext.startActivity(sendIntent);
+            callback.onSuccess();
+        } catch (Exception e) {
+            callback.onFailure();
+        }
+    }
+}

Share/src/main/java/com/yunbao/share/platform/WhatsApp.java

@@ -0,0 +1,30 @@
+package com.yunbao.share.platform;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.yunbao.share.AbsShareInterface;
+import com.yunbao.share.ICallback;
+import com.yunbao.share.bean.ShareBuilder;
+
+public class WhatsApp extends AbsShareInterface {
+    public WhatsApp(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void share(ShareBuilder builder, ICallback callback) {
+        try {
+            Intent sendIntent = new Intent();
+            sendIntent.setAction(Intent.ACTION_SEND);
+            sendIntent.putExtra(Intent.EXTRA_TEXT, builder.getText());
+            sendIntent.setType("text/plain");
+            sendIntent.setPackage("com.whatsapp");
+            mContext.startActivity(sendIntent);
+            callback.onSuccess();
+        } catch (Exception e) {
+            callback.onFailure();
+        }
+
+    }
+}

Share/src/main/java/com/yunbao/share/receiver/TwitterResultReceiver.java

@@ -0,0 +1,28 @@
+package com.yunbao.share.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+import com.twitter.sdk.android.tweetcomposer.TweetUploadService;
+import com.yunbao.common.utils.ToastUtil;
+
+public class TwitterResultReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.i("分享log", "onReceive: "+intent.getAction());
+        if (TweetUploadService.UPLOAD_SUCCESS.equals(intent.getAction())) {
+            ToastUtil.show("推特分享成功");
+            // success
+            final Long tweetId = intent.getExtras().getLong(TweetUploadService.EXTRA_TWEET_ID);
+        } else if (TweetUploadService.UPLOAD_FAILURE.equals(intent.getAction())) {
+            // failure
+            ToastUtil.show("推特分享失败");
+            final Intent retryIntent = intent.getExtras().getParcelable(TweetUploadService.EXTRA_RETRY_INTENT);
+        } else if (TweetUploadService.TWEET_COMPOSE_CANCEL.equals(intent.getAction())) {
+            // cancel
+            ToastUtil.show("推特分享取消");
+        }
+    }
+}

Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java

@@ -0,0 +1,158 @@
+package com.yunbao.share.ui;
+
+import static android.content.Context.CLIPBOARD_SERVICE;
+
+import android.app.Dialog;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.LinearGradient;
+import android.graphics.Shader;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.lxj.xpopup.XPopup;
+import com.makeramen.roundedimageview.RoundedImageView;
+import com.pdlive.shayu.R;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.dialog.AbsDialogPopupWindow;
+import com.yunbao.common.utils.DialogUitl;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
+import com.yunbao.share.bean.ShareBuilder;
+import com.yunbao.share.adapters.ShareAppAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InvitePopDialog extends AbsDialogPopupWindow {
+    private ShareAppAdapter adapter;
+    private RecyclerView list;
+    private RoundedImageView avatar;
+    private TextView info;
+    private TextView link;
+    private TextView title;
+    private List<ShareBuilder> data;
+
+    private String uid;
+    private String anchorId;
+    private String anchorName;
+    private String anchorAvatar;
+    private String url;
+
+    public InvitePopDialog(@NonNull Context context) {
+        super(context);
+    }
+
+    public InvitePopDialog setUid(String uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public InvitePopDialog setAnchorId(String anchorId) {
+        this.anchorId = anchorId;
+        return this;
+    }
+
+    public InvitePopDialog setAnchorName(String anchorName) {
+        this.anchorName = anchorName;
+        return this;
+    }
+
+    public InvitePopDialog setAnchorAvatar(String anchorAvatar) {
+        this.anchorAvatar = anchorAvatar;
+        return this;
+    }
+
+    @Override
+    public void buildDialog(XPopup.Builder builder) {
+
+    }
+
+    @Override
+    public int bindLayoutId() {
+        return R.layout.dialog_share;
+    }
+
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        findViewById(R.id.close).setOnClickListener(v -> dismiss());
+        ((ImageView) findViewById(R.id.close)).setImageResource(R.mipmap.icon_invite_close);
+        findViewById(R.id.share_copy).setOnClickListener(v -> copyLink());
+        // findViewById(R.id.share_preview).setVisibility(GONE);
+        findViewById(R.id.share_dialog).setBackgroundResource(R.mipmap.bg_dialog_inviet);
+        title = findViewById(R.id.share_title);
+        list = findViewById(R.id.share_apps_list);
+        avatar = findViewById(R.id.share_avatar);
+        info = findViewById(R.id.share_info);
+        link = findViewById(R.id.share_link);
+        adapter = new ShareAppAdapter(getContext());
+        list.setLayoutManager(new GridLayoutManager(getContext(), 3));
+        list.setAdapter(adapter);
+        initData();
+        link.setText(url.substring(0, 40));
+        info.setText(R.string.dialog_invite_info);
+        avatar.setImageResource(R.mipmap.ic_launcher);
+        //title.setTextColor(getContext().getResources().getColorStateList(R.drawable.bg_invite_title));
+        title.setText(R.string.dialog_invite_title);
+        title.getViewTreeObserver().addOnGlobalLayoutListener(this::setTitleColor);
+    }
+
+    private void setTitleColor() {
+        int[] colors = {
+                Color.parseColor("#3377FF"),
+                Color.parseColor("#7F66FF"),
+        };
+        float[] position = {
+                0f,
+                1.0f
+        };
+        float height = title.getMeasuredHeight();
+        LinearGradient mLinearGradient = new LinearGradient(0, 0, 0, height, colors, position, Shader.TileMode.CLAMP);
+        title.getPaint().setShader(mLinearGradient);
+        title.invalidate();
+    }
+
+    private void initData() {
+        data = new ArrayList<>();
+        data.add(builder(ShareBuilder.APP_FACEBOOK));
+        data.add(builder(ShareBuilder.APP_LINE));
+        data.add(builder(ShareBuilder.APP_TWITTER));
+        data.add(builder(ShareBuilder.APP_WHATSAPP));
+        data.add(builder(ShareBuilder.APP_MESSENGER));
+        // data.add(builder(ShareBuilder.APP_INSTAGRAM));
+        adapter.setList(data);
+
+    }
+
+    private ShareBuilder builder(int type) {
+        ShareBuilder builder = ShareBuilder.builder(type);
+        builder.setText(getContext().getString(R.string.dialog_invite_info));
+        builder.setLink(url);
+        builder.setUid(uid);
+        builder.setAnchorId(anchorId);
+        builder.setAnchorName(anchorName);
+        builder.setAnchorAvatar(anchorAvatar);
+        return builder;
+    }
+
+    private void copyLink() {
+        ClipboardManager cm = (ClipboardManager) getContext().getSystemService(CLIPBOARD_SERVICE);
+        ClipData clipData = ClipData.newPlainText("text", info.getText() + "\n" + url);
+        cm.setPrimaryClip(clipData);
+        ToastUtil.show(getContext().getString(com.yunbao.common.R.string.copy_success));
+    }
+
+    public InvitePopDialog setUrl(String data) {
+        this.url = data + "&isGoogle=" + (CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0");
+        return this;
+    }
+}

Share/src/main/java/com/yunbao/share/ui/SharePopDialog.java

@@ -0,0 +1,146 @@
+package com.yunbao.share.ui;
+
+import static android.content.Context.CLIPBOARD_SERVICE;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.lxj.xpopup.XPopup;
+import com.makeramen.roundedimageview.RoundedImageView;
+import com.pdlive.shayu.R;
+import com.yunbao.common.dialog.AbsDialogPopupWindow;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
+import com.yunbao.share.bean.ShareBuilder;
+import com.yunbao.share.adapters.ShareAppAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SharePopDialog extends AbsDialogPopupWindow {
+    private ShareAppAdapter adapter;
+    private RecyclerView list;
+    private RoundedImageView avatar;
+    private TextView info;
+    private TextView link;
+    private List<ShareBuilder> data;
+
+    private String uid;
+    private String anchorId;
+    private String anchorName;
+    private String anchorAvatar;
+    private String shareLink;
+
+    public SharePopDialog(@NonNull Context context) {
+        super(context);
+    }
+
+    public SharePopDialog setUid(String uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public SharePopDialog setAnchorId(String anchorId) {
+        this.anchorId = anchorId;
+        return this;
+    }
+
+    public SharePopDialog setAnchorName(String anchorName) {
+        this.anchorName = anchorName;
+        return this;
+    }
+
+    public SharePopDialog setAnchorAvatar(String anchorAvatar) {
+        this.anchorAvatar = anchorAvatar;
+        return this;
+    }
+
+    public SharePopDialog setShareLink(String link) {
+        this.shareLink = link;
+        return this;
+    }
+
+    @Override
+    public void buildDialog(XPopup.Builder builder) {
+
+    }
+
+    @Override
+    public int bindLayoutId() {
+        return R.layout.dialog_share;
+    }
+
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        findViewById(R.id.close).setOnClickListener(v -> dismiss());
+        findViewById(R.id.share_copy).setOnClickListener(v -> copyLink());
+        list = findViewById(R.id.share_apps_list);
+        avatar = findViewById(R.id.share_avatar);
+        info = findViewById(R.id.share_info);
+        link = findViewById(R.id.share_link);
+        adapter = new ShareAppAdapter(getContext());
+        list.setLayoutManager(new GridLayoutManager(getContext(), 3));
+        list.setAdapter(adapter);
+        initData();
+    }
+
+    private void initData() {
+        data = new ArrayList<>();
+        data.add(builder(ShareBuilder.APP_FACEBOOK));
+        data.add(builder(ShareBuilder.APP_LINE));
+        data.add(builder(ShareBuilder.APP_TWITTER));
+        data.add(builder(ShareBuilder.APP_WHATSAPP));
+        data.add(builder(ShareBuilder.APP_MESSENGER));
+        //data.add(builder(ShareBuilder.APP_INSTAGRAM));
+        adapter.setList(data);
+        String url;
+        if (shareLink == null) {
+            url = ShareBuilder.createLiveShareLink(uid, anchorId, anchorName, anchorAvatar).substring(0, 40) + "...";
+        } else {
+            if (shareLink.length() > 40) {
+                url = shareLink.substring(0, 40) + "...";
+            } else {
+                url = shareLink;
+            }
+        }
+        link.setText(url);
+        info.setText(String.format(getContext().getString(R.string.dialog_share_info), StringUtil.isEmpty(anchorName) ? "" : anchorName));
+        ImgLoader.display(getContext(), anchorAvatar, avatar);
+    }
+
+    private ShareBuilder builder(int type) {
+        ShareBuilder builder = ShareBuilder.builder(type);
+        builder.setText(String.format(getContext().getString(R.string.dialog_share_info), StringUtil.isEmpty(anchorName) ? "" : anchorName));
+        builder.setUid(uid);
+        builder.setAnchorId(anchorId);
+        builder.setAnchorName(anchorName);
+        builder.setAnchorAvatar(anchorAvatar);
+        if (shareLink != null) {
+            builder.setLink(shareLink);
+        }
+        return builder;
+    }
+
+    private void copyLink() {
+        String url;
+        if (shareLink != null) {
+            url = shareLink;
+        } else {
+            url = ShareBuilder.createLiveShareLink(uid, anchorId, anchorName, anchorAvatar);
+        }
+        ClipboardManager cm = (ClipboardManager) getContext().getSystemService(CLIPBOARD_SERVICE);
+        ClipData clipData = ClipData.newPlainText("text",info.getText().toString()+"\n"+url);
+        cm.setPrimaryClip(clipData);
+        ToastUtil.show(getContext().getString(com.yunbao.common.R.string.copy_success));
+    }
+}

Share/src/main/res/drawable/bg_btn.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="189dp" android:height="42dp">
+        <shape android:shape="rectangle">
+            <gradient android:type="linear" android:useLevel="true" android:startColor="#ffffc621" android:endColor="#ffffae05" android:angle="135" />
+            <corners android:radius="21dp" />
+        </shape>
+    </item>
+</selector>

Share/src/main/res/drawable/bg_invite_title.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="112dp" android:height="42dp">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#ffffffff" />
+            <gradient android:type="linear" android:useLevel="true" android:startColor="#3377FF" android:endColor="#7F66FF" android:angle="90" />
+            <corners android:topLeftRadius="22dp" android:topRightRadius="22dp" android:bottomLeftRadius="22dp" android:bottomRightRadius="22dp" />
+        </shape>
+    </item>
+</selector>

Share/src/main/res/drawable/bg_preview.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="15dp" />
+            <solid android:color="#ffffff" />
+            <stroke
+                android:width="1dp"
+                android:color="#EBEBEB" />
+        </shape>
+    </item>
+</selector>

Share/src/main/res/layout/dialog_invite_list.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/share_dialog"
+    android:layout_height="wrap_content"
+    android:background="@mipmap/bg_dialog_share">
+
+    <LinearLayout
+        android:id="@+id/linearLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/share_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_weight="1"
+            android:text="@string/dialog_invite_title"
+            android:textColor="@drawable/bg_invite_title"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/close"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginEnd="16dp"
+            app:srcCompat="@mipmap/icon_dialog_charge_close" />
+
+    </LinearLayout>
+
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/share_apps_list"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+        tools:itemCount="6"
+        tools:layoutManager="GridLayoutManager"
+        tools:listitem="@layout/item_share_app"
+        tools:spanCount="3" />
+</androidx.constraintlayout.widget.ConstraintLayout>

Share/src/main/res/layout/dialog_share.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/share_dialog"
+    android:layout_height="wrap_content"
+    android:background="@mipmap/bg_dialog_share">
+
+    <LinearLayout
+        android:id="@+id/linearLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="16dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/share_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_weight="1"
+            android:text="@string/dialog_share_title"
+            android:textColor="#333333"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/close"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginEnd="16dp"
+            app:srcCompat="@mipmap/icon_share_close" />
+
+    </LinearLayout>
+
+    <include
+        android:id="@+id/share_preview"
+        layout="@layout/view_share_preview"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/share_apps_list"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/share_preview"
+        tools:itemCount="6"
+        tools:layoutManager="GridLayoutManager"
+        tools:listitem="@layout/item_share_app"
+        tools:spanCount="3" />
+</androidx.constraintlayout.widget.ConstraintLayout>

Share/src/main/res/layout/item_share_app.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/linearLayout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/share_app_icon"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_marginStart="35dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="35dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/share_app_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="12dp"
+        android:text="TextView"
+        android:textColor="#666666"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/share_app_icon" />
+</androidx.constraintlayout.widget.ConstraintLayout>

Share/src/main/res/layout/view_share_preview.xml

@@ -0,0 +1,75 @@
+<?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="wrap_content"
+    android:background="@drawable/bg_preview"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="2dp"
+        android:orientation="horizontal">
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/share_avatar"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/m_chu_xia"
+            app:riv_oval="true" />
+
+        <TextView
+            android:id="@+id/share_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_weight="1"
+            android:text="@string/dialog_share_info"
+            android:textColor="#333333"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/share_copy"
+            android:layout_width="70dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center"
+            android:layout_marginEnd="16dp"
+
+            android:background="@drawable/bg_btn"
+            android:gravity="center"
+            android:layout_marginStart="25dp"
+            android:text="@string/dialog_share_copy"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/share_layout_link"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="12dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:src="@mipmap/icon_share_url" />
+
+        <TextView
+            android:id="@+id/share_link"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="TextView"
+            android:textColor="#999999"
+            android:textSize="12sp" />
+    </LinearLayout>
+</LinearLayout>

Share/src/main/res/values-en/strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="dialog_share_title">Share</string>
+    <string name="dialog_share_info">Come and watch %s live on PDLIVE and meet more interesting people!</string>
+    <string name="dialog_invite_title">Invite Friends</string>
+    <string name="dialog_invite_info">Come to PDLIVE to discover more and better live streams.</string>
+    <string name="dialog_share_copy">Copy</string>
+</resources>

Share/src/main/res/values/strings.xml

@@ -0,0 +1,17 @@
+<resources>
+    <string name="com.twitter.sdk.android.CONSUMER_KEY" translatable="false">ZWRrZnRUNlBlcHVxMXpsMzVmb2k6MTpjaQ</string>
+    <string name="com.twitter.sdk.android.CONSUMER_SECRET" translatable="false">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
+
+    <string name="dialog_share_title">分享</string>
+    <string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
+    <string name="dialog_share_app_facebook" translatable="false">Facebook</string>
+    <string name="dialog_share_app_line" translatable="false">Line</string>
+    <string name="dialog_share_app_twitter" translatable="false">Twitter</string>
+    <string name="dialog_share_app_whatsapp" translatable="false">WhatsApp</string>
+    <string name="dialog_share_app_messenger" translatable="false">Messenger</string>
+    <string name="dialog_share_app_instagram" translatable="false">Instagram</string>
+
+    <string name="dialog_invite_title">邀請好友</string>
+    <string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
+    <string name="dialog_share_copy">複製</string>
+</resources>

Share/src/test/java/com/yunbao/share/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.yunbao.share;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}

app/src/main/AndroidManifest.xml

@@ -6,6 +6,8 @@
     <uses-permission
         android:name="android.permission.CALL_PHONE"
         tools:node="remove" />
+    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission
         android:name="android.permission.READ_LOGS"
         tools:ignore="ProtectedPermissions"
@@ -84,6 +86,7 @@
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
     <queries>
         <package android:name="com.twitter.android"/>
+        <package android:name="jp.naver.line.android"/>
 
     </queries>
     <application
@@ -92,6 +95,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:supportsRtl="true"
         android:preserveLegacyExternalStorage="true"
         android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme"

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -13,6 +13,7 @@ import android.os.Looper;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
+import android.os.Process;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -39,8 +40,10 @@ import com.yunbao.common.manager.imrongcloud.InstructorSendRewardProvider;
 import com.yunbao.common.manager.imrongcloud.MessageIMManager;
 import com.yunbao.common.manager.imrongcloud.RecommendLiveRoom;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
+import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.socket.SocketRyClient;
 import com.yunbao.live.utils.LiveImDeletUtil;
 import com.yunbao.live.views.PortraitLiveManager;
@@ -77,6 +80,7 @@ public class AppContext extends CommonAppContext {
     public LiveImDeletUtil liveImDeletUtil;
     private final static List<WeakReference<Activity>> activities = new ArrayList<>();
 
+
     private static final class AdjustLifecycleCallbacks implements ActivityLifecycleCallbacks {
         @Override
         public void onActivityResumed(Activity activity) {
@@ -104,12 +108,14 @@ public class AppContext extends CommonAppContext {
                     return;
                 }
             }
+            AppManager.getInstance().removeActivity(activity);
         }
 
         @Override
         public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
             activities.add(new WeakReference<>(activity));
             CrashSaveBean.getInstance().setActivitySize(activities);
+            AppManager.getInstance().addActivity(activity);
         }
 
         @Override
@@ -125,6 +131,12 @@ public class AppContext extends CommonAppContext {
         if (!isMainProcess()) {
             return;
         }
+        AppManager.runDebugCode(new Runnable() {
+            @Override
+            public void run() {
+                ToastUtil.show("Debug代码");
+            }
+        });
         CrashSaveBean.getInstance().setStartTime(System.currentTimeMillis());
         //注册全局异常捕获
         registerError();
@@ -277,18 +289,21 @@ public class AppContext extends CommonAppContext {
                 .setMainCrashHandler((t, e) -> {
                     Log.e("ApplicationError", "主线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息
                     e.printStackTrace();
-                    //闪退后finish所有Activity并且杀死进程
-                   /* for (WeakReference<Activity> activity : activities) {
-                        if (activity != null && activity.get() != null) {
-                            activity.get().finish();
+                    AppManager.runDebugCode(()->{
+                        //闪退后finish所有Activity并且杀死进程
+                        for (WeakReference<Activity> activity : activities) {
+                            if (activity != null && activity.get() != null) {
+                                activity.get().finish();
+                            }
                         }
-                    }
-                   *//* Process.killProcess(Process.myPid());
-                    System.exit(0);*//*
-                    setFirebaseCrashData();
-                    new Handler(Looper.getMainLooper()).postDelayed(() -> {
-                        throw new RuntimeException(e);
-                    }, 100);*/
+                        Process.killProcess(Process.myPid());
+                        System.exit(0);
+                        setFirebaseCrashData();
+                        new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                            throw new RuntimeException(e);
+                        }, 100);
+                    });
+
                 })
                 .setUncaughtCrashHandler((t, e) -> {
                     Log.e("ApplicationError", "子线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息

app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java

@@ -8,7 +8,9 @@ import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.yunbao.common.BuildConfig;
 import com.yunbao.common.bean.CrashSaveBean;
+import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.FileUtil;
 import com.yunbao.common.utils.SpUtil;
 
@@ -90,10 +92,12 @@ public class NeverCrashUtils {
      *
      * @param application application
      */
+    private boolean errorWhile = true;
+
     public void register(Application application) {
         //主线程异常拦截
         new Handler(Looper.getMainLooper()).post(() -> {
-            while (true) {
+            while (errorWhile) {
                 try {
                     Looper.loop();
                 } catch (Throwable e) {
@@ -101,10 +105,12 @@ public class NeverCrashUtils {
                         Log.e(TAG, "未捕获的主线程异常行为", e);
                     }
                     e.printStackTrace();
-                    //Toast.makeText(application, "发生闪退:"+e.getMessage(), Toast.LENGTH_SHORT).show();
+
+                    AppManager.runDebugCode(() -> Toast.makeText(application, "发生闪退:" + e.getMessage(), Toast.LENGTH_SHORT).show());
                     FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()), throwableToString(e), "error.log");
                     getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e);
-               //     return;
+                    AppManager.runDebugCode(() -> errorWhile = false);
+                    //     return;
                 }
             }
         });
@@ -139,11 +145,11 @@ public class NeverCrashUtils {
         writer.write("PhoneName=" + Build.BRAND + "\n");
         writer.write("Phone=" + Build.MODEL + "\n");
         writer.write("CPU=" + Arrays.toString(Build.SUPPORTED_ABIS) + "\n");
-        writer.write("runTime=" + (System.currentTimeMillis() - CrashSaveBean.getInstance().getStartTime())+ "\n");
-        writer.write("enterRoom=" + CrashSaveBean.getInstance().getEnterRoom()+ "\n");
-        writer.write("slidingRoom=" + CrashSaveBean.getInstance().getSlidingRoom()+ "\n");
-        writer.write("playSvga=" + CrashSaveBean.getInstance().getPlaySvga()+ "\n");
-        writer.write("ActivitySize=" + CrashSaveBean.getInstance().getActivitySize()+ "\n");
+        writer.write("runTime=" + (System.currentTimeMillis() - CrashSaveBean.getInstance().getStartTime()) + "\n");
+        writer.write("enterRoom=" + CrashSaveBean.getInstance().getEnterRoom() + "\n");
+        writer.write("slidingRoom=" + CrashSaveBean.getInstance().getSlidingRoom() + "\n");
+        writer.write("playSvga=" + CrashSaveBean.getInstance().getPlaySvga() + "\n");
+        writer.write("ActivitySize=" + CrashSaveBean.getInstance().getActivitySize() + "\n");
         writer.write("UserData=" + SpUtil.getInstance().getStringValue(SpUtil.USER_INFO) + "\n");
         writer.write("[ERROR]");
         PrintWriter printWriter = new PrintWriter(writer);

app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java

@@ -1,8 +1,11 @@
 package com.shayu.phonelive.activity;
 
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -19,6 +22,8 @@ import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.app.NotificationManagerCompat;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -45,6 +50,7 @@ import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DownloadUtil;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.LogUtil;
 import com.yunbao.common.utils.MD5Util;
@@ -98,8 +104,18 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
     private int mVideoLastProgress;
     private boolean mForward;
 
+    @Override
+    public Resources getResources() {
+        Resources res = super.getResources();
+        Configuration config = new Configuration();
+        config.setToDefaults();
+        config.locale = IMLoginManager.get(this).getLocaleLanguage();
+        res.updateConfiguration(config, res.getDisplayMetrics());
+        return res;
+    }
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
         super.onCreate(savedInstanceState);
         EventBus.getDefault().register(this);
         setStatusBar();
@@ -184,6 +200,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     String adInfo = bean.getAdInfo();
                     if (!TextUtils.isEmpty(adInfo)) {
                         JSONObject obj = JSON.parseObject(adInfo);
+                        Log.i(TAG, "callback: " + adInfo);
                         if (obj.getIntValue("switch") == 1) {
                             List<AdBean> list = JSON.parseArray(obj.getString("list"), AdBean.class);
                             if (list != null && list.size() > 0) {
@@ -268,8 +285,19 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
         if (getIntent().getStringExtra("activityUrl") != null) {
             intent.putExtra("activityUrl", getIntent().getStringExtra("activityUrl"));
         }
-
-        LauncherActivity.this.startActivity(intent);
+        if (mImageViewList != null && mImageViewList.size() > 0) {
+            Log.i(TAG, "forwardMainActivity: " + mImageViewList.size());
+            AdBean bean = mAdList.get(0);
+            if (bean != null && bean.getAnimation() == 1) {
+                intent.putExtra("ad_url", mAdList.get(0).getUrl());
+                Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(LauncherActivity.this, mImageViewList.get(0), "ad_img_0").toBundle();
+                LauncherActivity.this.startActivity(intent, bundle);
+            } else {
+                LauncherActivity.this.startActivity(intent);
+            }
+        } else {
+            LauncherActivity.this.startActivity(intent);
+        }
         finish();
     }
 
@@ -378,6 +406,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     imageView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
                     imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
                     imageView.setBackgroundColor(0xffffffff);
+                    imageView.setTransitionName("ad_img_" + i);
                     mImageViewList.add(imageView);
                     ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView);
                 }
@@ -511,7 +540,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     }
                 } else if (e == TXLiveConstants.PLAY_ERR_NET_DISCONNECT ||
                         e == TXLiveConstants.PLAY_ERR_FILE_NOT_FOUND) {
-                    ToastUtil.show(WordUtil.getString(R.string.live_play_error));
+                    ToastUtil.show(mContext.getString(R.string.live_play_error));
                     checkUidAndToken();
                 } else if (e == TXLiveConstants.PLAY_EVT_PLAY_PROGRESS) {
                     int progress = bundle.getInt("EVT_PLAY_PROGRESS_MS");

beauty/src/main/java/com/yunbao/beauty/adapter/TieZhiAdapter.java

@@ -86,7 +86,7 @@ public class TieZhiAdapter extends RecyclerView.Adapter<TieZhiAdapter.Vh> {
                                         TiUtils.unzip(file, targetDir);
                                         bean.setDownloadSuccess(mContext);
                                     } catch (Exception e) {
-                                        ToastUtil.show(WordUtil.getString(R.string.tiezhi_download_failed));
+                                        ToastUtil.show(mContext.getString(R.string.tiezhi_download_failed));
                                         bean.setDownloading(false);
                                     } finally {
                                         file.delete();
@@ -103,7 +103,7 @@ public class TieZhiAdapter extends RecyclerView.Adapter<TieZhiAdapter.Vh> {
 
                             @Override
                             public void onError(Throwable e) {
-                                ToastUtil.show(WordUtil.getString(R.string.tiezhi_download_failed));
+                                ToastUtil.show(mContext.getString(R.string.tiezhi_download_failed));
                                 bean.setDownloading(false);
                                 notifyItemChanged(position, Constants.PAYLOAD);
                                 mLoadingTaskMap.remove(position);

common/build.gradle

@@ -162,8 +162,8 @@ dependencies {
     api 'cn.rongcloud.sdk:im_kit:5.2.5.4' // 即时通讯 UI 基础组件
     //融云小视频模块
     api 'cn.rongcloud.sdk:sight:5.2.5.4'
-    api 'com.facebook.android:facebook-android-sdk:15.0.1'
-    implementation 'com.facebook.android:facebook-android-sdk:15.0.1'
+    api 'com.facebook.android:facebook-android-sdk:15.2.0'
+    implementation 'com.facebook.android:facebook-android-sdk:15.2.0'
 
     api('com.twitter.sdk.android:twitter-core:3.1.1@aar') {
         transitive = true
@@ -190,4 +190,5 @@ dependencies {
 
     api 'com.github.li-xiaojun:XPopup:2.9.1'
 
+    api 'com.github.shenbengit:PagerGridLayoutManager:1.1.7'
 }

common/src/main/java/com/yunbao/common/CommonAppConfig.java

@@ -383,7 +383,7 @@ public class CommonAppConfig {
     public String getAppName() {
         if (TextUtils.isEmpty(mAppName)) {
             int res = CommonAppContext.sInstance.getResources().getIdentifier("app_name", "string", "myname.pdlive.shayu");
-            mAppName = WordUtil.getString(res);
+            mAppName =WordUtil.getString(res);
         }
         return mAppName;
     }

common/src/main/java/com/yunbao/common/CommonAppContext.java

@@ -74,10 +74,12 @@ public class CommonAppContext extends MultiDexApplication {
         } else {
             locale = getResources().getConfiguration().locale;
         }
-        if (locale.getLanguage().equals("en")) {
-            lang = "english";
-        } else {
+        if (locale.getLanguage().equals("zh")) {
             lang = "chinese";
+
+        } else {
+            lang = "english";
+
         }
         Log.i("lang", lang);
 

common/src/main/java/com/yunbao/common/Constants.java

@@ -76,7 +76,7 @@ public class Constants {
     public static final String PAY_BUY_COIN_ALI = "Charge.getAliOrder";
     public static final String PAY_BUY_COIN_WX = "Charge.getWxOrder";
 
-//    public static final String PACKAGE_NAME_ALI = "com.eg.android.AlipayGphone";//支付宝的包名
+    //    public static final String PACKAGE_NAME_ALI = "com.eg.android.AlipayGphone";//支付宝的包名
     public static final String PACKAGE_NAME_WX = "com.tencent.mm";//微信的包名
     public static final String PACKAGE_NAME_QQ = "com.tencent.mobileqq";//QQ的包名
     public static final String LAT = "lat";
@@ -133,7 +133,7 @@ public class Constants {
     public static final int LIVE_FUNC_WKS = 2014;//語音
     public static final int LIVE_FUNC_ZSLK = 2015;//語音
     public static final int LIVE_FUNC_RANDOM_PK = 2016;//随机PK
-    public static final int LIVE_ROBOT= 2017;//机器人
+    public static final int LIVE_ROBOT = 2017;//机器人
 
     //socket
     public static final String SOCKET_CONN = "conn";
@@ -177,6 +177,12 @@ public class Constants {
     public static final String SUPER_VISION = "supervision";//超级发言警告
     public static final String PK_RANK_UPDATE = "RankingRankUpdate";//PK排位赛更新数据
     public static final String CUSTOM_FULL_SERVICE_NOTIFY = "customFullServiceNotify";//全服通知
+    public static final String XYD_COMPLETE = "XydComplete";//心愿单完成通知
+    public static final String WISH_LIST_PROGRESS = "wishListProgress";//心愿单进度通知
+    public static final String LIVE_VOTE_CREATE="createVote";
+    public static final String LIVE_VOTE_UPDATE="updateVote";
+    public static final String LIVE_VOTE_END="endVote";
+    public static final String LIVE_PK_END="endPK";//结束PK，以这个PK获取到的参数为准
 
     //游戏socket
     public static final String SOCKET_GAME_ZJH = "startGame";//炸金花

common/src/main/java/com/yunbao/common/activity/AbsActivity.java

@@ -27,6 +27,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.yunbao.common.R;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.LifeCycleListener;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.ClickUtil;
 
 import java.util.ArrayList;
@@ -48,6 +49,7 @@ public abstract class AbsActivity extends AppCompatActivity {
         Resources res = super.getResources();
         Configuration config = new Configuration();
         config.setToDefaults();
+        config.locale = IMLoginManager.get(this).getLocaleLanguage();
         res.updateConfiguration(config, res.getDisplayMetrics());
         return res;
     }
@@ -55,6 +57,7 @@ public abstract class AbsActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        create();
         Intent intent = getIntent();
         if (intent != null) {
             isFullWindow = getIntent().getBooleanExtra("isFull", false);
@@ -86,6 +89,9 @@ public abstract class AbsActivity extends AppCompatActivity {
 
     protected void main() {
 
+    }
+    protected void create(){
+
     }
 
     protected boolean isStatusBarWhite() {

common/src/main/java/com/yunbao/common/activity/ErrorActivity.java

@@ -60,6 +60,6 @@ public class ErrorActivity extends AbsActivity {
         ClipboardManager clipboardManager = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
         ClipData clipData = ClipData.newPlainText("text", mErrorInfo);
         clipboardManager.setPrimaryClip(clipData);
-        ToastUtil.show(WordUtil.getString(R.string.copy_success));
+        ToastUtil.show(mContext.getString(R.string.copy_success));
     }
 }

common/src/main/java/com/yunbao/common/activity/WebViewActivity.java

@@ -1,5 +1,6 @@
 package com.yunbao.common.activity;
 
+import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -22,21 +23,32 @@ import android.widget.ProgressBar;
 
 import androidx.annotation.RequiresApi;
 
+import com.lxj.xpopup.XPopup;
 import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
 import com.yunbao.common.R;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.AndroidBug5497Workaround;
+import com.yunbao.common.utils.AppManager;
+import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DeviceUtils;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.JavascriptInterfaceUtils;
 import com.yunbao.common.utils.L;
+import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.HintCustomPopup;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.Locale;
+import java.util.Stack;
+
 /**
  * Created by cxf on 2018/9/25.
  */
@@ -63,13 +75,13 @@ public class WebViewActivity extends AbsActivity {
     protected void main() {
         String url = getIntent().getStringExtra(Constants.URL);
         L.e("H5--->" + url);
+        Bus.getOn(this);
         LinearLayout rootView = (LinearLayout) findViewById(R.id.rootView);
         mProgressBar = (ProgressBar) findViewById(R.id.progressbar);
         btnEdit = (ImageView) findViewById(R.id.btn_edit);
         ft_title = (FrameLayout) findViewById(R.id.ft_title);
         v_spacing = (View) findViewById(R.id.v_spacing);
         mWebView = findViewById(R.id.webView);
-        AndroidBug5497Workaround.assistActivity(this);
 
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
         params.topMargin = DpUtil.dp2px(1);
@@ -97,10 +109,11 @@ public class WebViewActivity extends AbsActivity {
                     mWebView.loadUrl("javascript:goAnchorTab()");
                 }
                 //真实屏幕高度-(ft_title的高度+导航栏高度)
-                int height = DeviceUtils.getScreenRealHeight(mContext) - DpUtil.dp2px(72) - getCurrentNavigationBarHeight(mContext);
+                //屏蔽掉是因为在线客服页面 AndroidBug5497Workaround会失效
+              /*  int height = DeviceUtils.getScreenRealHeight(mContext) - DpUtil.dp2px(72) - getCurrentNavigationBarHeight(mContext);
                 if (!navigationGestureEnabled(mContext)) {
                     view.loadUrl("javascript:window.androidObject.setHeight(" + height + ",0,false)");
-                }
+                }*/
 
             }
         });
@@ -158,6 +171,7 @@ public class WebViewActivity extends AbsActivity {
             mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         mWebView.loadUrl(url);
+        AndroidBug5497Workaround.assistActivity(this);
 
         if (Constants.myIntoIndex == 2) {
             ft_title.setVisibility(View.GONE);
@@ -184,7 +198,7 @@ public class WebViewActivity extends AbsActivity {
             intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
         }
         intent.setType("image/*");
-        startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
+        startActivityForResult(Intent.createChooser(intent, mContext.getString(R.string.choose_flie)), CHOOSE);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -234,13 +248,13 @@ public class WebViewActivity extends AbsActivity {
             }
         }
         Intent intent = new Intent(context, WebViewActivity.class);
-        intent.putExtra(Constants.URL, url);
+        intent.putExtra(Constants.URL, url + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
         context.startActivity(intent);
     }
 
     public static void forward(Context context, String url) {
-        forward(context, url, true);
-    }
+        forward(context, url, true);    }
+
 
     @Override
     protected void onDestroy() {
@@ -254,6 +268,7 @@ public class WebViewActivity extends AbsActivity {
         Constants.myIntoIndex = 0;
         indexInto = 0;
         Constants.LoginKefu = true;
+        Bus.getOff(this);
         super.onDestroy();
     }
 
@@ -309,5 +324,56 @@ public class WebViewActivity extends AbsActivity {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onJavascriptInterfaceEvent(JavascriptInterfaceEvent event) {
         indexInto = event.getIndexInto();
+        if (event.getMethod().equals("androidInviteShare")) {
+            try {
+                Class<?> clz = mContext.getClassLoader().loadClass("com.yunbao.share.ui.InvitePopDialog");
+                Object invite = clz.getConstructor(Context.class).newInstance(mContext);
+                invite = invite.getClass().getMethod("setUrl", String.class).invoke(invite, event.getData());
+                assert invite != null;
+                invite.getClass().getMethod("showDialog").invoke(invite);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        } else if (TextUtils.equals(event.getMethod(), "clickLogOffAccount")) {
+            new XPopup.Builder(mContext)
+                    .asCustom(new HintCustomPopup(mContext,
+                            mContext.getString(R.string.delete_account1),
+                            mContext.getString(R.string.delete_account2))
+                            .setLiveOpenOk(mContext.getString(R.string.delete_account3))
+                            .setLiveOpenCancel(mContext.getString(R.string.cancel))
+                            .setCallBack(new HintCustomPopup.HintCustomCallBack() {
+                                @Override
+                                public void onSure() {
+                                    LiveNetManager.get(mContext).
+                                            setLogOff(new HttpCallback<String>() {
+                                                @Override
+                                                public void onSuccess(String data) {
+                                                    Stack<Activity> allActivityStacks = AppManager.getInstance().getAllActivityStacks();
+                                                    for (int i = 0; i < allActivityStacks.size(); i++) {
+                                                        if (!(allActivityStacks.get(i) instanceof WebViewActivity)) {
+                                                            allActivityStacks.get(i).finish();
+                                                        }
+                                                    }
+                                                    IMLoginManager.get(mContext).logout(mContext);
+                                                    CommonAppConfig.getInstance().clearLoginInfo();
+                                                    mContext.finish();
+                                                    RouteUtil.forwardLoginActivity();
+
+                                                }
+
+                                                @Override
+                                                public void onError(String error) {
+
+                                                }
+                                            });
+                                }
+
+                                @Override
+                                public void onCancel() {
+
+                                }
+                            }))
+                    .show();
+        }
     }
 }

common/src/main/java/com/yunbao/common/adapter/ChatChargeCoinAdapter.java

@@ -41,7 +41,7 @@ public class ChatChargeCoinAdapter extends RecyclerView.Adapter<ChatChargeCoinAd
         mList = list;
         mCoinName = CommonAppConfig.getInstance().getCoinName();
         mGoldCoinName = CommonAppConfig.getInstance().getGoldCoinName();
-        mGiveString = WordUtil.getString(R.string.coin_give);
+        mGiveString = context.getString(R.string.coin_give);
         mOnClickListener = new View.OnClickListener() {
             @Override
             public void onClick(View v) {

common/src/main/java/com/yunbao/common/adapter/DrawerTaskAdapter.java

@@ -1,6 +1,7 @@
 package com.yunbao.common.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -48,12 +49,22 @@ public class DrawerTaskAdapter extends RecyclerView.Adapter {
 
     @Override
     public int getItemCount() {
-        return 2;
+        if (child.size()>3){
+            return 3;
+        }else {
+            return child.size();
+        }
+
     }
 
     public void updateData(List<CustomSidebarChildModel> mChild) {
         child.clear();
         child.addAll(mChild);
+//        for (CustomSidebarChildModel childModel : mChild) {
+//            if (TextUtils.equals("1", childModel.getIsShow())) {
+//                child.add(childModel);
+//            }
+//        }
         notifyDataSetChanged();
     }
 }

common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java

@@ -0,0 +1,164 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.WishModel;
+import com.yunbao.common.event.LiveNewWishListCloseEvent;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.DayWishItemViewHolder;
+import com.yunbao.common.views.LunarWishItemViewHolder;
+import com.yunbao.common.views.SeasonalWishItemViewHolder;
+import com.yunbao.common.views.WeekWishItemViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LiveNewWishAdapter extends RecyclerView.Adapter {
+    private int type = 0;
+    private List<WishModel> wishList = new ArrayList<>();
+
+    public void addData(List<WishModel> wishModelList, int type) {
+        this.type = type;
+        wishList.clear();
+        wishList.addAll(wishModelList);
+        wishList.add(null);
+        notifyDataSetChanged();
+    }
+
+    public void addGiftListModel(WishModel model) {
+        switch (type) {
+            case 1:
+                Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(true));
+                break;
+            case 2:
+                Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(true));
+                break;
+            case 3:
+                Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(true));
+                break;
+            case 4:
+                Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(true));
+                break;
+        }
+
+        wishList.add(0, model);
+        notifyDataSetChanged();
+    }
+
+    public List<WishModel> getWishList() {
+
+        return wishList;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        if (type == 1) {
+            View dayWish = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_day_wish, parent, false);
+            return new DayWishItemViewHolder(dayWish);
+        } else if (type == 2) {
+            View weekWish = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_week_wish, parent, false);
+            return new WeekWishItemViewHolder(weekWish);
+        } else if (type == 3) {
+            View lunarWish = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_lunar_wish, parent, false);
+            return new LunarWishItemViewHolder(lunarWish);
+        } else {
+            View seasonalWish = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_seasonal_wish, parent, false);
+            return new SeasonalWishItemViewHolder(seasonalWish);
+        }
+
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if (position == wishList.size()) return;
+        if (holder instanceof DayWishItemViewHolder) {
+            DayWishItemViewHolder dayWishItemViewHolder = (DayWishItemViewHolder) holder;
+            dayWishItemViewHolder.steDayWishData(wishList.get(position), position, new DayWishItemViewHolder.DayWishItemListener() {
+                @Override
+                public void onDelete(int index) {
+                    Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(true));
+                    wishList.remove(index);
+                    notifyDataSetChanged();
+                }
+
+                @Override
+                public void onUpdate(WishModel model, int index) {
+                    Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(true));
+                    wishList.remove(index);
+                    wishList.add(index, model);
+                    notifyItemChanged(index);
+                }
+            });
+        } else if (holder instanceof WeekWishItemViewHolder) {
+            WeekWishItemViewHolder weekWishItemViewHolder = (WeekWishItemViewHolder) holder;
+            weekWishItemViewHolder.steWeekWishData(wishList.get(position), position, new WeekWishItemViewHolder.WeekWishItemListener() {
+                @Override
+                public void onDelete(int index) {
+                    Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(true));
+                    wishList.remove(index);
+                    notifyDataSetChanged();
+
+                }
+
+                @Override
+                public void onUpdate(WishModel model, int index) {
+                    Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(true));
+                    wishList.remove(index);
+                    wishList.add(index, model);
+                    notifyItemChanged(index);
+                }
+            });
+        } else if (holder instanceof LunarWishItemViewHolder) {
+            LunarWishItemViewHolder lunarWishItemViewHolder = (LunarWishItemViewHolder) holder;
+            lunarWishItemViewHolder.steLunarWishData(wishList.get(position), position, new LunarWishItemViewHolder.LunarWishItemListener() {
+                @Override
+                public void onDelete(int index) {
+                    Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(true));
+                    wishList.remove(index);
+                    notifyDataSetChanged();
+                }
+
+                @Override
+                public void onUpdate(WishModel model, int index) {
+                    Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(true));
+                    wishList.remove(index);
+                    wishList.add(index, model);
+                    notifyItemChanged(index);
+                }
+            });
+        } else if (holder instanceof SeasonalWishItemViewHolder) {
+            SeasonalWishItemViewHolder seasonalWishItemViewHolder = (SeasonalWishItemViewHolder) holder;
+            seasonalWishItemViewHolder.steSeasonalWish(wishList.get(position), position, new SeasonalWishItemViewHolder.SeasonalWishItemListener() {
+                @Override
+                public void onDelete(int index) {
+                    Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(true));
+                    wishList.remove(index);
+                    notifyDataSetChanged();
+                }
+
+                @Override
+                public void onUpdate(WishModel model, int index) {
+                    Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(true));
+                    wishList.remove(index);
+                    wishList.add(index, model);
+                    notifyItemChanged(index);
+                }
+            });
+        }
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return wishList.size();
+    }
+
+
+}

common/src/main/java/com/yunbao/common/adapter/LiveNewWishGiftAdapter.java

@@ -0,0 +1,56 @@
+package com.yunbao.common.adapter;
+
+import android.annotation.SuppressLint;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.GiftListModel;
+import com.yunbao.common.event.LiveNewWishGiftEvent;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.LiveNewWishGiftViewHolder;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LiveNewWishGiftAdapter extends RecyclerView.Adapter {
+    private List<GiftListModel> giftListModels = new ArrayList<>();
+
+    public LiveNewWishGiftAdapter(List<GiftListModel> giftListModels) {
+        this.giftListModels = giftListModels;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View dayWish = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_gitf_wish, parent, false);
+        return new LiveNewWishGiftViewHolder(dayWish);
+    }
+
+    private int index = -1;
+
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, @SuppressLint("RecyclerView") int position) {
+        LiveNewWishGiftViewHolder wishGiftViewHolder = (LiveNewWishGiftViewHolder) holder;
+        wishGiftViewHolder.setData(giftListModels.get(position), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                index = position;
+                notifyDataSetChanged();
+                Bus.get().post(new LiveNewWishGiftEvent().setModel(giftListModels.get(position)));
+            }
+        });
+        wishGiftViewHolder.onSelect(index == position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftListModels.size();
+    }
+}

common/src/main/java/com/yunbao/common/adapter/LiveNewWishListAdapter.java

@@ -0,0 +1,30 @@
+package com.yunbao.common.adapter;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LiveNewWishListAdapter extends FragmentStateAdapter {
+    private List<Fragment> list = new ArrayList<>();
+
+    public LiveNewWishListAdapter(@NonNull FragmentActivity fragmentActivity, List<Fragment> list) {
+        super(fragmentActivity);
+        this.list = list;
+    }
+
+
+    @NonNull
+    @Override
+    public Fragment createFragment(int position) {
+        return list.get(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+}

common/src/main/java/com/yunbao/common/bean/AdBean.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 public class AdBean {
     private String mUrl;
     private String mLink;
+    private int animation;//是否使用过度动画
 
     @JSONField(name = "thumb")
     public String getUrl() {
@@ -26,4 +27,12 @@ public class AdBean {
     public void setLink(String link) {
         mLink = link;
     }
+    @JSONField(name = "animation")
+    public int getAnimation() {
+        return animation;
+    }
+    @JSONField(name = "animation")
+    public void setAnimation(int animation) {
+        this.animation = animation;
+    }
 }

common/src/main/java/com/yunbao/common/bean/BannerBean.java

@@ -1,6 +1,9 @@
 package com.yunbao.common.bean;
 
+import androidx.annotation.NonNull;
+
 import com.alibaba.fastjson.annotation.JSONField;
+import com.google.gson.annotations.SerializedName;
 
 /**
  * Created by cxf on 2019/3/30.
@@ -15,7 +18,81 @@ public class BannerBean {
     private String mIntoUrl;
     private int type;
     private String name;
-    private int activityId=0;
+    private int activityId = 0;
+    private int mIconRes;
+    //心愿单展示数据
+    @SerializedName("wishlist_icon")
+    private String wishlistIcon;
+    @SerializedName("wishlist_num")
+    private String wishlistNum;
+    @SerializedName("wishlist_progress")
+    private String wishlistProgress;
+    @SerializedName("wishlist_name")
+    private String wishlistName;
+    private Object data;//用来存储任意bean
+
+    public String getmImageUrl() {
+        return mImageUrl;
+    }
+
+    public BannerBean setmImageUrl(String mImageUrl) {
+        this.mImageUrl = mImageUrl;
+        return this;
+    }
+
+    public String getmLink() {
+        return mLink;
+    }
+
+    public BannerBean setmLink(String mLink) {
+        this.mLink = mLink;
+        return this;
+    }
+
+    public int getmIconRes() {
+        return mIconRes;
+    }
+
+    public BannerBean setmIconRes(int mIconRes) {
+        this.mIconRes = mIconRes;
+        return this;
+    }
+
+    public String getWishlistIcon() {
+        return wishlistIcon;
+    }
+
+    public BannerBean setWishlistIcon(String wishlistIcon) {
+        this.wishlistIcon = wishlistIcon;
+        return this;
+    }
+
+    public String getWishlistNum() {
+        return wishlistNum;
+    }
+
+    public BannerBean setWishlistNum(String wishlistNum) {
+        this.wishlistNum = wishlistNum;
+        return this;
+    }
+
+    public String getWishlistProgress() {
+        return wishlistProgress;
+    }
+
+    public BannerBean setWishlistProgress(String wishlistProgress) {
+        this.wishlistProgress = wishlistProgress;
+        return this;
+    }
+
+    public String getWishlistName() {
+        return wishlistName;
+    }
+
+    public BannerBean setWishlistName(String wishlistName) {
+        this.wishlistName = wishlistName;
+        return this;
+    }
 
     private StarChallengeStatusModel model;
 
@@ -79,27 +156,49 @@ public class BannerBean {
     public int getType() {
         return type;
     }
+
     @JSONField(name = "type")
     public void setType(int type) {
         this.type = type;
     }
+
     @JSONField(name = "name")
     public String getName() {
         return name;
     }
+
     @JSONField(name = "name")
     public void setName(String name) {
         this.name = name;
     }
+
     @JSONField(name = "active_id")
     public int getActivityId() {
         return activityId;
     }
+
     @JSONField(name = "active_id")
     public void setActivityId(int activityId) {
         this.activityId = activityId;
     }
 
+    public int getIconRes() {
+        return mIconRes;
+    }
+
+    public void setIconRes(int mIconRes) {
+        this.mIconRes = mIconRes;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    @NonNull
     @Override
     public String toString() {
         return "BannerBean{" +
@@ -110,6 +209,12 @@ public class BannerBean {
                 ", mIntoUrl='" + mIntoUrl + '\'' +
                 ", type=" + type +
                 ", name='" + name + '\'' +
+                ", activityId=" + activityId +
+                ", mIconRes=" + mIconRes +
+                ", wishlistIcon='" + wishlistIcon + '\'' +
+                ", wishlistNum='" + wishlistNum + '\'' +
+                ", wishlistProgress='" + wishlistProgress + '\'' +
+                ", wishlistName='" + wishlistName + '\'' +
                 ", model=" + model +
                 '}';
     }

common/src/main/java/com/yunbao/common/bean/BlindBoxInfoModel.java

@@ -0,0 +1,99 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class BlindBoxInfoModel extends BaseModel {
+    /**
+     * "info":[{"item_name":["麒麟勛章饰品","麒麟頭像框饰品","麒麟坐騎饰品","水晶项链礼物","夢幻水晶球礼物","心動泡泡礼物","蝴蝶少女礼物","金色唱片礼物","鑽石禮盒礼物","紙花船礼物"],"threshold_value":268,"threshold_dress_name":"麒麟坐騎","dress_threshold_value":0,"blind_box_type":1,"blind_box_id":1636},{"item_name":["金鳳勛章饰品","金鳳頭像框饰品","金鳳坐騎饰品","浪漫氣球礼物","捕夢網礼物","仙女棒礼物","藍寶石鈴鐺礼物","榮耀星礼物","童話屋礼物","夢幻許願池礼物"],"threshold_value":198,"threshold_dress_name":"金鳳坐騎","dress_threshold_value":0,"blind_box_type":2,"blind_box_id":1637},{"item_name":["神龍勛章饰品","神龍頭像框饰品","神龍坐騎饰品","水晶玫瑰礼物","sweet香水礼物","甜蜜熱氣球礼物","風鈴舞動礼物","音樂噴泉礼物","星空列車礼物","漂洋過海來看你礼物"],"threshold_value":128,"threshold_dress_name":"神龍坐騎","dress_threshold_value":0,"blind_box_type":3,"blind_box_id":1638}]
+     */
+    @SerializedName("item_name")
+    private List<String> itemName;
+    @SerializedName("threshold_value")
+    private String thresholdValue = "0";
+    @SerializedName("threshold_dress_name")
+    private String thresholdDressName;
+    @SerializedName("dress_threshold_value")
+    private String dressThresholdValue;
+    @SerializedName("blind_box_type")
+    private String blindBoxType;
+    @SerializedName("blind_box_id")
+    private String blindBoxId;
+    @SerializedName("blind_box_swf")
+    private String blindBoxSwf;
+    @SerializedName("threshold_effect_src")
+    private String thresholdEffectSrc;
+
+    public String getThresholdEffectSrc() {
+        return thresholdEffectSrc;
+    }
+
+    public BlindBoxInfoModel setThresholdEffectSrc(String thresholdEffectSrc) {
+        this.thresholdEffectSrc = thresholdEffectSrc;
+        return this;
+    }
+
+    public String getBlindBoxSwf() {
+        return blindBoxSwf;
+    }
+
+    public BlindBoxInfoModel setBlindBoxSwf(String blindBoxSwf) {
+        this.blindBoxSwf = blindBoxSwf;
+        return this;
+    }
+
+    public List<String> getItemName() {
+        return itemName;
+    }
+
+    public BlindBoxInfoModel setItemName(List<String> itemName) {
+        this.itemName = itemName;
+        return this;
+    }
+
+    public String getThresholdValue() {
+        return thresholdValue;
+    }
+
+    public BlindBoxInfoModel setThresholdValue(String thresholdValue) {
+        this.thresholdValue = thresholdValue;
+        return this;
+    }
+
+    public String getThresholdDressName() {
+        return thresholdDressName;
+    }
+
+    public BlindBoxInfoModel setThresholdDressName(String thresholdDressName) {
+        this.thresholdDressName = thresholdDressName;
+        return this;
+    }
+
+    public String getDressThresholdValue() {
+        return dressThresholdValue;
+    }
+
+    public BlindBoxInfoModel setDressThresholdValue(String dressThresholdValue) {
+        this.dressThresholdValue = dressThresholdValue;
+        return this;
+    }
+
+    public String getBlindBoxType() {
+        return blindBoxType;
+    }
+
+    public BlindBoxInfoModel setBlindBoxType(String blindBoxType) {
+        this.blindBoxType = blindBoxType;
+        return this;
+    }
+
+    public String getBlindBoxId() {
+        return blindBoxId;
+    }
+
+    public BlindBoxInfoModel setBlindBoxId(String blindBoxId) {
+        this.blindBoxId = blindBoxId;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/bean/CustomSidebarChildModel.java

@@ -31,7 +31,18 @@ public class CustomSidebarChildModel extends BaseModel {
     @SerializedName("activity_id")
     private String activityId;
     @SerializedName("flag")
-    private String flag;
+    private String flag = "";
+    @SerializedName("is_show")
+    private String isShow;
+
+    public String getIsShow() {
+        return isShow;
+    }
+
+    public CustomSidebarChildModel setIsShow(String isShow) {
+        this.isShow = isShow;
+        return this;
+    }
 
     public String getFlag() {
         return flag;

common/src/main/java/com/yunbao/common/bean/DiscountsModel.java

@@ -0,0 +1,109 @@
+package com.yunbao.common.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 优惠卷
+ */
+public class DiscountsModel extends BaseModel {
+    //------------------贵族--------------------
+    public static final int TYPE_VISCOUNT=1;//子爵
+    public static final int TYPE_MARQUIS=2;//侯爵
+    public static final int TYPE_DUKE=3;//公爵
+    public static final int TYPE_KING=4;//国王
+    public static final int TYPE_EMPEROR=5;//皇帝
+    //------------------守护--------------------
+    public static final int TYPE_WEEKS=6;//周守护
+    public static final int TYPE_MONTH=7;//月守护
+    public static final int TYPE_YEARS=8;//月守护
+
+    @SerializedName("userCouponId")
+    private int userCouponID;
+    @SerializedName("num")
+    private int num;
+    @SerializedName("endTime")
+    private long endTime;
+    @SerializedName("img")
+    private String img;
+    @SerializedName("name")
+    private String name;
+    @SerializedName("discount")
+    private double discount;
+    @SerializedName("describe")
+    private String describe;
+
+    public DiscountsModel() {
+    }
+
+    public int getUserCouponID() {
+        return userCouponID;
+    }
+
+    public void setUserCouponID(int userCouponID) {
+        this.userCouponID = userCouponID;
+    }
+
+    public int getNum() {
+        return num;
+    }
+
+    public void setNum(int num) {
+        this.num = num;
+    }
+
+    public long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(long endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(double discount) {
+        this.discount = discount;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "DiscountsModel{" +
+                "userCouponID=" + userCouponID +
+                ", num=" + num +
+                ", endTime=" + endTime +
+                ", img='" + img + '\'' +
+                ", name='" + name + '\'' +
+                ", discount=" + discount +
+                ", describe='" + describe + '\'' +
+                '}';
+    }
+}

common/src/main/java/com/yunbao/common/bean/EnterRoomInfoModel.java

@@ -104,12 +104,22 @@ public class EnterRoomInfoModel extends BaseModel {
     private String anchorGoodnum;
     @SerializedName("jackpot_level")
     private String jackpotLevel="-1";
+    @SerializedName("live_vote")
+    private LiveRoomVoteModel voteModel;
 
     public String getJackpotLevel() {
 
         return jackpotLevel;
     }
 
+    public LiveRoomVoteModel getVoteModel() {
+        return voteModel;
+    }
+
+    public void setVoteModel(LiveRoomVoteModel voteModel) {
+        this.voteModel = voteModel;
+    }
+
     public EnterRoomInfoModel setJackpotLevel(String jackpotLevel) {
         this.jackpotLevel = jackpotLevel;
         return this;
@@ -488,6 +498,9 @@ public class EnterRoomInfoModel extends BaseModel {
     }
 
     public String getIsleave() {
+        if(StringUtil.isEmpty(isleave)){
+            isleave="0";
+        }
         return isleave;
     }
 

common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java

@@ -30,6 +30,17 @@ public class EnterRoomNewModel extends BaseModel {
     private List<LiveRoomActivityModel> liveRoomActivityModels = new ArrayList<>();//活动列表
     @SerializedName("clarityType")
     private int clarityType;
+    @SerializedName("wishListProgress")
+    private WishModel wishListProgress;
+
+    public WishModel getWishListProgress() {
+        return wishListProgress;
+    }
+
+    public EnterRoomNewModel setWishListProgress(WishModel wishListProgress) {
+        this.wishListProgress = wishListProgress;
+        return this;
+    }
 
     public List<LiveRoomActivityModel> getLiveRoomActivityModels() {
         return liveRoomActivityModels;

common/src/main/java/com/yunbao/common/bean/GiftListModel.java

@@ -0,0 +1,72 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GiftListModel extends BaseModel {
+    @SerializedName("name")
+    private String name;
+    @SerializedName("price")
+    private String price;
+    @SerializedName("img")
+    private String img;
+    @SerializedName("id")
+    private String id;
+    @SerializedName("gift_type")
+    private String giftType;
+
+    public String getName() {
+        return name;
+    }
+
+    public GiftListModel setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public GiftListModel setPrice(String price) {
+        this.price = price;
+        return this;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public GiftListModel setImg(String img) {
+        this.img = img;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public GiftListModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getGiftType() {
+        return giftType;
+    }
+
+    public GiftListModel setGiftType(String giftType) {
+        this.giftType = giftType;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "GiftListModel{" +
+                "name='" + name + '\'' +
+                ", price='" + price + '\'' +
+                ", img='" + img + '\'' +
+                ", id='" + id + '\'' +
+                ", giftType='" + giftType + '\'' +
+                '}';
+    }
+}

common/src/main/java/com/yunbao/common/bean/HttpCallbackModel.java

@@ -28,4 +28,12 @@ public class HttpCallbackModel extends BaseModel {
     public void setMsg(String msg) {
         this.msg = msg;
     }
+
+    @Override
+    public String toString() {
+        return "HttpCallbackModel{" +
+                "code=" + code +
+                ", msg='" + msg + '\'' +
+                '}';
+    }
 }

common/src/main/java/com/yunbao/common/bean/LiveAnchorCallMeModel.java

@@ -0,0 +1,184 @@
+package com.yunbao.common.bean;
+
+import androidx.annotation.NonNull;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 联系方式
+ */
+public class LiveAnchorCallMeModel extends BaseModel {
+    @SerializedName("id")
+    private int id;
+    @SerializedName("isShow")
+    private int isShow;
+    @SerializedName("gift_id")
+    private int giftId;
+    @SerializedName("giftImage")
+    private String giftImage;
+    @SerializedName("content")
+    private String content;
+    @SerializedName("wechat")
+    private AppBean wechat;
+    @SerializedName("line")
+    private AppBean line;
+    @SerializedName("whatsApp")
+    private AppBean whatsApp;
+    @SerializedName("isGet")
+    private int isGet;
+    @SerializedName("link")
+    private String link;
+
+    public LiveAnchorCallMeModel() {
+    }
+
+    public int getIsGet() {
+        return isGet;
+    }
+
+    public void setIsGet(int isGet) {
+        this.isGet = isGet;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getGiftImage() {
+        return giftImage;
+    }
+
+    public void setGiftImage(String giftImage) {
+        this.giftImage = giftImage;
+    }
+
+    public int getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(int isShow) {
+        this.isShow = isShow;
+    }
+
+    public int getGiftId() {
+        return giftId;
+    }
+
+    public void setGiftId(int giftId) {
+        this.giftId = giftId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public AppBean getWechat() {
+        if (wechat == null) {
+            wechat = new AppBean();
+        }
+        return wechat;
+    }
+
+    public void setWechat(AppBean wechat) {
+        this.wechat = wechat;
+    }
+
+    public AppBean getLine() {
+        if (line == null) {
+            line = new AppBean();
+        }
+        return line;
+    }
+
+    public void setLine(AppBean line) {
+        this.line = line;
+    }
+
+    public AppBean getWhatsApp() {
+        if (whatsApp == null) {
+            whatsApp = new AppBean();
+        }
+        return whatsApp;
+    }
+
+    public void setWhatsApp(AppBean whatsApp) {
+        this.whatsApp = whatsApp;
+    }
+
+    @Override
+    public String toString() {
+        return "LiveAnchorCallMeModel{" +
+                "id=" + id +
+                ", isShow=" + isShow +
+                ", giftId=" + giftId +
+                ", giftImage='" + giftImage + '\'' +
+                ", content='" + content + '\'' +
+                ", wechat=" + wechat +
+                ", line=" + line +
+                ", whatsApp=" + whatsApp +
+                ", isGet=" + isGet +
+                ", link='" + link + '\'' +
+                '}';
+    }
+
+    public static class AppBean {
+        private String number;
+        private int isShow;
+
+        public AppBean() {
+        }
+
+        public AppBean(String number, int isShow) {
+            this.number = number;
+            this.isShow = isShow;
+        }
+
+        public String getNumber() {
+            return number;
+        }
+
+        public void setNumber(String number) {
+            this.number = number;
+        }
+
+        public int getIsShow() {
+            return isShow;
+        }
+
+        public void setIsShow(int isShow) {
+            this.isShow = isShow;
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "AppBean{" +
+                    "number='" + number + '\'' +
+                    ", isShow=" + isShow +
+                    '}';
+        }
+
+        public JSONObject toJSONObject() {
+            return (JSONObject) JSON.toJSON(this);
+        }
+    }
+
+}

common/src/main/java/com/yunbao/common/bean/LiveAnchorSayModel.java

@@ -0,0 +1,80 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class LiveAnchorSayModel extends BaseModel{
+    @SerializedName("livePreview")
+    private LivePreview livePreview;
+    @SerializedName("style")
+    private List<String> style;
+
+    public LiveAnchorSayModel() {
+    }
+
+    public LivePreview getLivePreview() {
+        return livePreview;
+    }
+
+    public void setLivePreview(LivePreview livePreview) {
+        this.livePreview = livePreview;
+    }
+
+    public List<String> getStyle() {
+        return style;
+    }
+
+    public void setStyle(List<String> style) {
+        this.style = style;
+    }
+    public class LivePreview{
+        private int isShow;
+        private String content;
+        private String styleImage;
+
+        public LivePreview() {
+        }
+
+        public int getIsShow() {
+            return isShow;
+        }
+
+        public void setIsShow(int isShow) {
+            this.isShow = isShow;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+
+        public String getStyleImage() {
+            return styleImage;
+        }
+
+        public void setStyleImage(String styleImage) {
+            this.styleImage = styleImage;
+        }
+
+        @Override
+        public String toString() {
+            return "LivePreview{" +
+                    "isShow=" + isShow +
+                    ", content='" + content + '\'' +
+                    ", styleImage='" + styleImage + '\'' +
+                    '}';
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "LiveAnchorSayModel{" +
+                "livePreview=" + livePreview +
+                ", style=" + style +
+                '}';
+    }
+}

common/src/main/java/com/yunbao/common/bean/LiveClassBean.java

@@ -14,6 +14,26 @@ public class LiveClassBean {
     private boolean isAll;
     private String des;
     private boolean checked;
+    private String chinese;
+    private String english;
+
+    public String getChinese() {
+        return chinese;
+    }
+
+    public LiveClassBean setChinese(String chinese) {
+        this.chinese = chinese;
+        return this;
+    }
+
+    public String getEnglish() {
+        return english;
+    }
+
+    public LiveClassBean setEnglish(String english) {
+        this.english = english;
+        return this;
+    }
 
     public int getId() {
         return id;

common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java

@@ -18,7 +18,7 @@ public class LiveGiftBean {
 //    public static final int MARK_LUCK = 3;
 
     private int id;
-    private int type;//0 普通礼物 1是豪华礼物
+    private int type;//0 普通礼物 1是贵族 2守护 3粉丝团 5盲盒礼物
     private int mark;// 0 普通  1热门  2守护 3幸运
     private String name;
     private String price;
@@ -34,6 +34,17 @@ public class LiveGiftBean {
     private String isweek;
     private String end_time;
     private String tag;
+    @JSONField(name = "blind_box_type")
+    private int blind_box_type = 0;
+
+    public int getBlind_box_type() {
+        return blind_box_type;
+    }
+
+    public LiveGiftBean setBlind_box_type(int blind_box_type) {
+        this.blind_box_type = blind_box_type;
+        return this;
+    }
 
     public String getTag() {
         return tag;

common/src/main/java/com/yunbao/common/bean/LiveRoomVoteModel.java

@@ -0,0 +1,193 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.utils.WordUtil;
+
+import java.util.List;
+
+/**
+ * 主播创建投票
+ * {
+ * "live_vote_id": "20",
+ * "question_content": "123",
+ * "vote_end_time": 180,
+ * "option_content_first_num": 0,
+ * "option_content_second_num": 0,
+ * "users_id": []
+ * }
+ */
+public class LiveRoomVoteModel extends BaseModel {
+    @SerializedName("vote_status")
+    private int status;
+    @SerializedName("live_vote_id")
+    private String voteId;
+    @SerializedName("question_content")
+    private String content;
+    @SerializedName("vote_end_time")
+    private int time;
+    @SerializedName("option_content_first_num")
+    private int answer1Num;
+    @SerializedName("option_content_second_num")
+    private int answer2Num;
+    @SerializedName("users_id")
+    private List<String> userIds;
+    @SerializedName("option_content_first")
+    private String answer1;
+    @SerializedName("option_content_second")
+    private String answer2;
+    @SerializedName("result_zh")
+    private String resultZh;
+    @SerializedName("result_en")
+    private String resultEn;
+    @SerializedName("option_text")
+    private String optionText;
+    @SerializedName("option_content_key")
+    private String vote;
+
+    private String liveUid;
+
+    public String getLiveUid() {
+        return liveUid;
+    }
+
+    public void setLiveUid(String liveUid) {
+        this.liveUid = liveUid;
+    }
+
+    public String getAnswer1() {
+        return answer1;
+    }
+
+    public void setAnswer1(String answer1) {
+        this.answer1 = answer1;
+    }
+
+    public String getAnswer2() {
+        return answer2;
+    }
+
+    public void setAnswer2(String answer2) {
+        this.answer2 = answer2;
+    }
+
+    public String getVoteId() {
+        return voteId;
+    }
+
+    public void setVoteId(String voteId) {
+        this.voteId = voteId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getTime() {
+        return time;
+    }
+
+    public void setTime(int time) {
+        this.time = time;
+    }
+
+    public int getAnswer1Num() {
+        return answer1Num;
+    }
+
+    public void setAnswer1Num(int answer1Num) {
+        this.answer1Num = answer1Num;
+    }
+
+    public int getAnswer2Num() {
+        return answer2Num;
+    }
+
+    public void setAnswer2Num(int answer2Num) {
+        this.answer2Num = answer2Num;
+    }
+
+    public List<String> getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(List<String> userIds) {
+        this.userIds = userIds;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getResult() {
+        return  WordUtil.isNewZh() ? resultZh : resultEn;
+    }
+
+    public String getResultZh() {
+        return resultZh;
+    }
+
+    public void setResultZh(String resultZh) {
+        this.resultZh = resultZh;
+    }
+
+    public String getResultEn() {
+        return resultEn;
+    }
+
+    public void setResultEn(String resultEn) {
+        this.resultEn = resultEn;
+    }
+
+    public String getOptionText() {
+        return optionText;
+    }
+
+    public void setOptionText(String optionText) {
+        this.optionText = optionText;
+    }
+
+    @Override
+    public String toString() {
+        return "LiveRoomVoteModel{" +
+                "status=" + status +
+                ", voteId='" + voteId + '\'' +
+                ", content='" + content + '\'' +
+                ", time=" + time +
+                ", answer1Num=" + answer1Num +
+                ", answer2Num=" + answer2Num +
+                ", userIds=" + userIds +
+                ", answer1='" + answer1 + '\'' +
+                ", answer2='" + answer2 + '\'' +
+                ", resultZh='" + resultZh + '\'' +
+                ", resultEn='" + resultEn + '\'' +
+                ", optionText='" + optionText + '\'' +
+                ", vote='" + vote + '\'' +
+                ", liveUid='" + liveUid + '\'' +
+                '}';
+    }
+
+    public String getVote() {
+        return vote;
+    }
+
+    public void setVote(String vote) {
+        this.vote = vote;
+    }
+
+    public boolean isVoteLeft() {
+        return vote.equals("option_content_first_num");
+    }
+
+    public boolean isVote() {
+        return !StringUtil.isEmpty(vote);
+    }
+}

common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java

@@ -87,7 +87,7 @@ public class LiveTaskModel extends BaseModel {
 
         public String getEndTime() {
             if (!StringUtil.isEmpty(endTime)) {
-                endTime = WordUtil.getString(R.string.live_task_new_user_timer) + new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
+                endTime =WordUtil.getString(R.string.live_task_new_user_timer) + new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
             }
             return endTime;
         }

common/src/main/java/com/yunbao/common/bean/LiveUserMailBoxModel.java

@@ -0,0 +1,155 @@
+package com.yunbao.common.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.utils.StringUtil;
+
+public class LiveUserMailBoxModel extends BaseModel {
+    @SerializedName("id")
+    private int id;
+    @SerializedName("uid")
+    private int uid;
+    @SerializedName("liveuid")
+    private int liveUid;
+    @SerializedName("is_read")
+    private int isRead;
+    @SerializedName("content")
+    private String content;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("gift_id")
+    private int giftId;
+    @SerializedName("userName")
+    private String userName;
+    @SerializedName("anchorName")
+    private String anchorName;
+    @SerializedName("url")
+    private String url;
+
+    public LiveUserMailBoxModel() {
+    }
+
+    public LiveUserMailBoxModel(int id, int uid, int liveUid, String content, String createTime, int giftId, String userName, String anchorName) {
+        this.id = id;
+        this.uid = uid;
+        this.liveUid = liveUid;
+        this.content = content;
+        this.createTime = createTime;
+        this.giftId = giftId;
+        this.userName = userName;
+        this.anchorName = anchorName;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getUid() {
+        return uid;
+    }
+
+    public void setUid(int uid) {
+        this.uid = uid;
+    }
+
+    public int getLiveUid() {
+        return liveUid;
+    }
+
+    public void setLiveUid(int liveUid) {
+        this.liveUid = liveUid;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public int getGiftId() {
+        return giftId;
+    }
+
+    public void setGiftId(int giftId) {
+        this.giftId = giftId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAnchorName() {
+        return anchorName;
+    }
+
+    public void setAnchorName(String anchorName) {
+        this.anchorName = anchorName;
+    }
+
+    public int getIsRead() {
+        return isRead;
+    }
+
+    public void setIsRead(int isRead) {
+        this.isRead = isRead;
+    }
+
+    public String getUrl() {
+        if (StringUtil.isEmpty(url)) {
+            url = "http://www.baidu.com";
+        } else {
+            if (!url.startsWith("http")) {
+                url = CommonAppConfig.HOST + "/" + url;
+            }
+            if (url.contains("?")) {
+                url += "&";
+            } else {
+                url += "?";
+            }
+            url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+                    + CommonAppConfig.getInstance().getToken();
+        }
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "LiveUserMailBoxModel{" +
+                "id=" + id +
+                ", uid=" + uid +
+                ", liveUid=" + liveUid +
+                ", isRead=" + isRead +
+                ", content='" + content + '\'' +
+                ", createTime='" + createTime + '\'' +
+                ", giftId=" + giftId +
+                ", userName='" + userName + '\'' +
+                ", anchorName='" + anchorName + '\'' +
+                ", url='" + url + '\'' +
+                '}';
+    }
+}

common/src/main/java/com/yunbao/common/bean/NewLevelModel.java

@@ -2,6 +2,7 @@ package com.yunbao.common.bean;
 
 import android.text.TextUtils;
 
+import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
 /**
@@ -17,6 +18,17 @@ public class NewLevelModel extends BaseModel {
     private String levemax;
     @SerializedName("thumb")
     private String thumb;
+    @SerializedName("icon")
+    private String icon;
+    @SerializedName("colour")
+    private String colour;
+    @SerializedName("live_icon")
+    private String liveIcon = "https://downs.yaoulive.com/level1/img_1-9.png";
+
+    public static NewLevelModel objectFromData(String str) {
+
+        return new Gson().fromJson(str, NewLevelModel.class);
+    }
 
     public String getId() {
         return id;
@@ -67,4 +79,28 @@ public class NewLevelModel extends BaseModel {
         this.thumb = thumb;
         return this;
     }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public String getColour() {
+        return colour;
+    }
+
+    public void setColour(String colour) {
+        this.colour = colour;
+    }
+
+    public String getLiveIcon() {
+        return liveIcon;
+    }
+
+    public void setLiveIcon(String liveIcon) {
+        this.liveIcon = liveIcon;
+    }
 }

common/src/main/java/com/yunbao/common/bean/UserAreaBean.java

@@ -0,0 +1,16 @@
+package com.yunbao.common.bean;
+
+public class UserAreaBean extends BaseModel {
+    private String area;
+
+    public UserAreaBean() {
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+}

common/src/main/java/com/yunbao/common/bean/UserBean.java

@@ -50,7 +50,7 @@ public class UserBean implements Parcelable {
     private String fans_pic;
     private String gifticon;
     private String department_name;
-    private String token_rong="";
+    private String token_rong = "";
     private String noble_end_time;
     private String slide;
     private String users_type;
@@ -66,6 +66,17 @@ public class UserBean implements Parcelable {
     private boolean randomPk;
     //随机天梯排位赛PK img，仅在主播PK时使用
     private String mRankPkImgUrl;
+    //是否填写完整资料
+    private int user_info_complete;
+
+    public int getUserInfoComplete() {
+        return user_info_complete;
+    }
+
+    public UserBean seUserInfoComplete(int userInfoComplete) {
+        this.user_info_complete = userInfoComplete;
+        return this;
+    }
 
     public boolean isRandomPk() {
         return randomPk;
@@ -117,8 +128,8 @@ public class UserBean implements Parcelable {
     }
 
     public String getIs_bind() {
-        if(StringUtil.isEmpty(is_bind)){
-            is_bind="0";
+        if (StringUtil.isEmpty(is_bind)) {
+            is_bind = "0";
         }
         return is_bind;
     }
@@ -489,7 +500,7 @@ public class UserBean implements Parcelable {
         if (this.liang != null) {
             String liangName = this.liang.getName();
             if (!TextUtils.isEmpty(liangName) && !"0".equals(liangName)) {
-//                return WordUtil.getString(R.string.live_liang) + ":" + liangName;
+//                returnmContext.getString(R.string.live_liang) + ":" + liangName;
                 return liangName;
             }
         }

common/src/main/java/com/yunbao/common/bean/WishListGiftConfModel.java

@@ -0,0 +1,46 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 心愿单礼物配置
+ */
+public class WishListGiftConfModel extends BaseModel {
+
+    @SerializedName("giftList")
+    private List<GiftListModel> giftList = new ArrayList<>();
+    @SerializedName("guardList")
+    private List<GiftListModel> guardList = new ArrayList<>();
+    @SerializedName("nobleList")
+    private List<GiftListModel> nobleList = new ArrayList<>();
+
+    public List<GiftListModel> getGiftList() {
+        return giftList;
+    }
+
+    public WishListGiftConfModel setGiftList(List<GiftListModel> giftList) {
+        this.giftList = giftList;
+        return this;
+    }
+
+    public List<GiftListModel> getGuardList() {
+        return guardList;
+    }
+
+    public WishListGiftConfModel setGuardList(List<GiftListModel> guardList) {
+        this.guardList = guardList;
+        return this;
+    }
+
+    public List<GiftListModel> getNobleList() {
+        return nobleList;
+    }
+
+    public WishListGiftConfModel setNobleList(List<GiftListModel> nobleList) {
+        this.nobleList = nobleList;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/bean/WishListModel.java

@@ -2,11 +2,12 @@ package com.yunbao.common.bean;
 
 import com.google.gson.annotations.SerializedName;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class WishListModel extends BaseModel {
-    @SerializedName("wishList")
-    private List<WishModel> wishList;
+    @SerializedName(value = "wishList",alternate = {"wishlist"})
+    private List<WishModel> wishList = new ArrayList<>();
     @SerializedName("img")
     private String img;
 

common/src/main/java/com/yunbao/common/bean/WishListModel2.java

@@ -0,0 +1,31 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class WishListModel2 extends BaseModel {
+
+    @SerializedName("wishlist")
+    private List<List<WishModel>> wishlist;
+    @SerializedName("img")
+    private String img;
+
+    public List<List<WishModel>> getWishlist() {
+        return wishlist;
+    }
+
+    public WishListModel2 setWishlist(List<List<WishModel>> wishlist) {
+        this.wishlist = wishlist;
+        return this;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public WishListModel2 setImg(String img) {
+        this.img = img;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/bean/WishModel.java

@@ -1,5 +1,6 @@
 package com.yunbao.common.bean;
 
+import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
 public class WishModel extends BaseModel {
@@ -22,6 +23,23 @@ public class WishModel extends BaseModel {
     private String wishlistName;
     @SerializedName("create_time")
     private String createTime;
+    @SerializedName("type")
+    private int type;
+    @SerializedName("gift_type")
+    private int giftType;
+    @SerializedName("price")
+    private int price;
+    @Expose(serialize = false)
+    private int isShow = -1;
+
+    public int getIsShow() {
+        return isShow;
+    }
+
+    public WishModel setIsShow(int isShow) {
+        this.isShow = isShow;
+        return this;
+    }
 
     public String getId() {
         return id;
@@ -103,4 +121,51 @@ public class WishModel extends BaseModel {
         this.createTime = createTime;
         return this;
     }
+
+    public int getType() {
+        return type;
+    }
+
+    public WishModel setType(int type) {
+        this.type = type;
+        return this;
+    }
+
+    public int getGiftType() {
+        return giftType;
+    }
+
+    public WishModel setGiftType(int giftType) {
+        this.giftType = giftType;
+        return this;
+    }
+
+    public int getPrice() {
+        return price;
+    }
+
+    public WishModel setPrice(int price) {
+        this.price = price;
+        return this;
+    }
+
+    public int wishProgress() {
+        int progress = 0;
+        try {
+            progress = Integer.parseInt(wishlistNum);
+        } catch (NumberFormatException e) {
+            progress = 0;
+        }
+        return progress;
+    }
+
+    public int wishCurrent() {
+        int current = 0;
+        try {
+            current = Integer.parseInt(wishlistProgress);
+        } catch (NumberFormatException e) {
+            current = 0;
+        }
+        return current;
+    }
 }

common/src/main/java/com/yunbao/common/bean/WishModel2.java

@@ -0,0 +1,160 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class WishModel2 extends BaseModel {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("dtime")
+    private String dtime;
+    @SerializedName("luid")
+    private String luid;
+    @SerializedName("lid")
+    private String lid;
+    @SerializedName("wishlist_icon")
+    private String wishlistIcon;
+    @SerializedName("wishlist_num")
+    private String wishlistNum;
+    @SerializedName("wishlist_progress")
+    private String wishlistProgress;
+    @SerializedName("wishlist_name")
+    private String wishlistName;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("type")
+    private int type;
+    @SerializedName("gift_type")
+    private int giftType;
+    @SerializedName("price")
+    private int price;
+
+    public String getId() {
+        return id;
+    }
+
+    public WishModel2 setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getDtime() {
+        return dtime;
+    }
+
+    public WishModel2 setDtime(String dtime) {
+        this.dtime = dtime;
+        return this;
+    }
+
+    public String getLuid() {
+        return luid;
+    }
+
+    public WishModel2 setLuid(String luid) {
+        this.luid = luid;
+        return this;
+    }
+
+    public String getLid() {
+        return lid;
+    }
+
+    public WishModel2 setLid(String lid) {
+        this.lid = lid;
+        return this;
+    }
+
+    public String getWishlistIcon() {
+        return wishlistIcon;
+    }
+
+    public WishModel2 setWishlistIcon(String wishlistIcon) {
+        this.wishlistIcon = wishlistIcon;
+        return this;
+    }
+
+    public String getWishlistNum() {
+        return wishlistNum;
+    }
+
+    public WishModel2 setWishlistNum(String wishlistNum) {
+        this.wishlistNum = wishlistNum;
+        return this;
+    }
+
+    public String getWishlistProgress() {
+        return wishlistProgress;
+    }
+
+    public WishModel2 setWishlistProgress(String wishlistProgress) {
+        this.wishlistProgress = wishlistProgress;
+        return this;
+    }
+
+    public String getWishlistName() {
+        return wishlistName;
+    }
+
+    public WishModel2 setWishlistName(String wishlistName) {
+        this.wishlistName = wishlistName;
+        return this;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public WishModel2 setCreateTime(String createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public WishModel2 setType(int type) {
+        this.type = type;
+        return this;
+    }
+
+    public int getGiftType() {
+        return giftType;
+    }
+
+    public WishModel2 setGiftType(int giftType) {
+        this.giftType = giftType;
+        return this;
+    }
+
+    public int getPrice() {
+        return price;
+    }
+
+    public WishModel2 setPrice(int price) {
+        this.price = price;
+        return this;
+    }
+
+    public int wishProgress() {
+        int progress = 0;
+        try {
+            progress = Integer.parseInt(wishlistNum);
+        } catch (NumberFormatException e) {
+            progress = 0;
+        }
+        return progress;
+    }
+
+    public int wishCurrent() {
+        int current = 0;
+        try {
+            current = Integer.parseInt(wishlistProgress);
+        } catch (NumberFormatException e) {
+            current = 0;
+        }
+        return current;
+    }
+}

common/src/main/java/com/yunbao/common/bean/XydCompleteModel.java

@@ -0,0 +1,338 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class XydCompleteModel extends BaseModel {
+
+
+    @SerializedName("_method_")
+    private String method;
+    @SerializedName("action")
+    private String action;
+    @SerializedName("msgtype")
+    private String msgtype;
+    @SerializedName("level")
+    private int level;
+    @SerializedName("uname")
+    private String uname;
+    @SerializedName("uid")
+    private String uid;
+    @SerializedName("uhead")
+    private String uhead;
+    @SerializedName("evensend")
+    private String evensend;
+    @SerializedName("liangname")
+    private String liangname;
+    @SerializedName("vip_type")
+    private String vipType;
+    @SerializedName("svg")
+    private String svg;
+    @SerializedName("ancherName")
+    private String ancherName;
+    @SerializedName("userName")
+    private String userName;
+    @SerializedName("medal_name")
+    private String medalName;
+    @SerializedName("medal_level")
+    private String medalLevel;
+    @SerializedName("guard_type")
+    private String guardType;
+    @SerializedName("medal")
+    private String medal;
+    @SerializedName("medal_honor")
+    private String medalHonor;
+    @SerializedName("good_num")
+    private int goodNum;
+    @SerializedName("roomnum")
+    private String roomnum;
+    @SerializedName("msg")
+    private String msg;
+    @SerializedName("liveId")
+    private String liveId;
+    @SerializedName("swf")
+    private String swf;
+    @SerializedName("swftime")
+    private String swftime;
+    @SerializedName("swftype")
+    private int swftype;
+    @SerializedName("type")
+    private int type;
+    @SerializedName("giftname")
+    private String giftname;
+    @SerializedName("equipment")
+    private String equipment;
+    @SerializedName("bubble")
+    private String bubble;
+    @SerializedName("xydgiftname")
+    private String xydgiftname;
+
+    public String getXydgiftname() {
+        return xydgiftname;
+    }
+
+    public XydCompleteModel setXydgiftname(String xydgiftname) {
+        this.xydgiftname = xydgiftname;
+        return this;
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public XydCompleteModel setMethod(String method) {
+        this.method = method;
+        return this;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public XydCompleteModel setAction(String action) {
+        this.action = action;
+        return this;
+    }
+
+    public String getMsgtype() {
+        return msgtype;
+    }
+
+    public XydCompleteModel setMsgtype(String msgtype) {
+        this.msgtype = msgtype;
+        return this;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public XydCompleteModel setLevel(int level) {
+        this.level = level;
+        return this;
+    }
+
+    public String getUname() {
+        return uname;
+    }
+
+    public XydCompleteModel setUname(String uname) {
+        this.uname = uname;
+        return this;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public XydCompleteModel setUid(String uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public String getUhead() {
+        return uhead;
+    }
+
+    public XydCompleteModel setUhead(String uhead) {
+        this.uhead = uhead;
+        return this;
+    }
+
+    public String getEvensend() {
+        return evensend;
+    }
+
+    public XydCompleteModel setEvensend(String evensend) {
+        this.evensend = evensend;
+        return this;
+    }
+
+    public String getLiangname() {
+        return liangname;
+    }
+
+    public XydCompleteModel setLiangname(String liangname) {
+        this.liangname = liangname;
+        return this;
+    }
+
+    public String getVipType() {
+        return vipType;
+    }
+
+    public XydCompleteModel setVipType(String vipType) {
+        this.vipType = vipType;
+        return this;
+    }
+
+    public String getSvg() {
+        return svg;
+    }
+
+    public XydCompleteModel setSvg(String svg) {
+        this.svg = svg;
+        return this;
+    }
+
+    public String getAncherName() {
+        return ancherName;
+    }
+
+    public XydCompleteModel setAncherName(String ancherName) {
+        this.ancherName = ancherName;
+        return this;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public XydCompleteModel setUserName(String userName) {
+        this.userName = userName;
+        return this;
+    }
+
+    public String getMedalName() {
+        return medalName;
+    }
+
+    public XydCompleteModel setMedalName(String medalName) {
+        this.medalName = medalName;
+        return this;
+    }
+
+    public String getMedalLevel() {
+        return medalLevel;
+    }
+
+    public XydCompleteModel setMedalLevel(String medalLevel) {
+        this.medalLevel = medalLevel;
+        return this;
+    }
+
+    public String getGuardType() {
+        return guardType;
+    }
+
+    public XydCompleteModel setGuardType(String guardType) {
+        this.guardType = guardType;
+        return this;
+    }
+
+    public String getMedal() {
+        return medal;
+    }
+
+    public XydCompleteModel setMedal(String medal) {
+        this.medal = medal;
+        return this;
+    }
+
+    public String getMedalHonor() {
+        return medalHonor;
+    }
+
+    public XydCompleteModel setMedalHonor(String medalHonor) {
+        this.medalHonor = medalHonor;
+        return this;
+    }
+
+    public int getGoodNum() {
+        return goodNum;
+    }
+
+    public XydCompleteModel setGoodNum(int goodNum) {
+        this.goodNum = goodNum;
+        return this;
+    }
+
+    public String getRoomnum() {
+        return roomnum;
+    }
+
+    public XydCompleteModel setRoomnum(String roomnum) {
+        this.roomnum = roomnum;
+        return this;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public XydCompleteModel setMsg(String msg) {
+        this.msg = msg;
+        return this;
+    }
+
+    public String getLiveId() {
+        return liveId;
+    }
+
+    public XydCompleteModel setLiveId(String liveId) {
+        this.liveId = liveId;
+        return this;
+    }
+
+    public String getSwf() {
+        return swf;
+    }
+
+    public XydCompleteModel setSwf(String swf) {
+        this.swf = swf;
+        return this;
+    }
+
+    public String getSwftime() {
+        return swftime;
+    }
+
+    public XydCompleteModel setSwftime(String swftime) {
+        this.swftime = swftime;
+        return this;
+    }
+
+    public int getSwftype() {
+        return swftype;
+    }
+
+    public XydCompleteModel setSwftype(int swftype) {
+        this.swftype = swftype;
+        return this;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public XydCompleteModel setType(int type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getGiftname() {
+        return giftname;
+    }
+
+    public XydCompleteModel setGiftname(String giftname) {
+        this.giftname = giftname;
+        return this;
+    }
+
+    public String getEquipment() {
+        return equipment;
+    }
+
+    public XydCompleteModel setEquipment(String equipment) {
+        this.equipment = equipment;
+        return this;
+    }
+
+    public String getBubble() {
+        return bubble;
+    }
+
+    public XydCompleteModel setBubble(String bubble) {
+        this.bubble = bubble;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/dialog/AbsDialogPopupWindow.java

@@ -16,6 +16,9 @@ public abstract class AbsDialogPopupWindow extends BottomPopupView {
         this.mContext = context;
     }
 
+    /**
+     * <a href="https://github.com/li-xiaojun/XPopup/wiki/5.-%E5%B8%B8%E7%94%A8%E8%AE%BE%E7%BD%AE">参考配置</a>
+     */
     public abstract void buildDialog(XPopup.Builder builder);
     public abstract int bindLayoutId();
 
@@ -27,6 +30,7 @@ public abstract class AbsDialogPopupWindow extends BottomPopupView {
     public void showDialog() {
         XPopup.Builder builder = new XPopup.Builder(mContext);
         builder.isDestroyOnDismiss(true);
+        builder.enableDrag(false);
         buildDialog(builder);
         builder.asCustom(this).show();
     }

common/src/main/java/com/yunbao/common/dialog/LiveChargeDialogFragment.java

@@ -138,8 +138,8 @@ public class LiveChargeDialogFragment extends AbsDialogFragment implements View.
     private void showMoney(CoinBean bean) {
         mCheckedCoinBean = bean;
         if (mCheckedCoinBean != null && mBtnCharge != null) {
-//            mBtnCharge.setText(String.format(WordUtil.getString(R.string.chat_charge_tip), mCheckedCoinBean.getMoney()));
-            mBtnCharge.setText(String.format(WordUtil.getString(R.string.chat_charge_tip)));
+//            mBtnCharge.setText(String.format(mContext.getString(R.string.chat_charge_tip), mCheckedCoinBean.getMoney()));
+            mBtnCharge.setText(String.format(mContext.getString(R.string.chat_charge_tip)));
         }
     }
 

common/src/main/java/com/yunbao/common/dialog/LiveFontSizeSettingDialog.java

@@ -0,0 +1,125 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.PopupMenu;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.XPopup;
+import com.yunbao.common.R;
+import com.yunbao.common.dialog.AbsDialogPopupWindow;
+import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import org.greenrobot.eventbus.EventBus;
+
+public class LiveFontSizeSettingDialog extends AbsDialogPopupWindow {
+    public static final int FONT_LOW = -1;
+    public static final int FONT_DEF = 0;
+    public static final int FONT_HIGH = 1;
+    private int type = FONT_DEF;
+    private OnItemClickListener<Integer> onItemClickListener;
+
+    private RelativeLayout lineSd, lineHd, lineFhd;
+    private ImageView iconSd, iconHd, iconFhd;
+    private TextView titleSDText, titleHDText, titleFHDText;
+    private View submit;
+
+
+    public LiveFontSizeSettingDialog(@NonNull Context context, int type) {
+        super(context);
+        if (type == 10) {
+            this.type = FONT_LOW;
+        } else if (type == 16) {
+            this.type = FONT_HIGH;
+        } else {
+            this.type = FONT_DEF;
+        }
+    }
+
+    public LiveFontSizeSettingDialog(@NonNull Context context) {
+        super(context);
+    }
+
+    public LiveFontSizeSettingDialog setOnItemClickListener(OnItemClickListener<Integer> onItemClickListener) {
+        this.onItemClickListener = onItemClickListener;
+        return this;
+    }
+
+    @Override
+    public void buildDialog(XPopup.Builder builder) {
+
+    }
+
+    @Override
+    public int bindLayoutId() {
+        return R.layout.dialog_live_font_size;
+    }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        lineSd = findViewById(R.id.line_sd);
+        lineHd = findViewById(R.id.line_hd);
+        lineFhd = findViewById(R.id.line_fhd);
+        submit = findViewById(R.id.submit);
+        iconSd = findViewById(R.id.icon_sd);
+        iconHd = findViewById(R.id.icon_hd);
+        iconFhd = findViewById(R.id.icon_fhd);
+        titleSDText = findViewById(R.id.sd_text);
+        titleHDText = findViewById(R.id.hd_text);
+        titleFHDText = findViewById(R.id.fhd_text);
+        ViewClicksAntiShake.clicksAntiShake(lineSd, () -> {
+            type = FONT_LOW;
+            updateUi();
+        });
+        ViewClicksAntiShake.clicksAntiShake(lineHd, () -> {
+            type = FONT_DEF;
+            updateUi();
+        });
+        ViewClicksAntiShake.clicksAntiShake(lineFhd, () -> {
+            type = FONT_HIGH;
+            updateUi();
+        });
+        ViewClicksAntiShake.clicksAntiShake(submit, () -> {
+            int fontSize = 13;
+            if (type == FONT_LOW) {
+                fontSize = 10;
+            } else if (type == FONT_HIGH) {
+                fontSize = 16;
+            }
+            onItemClickListener.onItemClick(fontSize, 0);
+            dismiss();
+        });
+        updateUi();
+    }
+
+    private void updateUi() {
+        if (type == FONT_DEF) {
+            iconSd.setVisibility(GONE);
+            iconFhd.setVisibility(GONE);
+            iconHd.setVisibility(VISIBLE);
+            updateUiTextSize(13);
+        } else if (type == FONT_LOW) {
+            iconHd.setVisibility(GONE);
+            iconFhd.setVisibility(GONE);
+            iconSd.setVisibility(VISIBLE);
+            updateUiTextSize(10);
+        } else {
+            iconSd.setVisibility(GONE);
+            iconHd.setVisibility(GONE);
+            iconFhd.setVisibility(VISIBLE);
+            updateUiTextSize(16);
+        }
+    }
+
+    private void updateUiTextSize(int font) {
+        titleSDText.setTextSize(font);
+        titleHDText.setTextSize(font);
+        titleFHDText.setTextSize(font);
+    }
+}

common/src/main/java/com/yunbao/common/dialog/MessageLongClickPopuwindow.java

@@ -28,7 +28,6 @@ import io.rong.message.RecallNotificationMessage;
 import io.rong.message.TextMessage;
 
 import static android.content.Context.CLIPBOARD_SERVICE;
-import static com.yunbao.common.utils.WordUtil.getString;
 
 /**
  * 消息長按彈窗
@@ -123,7 +122,7 @@ public class MessageLongClickPopuwindow implements View.OnClickListener {
             ClipboardManager cm = (ClipboardManager) mContext.getSystemService(CLIPBOARD_SERVICE);
             ClipData clipData = ClipData.newPlainText("text", content);
             cm.setPrimaryClip(clipData);
-            ToastUtil.show(getString(R.string.copy_success));
+            ToastUtil.show(mContext.getString(R.string.copy_success));
 
         }
     }
@@ -135,7 +134,7 @@ public class MessageLongClickPopuwindow implements View.OnClickListener {
         IMCenter.getInstance().recallMessage(message, "撤回成功", new RongIMClient.ResultCallback<RecallNotificationMessage>() {
             @Override
             public void onSuccess(RecallNotificationMessage recallNotificationMessage) {
-                ToastUtil.show(getString(R.string.withdraw_success));
+                ToastUtil.show(mContext.getString(R.string.withdraw_success));
                 //删除草稿信息
                 IMCenter.getInstance().clearTextMessageDraft(message.getConversationType(), message.getTargetId(), null);
             }

common/src/main/java/com/yunbao/common/event/AllServerNotifyEvent.java

@@ -0,0 +1,142 @@
+package com.yunbao.common.event;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.bean.BaseModel;
+
+public class AllServerNotifyEvent extends BaseModel {
+    //礼物图标
+    @SerializedName("gifticon")
+    private String giftIcon;
+    //用户名
+    @SerializedName("userNiceName")
+    private String userNiceName;
+    //礼物名称
+    @SerializedName("giftname")
+    private String giftName;
+    //盲盒名称
+    @SerializedName("box_type_name")
+    private String boxTypeName;
+    //饰品名称
+    @SerializedName("dress_name")
+    private String dressName;
+    //区分礼物还是饰品 lw 1 sp 0
+    @SerializedName("gift_notification")
+    private String giftNotification;
+    //盲盒礼物ID
+    @SerializedName("blind_box_id")
+    private String blindBoxId;
+    //盲盒类型
+    @SerializedName("box_type")
+    private String boxType;
+    //饰品图片
+    @SerializedName("display_src")
+    private String displaySrc;
+    //主播名字
+    @SerializedName("ancherName")
+    private String anchorName;
+
+    public String getAnchorName() {
+        return anchorName;
+    }
+
+    public AllServerNotifyEvent setAnchorName(String anchorName) {
+        this.anchorName = anchorName;
+        return this;
+    }
+
+    public String getDisplaySrc() {
+        return displaySrc;
+    }
+
+    public AllServerNotifyEvent setDisplaySrc(String displaySrc) {
+        this.displaySrc = displaySrc;
+        return this;
+    }
+
+    public String getBoxType() {
+        return boxType;
+    }
+
+    public AllServerNotifyEvent setBoxType(String boxType) {
+        this.boxType = boxType;
+        return this;
+    }
+
+    public String getGiftIcon() {
+        return giftIcon;
+    }
+
+    public AllServerNotifyEvent setGiftIcon(String giftIcon) {
+        this.giftIcon = giftIcon;
+        return this;
+    }
+
+    public String getUserNiceName() {
+        return userNiceName;
+    }
+
+    public AllServerNotifyEvent setUserNiceName(String userNiceName) {
+        this.userNiceName = userNiceName;
+        return this;
+    }
+
+    public String getGiftName() {
+        return giftName;
+    }
+
+    public AllServerNotifyEvent setGiftName(String giftName) {
+        this.giftName = giftName;
+        return this;
+    }
+
+    public String getBoxTypeName() {
+        return boxTypeName;
+    }
+
+    public AllServerNotifyEvent setBoxTypeName(String boxTypeName) {
+        this.boxTypeName = boxTypeName;
+        return this;
+    }
+
+    public String getDressName() {
+        return dressName;
+    }
+
+    public AllServerNotifyEvent setDressName(String dressName) {
+        this.dressName = dressName;
+        return this;
+    }
+
+    public String getGiftNotification() {
+        return giftNotification;
+    }
+
+    public AllServerNotifyEvent setGiftNotification(String giftNotification) {
+        this.giftNotification = giftNotification;
+        return this;
+    }
+
+    public String getBlindBoxId() {
+        return blindBoxId;
+    }
+
+    public AllServerNotifyEvent setBlindBoxId(String blindBoxId) {
+        this.blindBoxId = blindBoxId;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "\n" + "AllServerNotifyEvent{" + "\n" +
+                "giftIcon='" + giftIcon + '\'' + "\n" +
+                ", userNiceName='" + userNiceName + '\'' + "\n" +
+                ", giftName='" + giftName + '\'' + "\n" +
+                ", boxTypeName='" + boxTypeName + '\'' + "\n" +
+                ", dressName='" + dressName + '\'' + "\n" +
+                ", giftNotification='" + giftNotification + '\'' + "\n" +
+                ", blindBoxId='" + blindBoxId + '\'' + "\n" +
+                ", boxType='" + boxType + '\'' + "\n" +
+                ", displaySrc='" + displaySrc + '\'' + "\n" +
+                '}' + "\n" ;
+    }
+}

common/src/main/java/com/yunbao/common/event/CompleteInformationEvent.java

@@ -0,0 +1,16 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class CompleteInformationEvent extends BaseModel {
+    private boolean completeInformation = false;
+
+    public boolean isCompleteInformation() {
+        return completeInformation;
+    }
+
+    public CompleteInformationEvent setCompleteInformation(boolean completeInformation) {
+        this.completeInformation = completeInformation;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java

@@ -21,6 +21,31 @@ public class CustomDrawerPopupEvent extends BaseModel {
     private boolean reportLayout = false;
     //刷新
     private boolean refresh = false;
+    //特效設置
+    private boolean effects = false;
+    //小窗播放
+    private boolean smallWindow = false;
+    //畫質選擇
+    private boolean qualitySelection = false;
+    private boolean fontSize = false;
+
+    public boolean isSmallWindow() {
+        return smallWindow;
+    }
+
+    public CustomDrawerPopupEvent setSmallWindow(boolean smallWindow) {
+        this.smallWindow = smallWindow;
+        return this;
+    }
+
+    public boolean isQualitySelection() {
+        return qualitySelection;
+    }
+
+    public CustomDrawerPopupEvent setQualitySelection(boolean qualitySelection) {
+        this.qualitySelection = qualitySelection;
+        return this;
+    }
 
     public boolean isRefresh() {
         return refresh;
@@ -102,4 +127,22 @@ public class CustomDrawerPopupEvent extends BaseModel {
         isDisMiss = disMiss;
         return this;
     }
+
+    public boolean isEffects() {
+        return effects;
+    }
+
+    public CustomDrawerPopupEvent setEffects(boolean effects) {
+        this.effects = effects;
+        return this;
+    }
+
+    public boolean isFontSize() {
+        return fontSize;
+    }
+
+    public CustomDrawerPopupEvent setFontSize(boolean fontSize) {
+        this.fontSize = fontSize;
+        return this;
+    }
 }

common/src/main/java/com/yunbao/common/event/LiveNewWishGiftEvent.java

@@ -0,0 +1,17 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.GiftListModel;
+
+public class LiveNewWishGiftEvent extends BaseModel {
+    private GiftListModel model;
+
+    public GiftListModel getModel() {
+        return model;
+    }
+
+    public LiveNewWishGiftEvent setModel(GiftListModel model) {
+        this.model = model;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/event/LiveNewWishListCloseEvent.java

@@ -0,0 +1,46 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class LiveNewWishListCloseEvent extends BaseModel {
+    private boolean dayWish = false;
+    private boolean zhouXin = false;
+    private boolean lunarWish = false;
+    private boolean seasonalWish = false;
+
+    public boolean isDayWish() {
+        return dayWish;
+    }
+
+    public LiveNewWishListCloseEvent setDayWish(boolean dayWish) {
+        this.dayWish = dayWish;
+        return this;
+    }
+
+    public boolean isZhouXin() {
+        return zhouXin;
+    }
+
+    public LiveNewWishListCloseEvent setZhouXin(boolean zhouXin) {
+        this.zhouXin = zhouXin;
+        return this;
+    }
+
+    public boolean isLunarWish() {
+        return lunarWish;
+    }
+
+    public LiveNewWishListCloseEvent setLunarWish(boolean lunarWish) {
+        this.lunarWish = lunarWish;
+        return this;
+    }
+
+    public boolean isSeasonalWish() {
+        return seasonalWish;
+    }
+
+    public LiveNewWishListCloseEvent setSeasonalWish(boolean seasonalWish) {
+        this.seasonalWish = seasonalWish;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/event/LiveNewWishListEvent.java

@@ -0,0 +1,28 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.GiftListModel;
+
+public class LiveNewWishListEvent extends BaseModel {
+    private GiftListModel model;
+    private int type = 0;
+
+
+    public int getType() {
+        return type;
+    }
+
+    public LiveNewWishListEvent setType(int type) {
+        this.type = type;
+        return this;
+    }
+
+    public GiftListModel getModel() {
+        return model;
+    }
+
+    public LiveNewWishListEvent setModel(GiftListModel model) {
+        this.model = model;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/event/PopupViewDismissEvent.java

@@ -0,0 +1,6 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class PopupViewDismissEvent extends BaseModel {
+}

common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java

@@ -0,0 +1,559 @@
+package com.yunbao.common.event;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.bean.BaseModel;
+
+public class SendBlindGiftEvent extends BaseModel {
+
+    @SerializedName("uid")
+    private String uid;
+    @SerializedName("giftid")
+    private String giftid;
+    @SerializedName("type")
+    private String type;
+    @SerializedName("mark")
+    private String mark;
+    @SerializedName("wrap_gift_num")
+    private String wrapGiftNum;
+    @SerializedName("giftcount")
+    private String giftcount;
+    @SerializedName("totalcoin")
+    private String totalcoin;
+    @SerializedName("giftname")
+    private String giftname;
+    @SerializedName("giftnameen")
+    private String giftnameen;
+    @SerializedName("gifticon")
+    private String gifticon;
+    @SerializedName("swftime")
+    private String swftime;
+    @SerializedName("swftype")
+    private String swftype;
+    @SerializedName("swf")
+    private String swf;
+    @SerializedName("level")
+    private String level;
+    @SerializedName("medal_name")
+    private String medalName;
+    @SerializedName("medal_level")
+    private String medalLevel;
+    @SerializedName("coin")
+    private String coin;
+    @SerializedName("gold")
+    private String gold;
+    @SerializedName("votestotal")
+    private String votestotal;
+    @SerializedName("medalRankNum")
+    private String medalRankNum;
+    @SerializedName("ispk")
+    private String ispk;
+    @SerializedName("pkuid")
+    private String pkuid;
+    @SerializedName("pkuid1")
+    private String pkuid1;
+    @SerializedName("pkuid2")
+    private String pkuid2;
+    @SerializedName("pktotal1")
+    private String pktotal1;
+    @SerializedName("pktotal2")
+    private String pktotal2;
+    @SerializedName("active_total")
+    private String activeTotal;
+    @SerializedName("blind_box_status")
+    private String blindBoxStatus;
+    @SerializedName("gift_id")
+    private String giftId;
+    @SerializedName("gift_type")
+    private String giftType;
+    @SerializedName("needcoin")
+    private String needcoin;
+    @SerializedName("gift_msg")
+    private String giftMsg;
+    @SerializedName("gift_colour")
+    private String giftColour;
+    @SerializedName("box_type")
+    private String boxType;
+    @SerializedName("box_type_name")
+    private String boxTypeName;
+    @SerializedName("action")
+    private String action;
+    @SerializedName("dress_notification")
+    private String dressNotification;
+    @SerializedName("dress_type")
+    private Object dressType;
+    @SerializedName("dress_id")
+    private Object dressId;
+    @SerializedName("dress_name")
+    private String dressName;
+    @SerializedName("display_src")
+    private Object displaySrc;
+    @SerializedName("effect_src")
+    private Object effectSrc;
+    @SerializedName("dress_description")
+    private Object dressDescription;
+    @SerializedName("noble_dress")
+    private Object nobleDress;
+    @SerializedName("dress_msg")
+    private String dressMsg;
+    @SerializedName("dress_colour")
+    private String dressColour;
+    @SerializedName("dress_threshold_value")
+    private String dressThresholdValue;
+    @SerializedName("threshold_value")
+    private String thresholdValue;
+    @SerializedName("live_gift_notify")
+    private String liveGiftNotify;
+    @SerializedName("userNiceName")
+    private String userNiceName;
+
+    public String getUserNiceName() {
+        return userNiceName;
+    }
+
+    public String getThresholdValue() {
+        return thresholdValue;
+    }
+
+    public SendBlindGiftEvent setThresholdValue(String thresholdValue) {
+        this.thresholdValue = thresholdValue;
+        return this;
+    }
+
+    public SendBlindGiftEvent setUserNiceName(String userNiceName) {
+        this.userNiceName = userNiceName;
+        return this;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public SendBlindGiftEvent setUid(String uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public String getGiftid() {
+        return giftid;
+    }
+
+    public SendBlindGiftEvent setGiftid(String giftid) {
+        this.giftid = giftid;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public SendBlindGiftEvent setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public SendBlindGiftEvent setMark(String mark) {
+        this.mark = mark;
+        return this;
+    }
+
+    public String getWrapGiftNum() {
+        return wrapGiftNum;
+    }
+
+    public SendBlindGiftEvent setWrapGiftNum(String wrapGiftNum) {
+        this.wrapGiftNum = wrapGiftNum;
+        return this;
+    }
+
+    public String getGiftcount() {
+        return giftcount;
+    }
+
+    public SendBlindGiftEvent setGiftcount(String giftcount) {
+        this.giftcount = giftcount;
+        return this;
+    }
+
+    public String getTotalcoin() {
+        return totalcoin;
+    }
+
+    public SendBlindGiftEvent setTotalcoin(String totalcoin) {
+        this.totalcoin = totalcoin;
+        return this;
+    }
+
+    public String getGiftname() {
+        return giftname;
+    }
+
+    public SendBlindGiftEvent setGiftname(String giftname) {
+        this.giftname = giftname;
+        return this;
+    }
+
+    public String getGiftnameen() {
+        return giftnameen;
+    }
+
+    public SendBlindGiftEvent setGiftnameen(String giftnameen) {
+        this.giftnameen = giftnameen;
+        return this;
+    }
+
+    public String getGifticon() {
+        return gifticon;
+    }
+
+    public SendBlindGiftEvent setGifticon(String gifticon) {
+        this.gifticon = gifticon;
+        return this;
+    }
+
+    public String getSwftime() {
+        return swftime;
+    }
+
+    public SendBlindGiftEvent setSwftime(String swftime) {
+        this.swftime = swftime;
+        return this;
+    }
+
+    public String getSwftype() {
+        return swftype;
+    }
+
+    public SendBlindGiftEvent setSwftype(String swftype) {
+        this.swftype = swftype;
+        return this;
+    }
+
+    public String getSwf() {
+        return swf;
+    }
+
+    public SendBlindGiftEvent setSwf(String swf) {
+        this.swf = swf;
+        return this;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public SendBlindGiftEvent setLevel(String level) {
+        this.level = level;
+        return this;
+    }
+
+    public String getMedalName() {
+        return medalName;
+    }
+
+    public SendBlindGiftEvent setMedalName(String medalName) {
+        this.medalName = medalName;
+        return this;
+    }
+
+    public String getMedalLevel() {
+        return medalLevel;
+    }
+
+    public SendBlindGiftEvent setMedalLevel(String medalLevel) {
+        this.medalLevel = medalLevel;
+        return this;
+    }
+
+    public String getCoin() {
+        return coin;
+    }
+
+    public SendBlindGiftEvent setCoin(String coin) {
+        this.coin = coin;
+        return this;
+    }
+
+    public String getGold() {
+        return gold;
+    }
+
+    public SendBlindGiftEvent setGold(String gold) {
+        this.gold = gold;
+        return this;
+    }
+
+    public String getVotestotal() {
+        return votestotal;
+    }
+
+    public SendBlindGiftEvent setVotestotal(String votestotal) {
+        this.votestotal = votestotal;
+        return this;
+    }
+
+    public String getMedalRankNum() {
+        return medalRankNum;
+    }
+
+    public SendBlindGiftEvent setMedalRankNum(String medalRankNum) {
+        this.medalRankNum = medalRankNum;
+        return this;
+    }
+
+    public String getIspk() {
+        return ispk;
+    }
+
+    public SendBlindGiftEvent setIspk(String ispk) {
+        this.ispk = ispk;
+        return this;
+    }
+
+    public String isPkuid() {
+        return pkuid;
+    }
+
+    public SendBlindGiftEvent setPkuid(String pkuid) {
+        this.pkuid = pkuid;
+        return this;
+    }
+
+    public String getPkuid1() {
+        return pkuid1;
+    }
+
+    public SendBlindGiftEvent setPkuid1(String pkuid1) {
+        this.pkuid1 = pkuid1;
+        return this;
+    }
+
+    public String getPkuid2() {
+        return pkuid2;
+    }
+
+    public SendBlindGiftEvent setPkuid2(String pkuid2) {
+        this.pkuid2 = pkuid2;
+        return this;
+    }
+
+    public String getPktotal1() {
+        return pktotal1;
+    }
+
+    public SendBlindGiftEvent setPktotal1(String pktotal1) {
+        this.pktotal1 = pktotal1;
+        return this;
+    }
+
+    public String getPktotal2() {
+        return pktotal2;
+    }
+
+    public SendBlindGiftEvent setPktotal2(String pktotal2) {
+        this.pktotal2 = pktotal2;
+        return this;
+    }
+
+    public String getActiveTotal() {
+        return activeTotal;
+    }
+
+    public SendBlindGiftEvent setActiveTotal(String activeTotal) {
+        this.activeTotal = activeTotal;
+        return this;
+    }
+
+    public String isBlindBoxStatus() {
+        return blindBoxStatus;
+    }
+
+    public SendBlindGiftEvent setBlindBoxStatus(String blindBoxStatus) {
+        this.blindBoxStatus = blindBoxStatus;
+        return this;
+    }
+
+    public String getGiftId() {
+        return giftId;
+    }
+
+    public SendBlindGiftEvent setGiftId(String giftId) {
+        this.giftId = giftId;
+        return this;
+    }
+
+    public String getGiftType() {
+        return giftType;
+    }
+
+    public SendBlindGiftEvent setGiftType(String giftType) {
+        this.giftType = giftType;
+        return this;
+    }
+
+    public String getNeedcoin() {
+        return needcoin;
+    }
+
+    public SendBlindGiftEvent setNeedcoin(String needcoin) {
+        this.needcoin = needcoin;
+        return this;
+    }
+
+    public String getGiftMsg() {
+        return giftMsg;
+    }
+
+    public SendBlindGiftEvent setGiftMsg(String giftMsg) {
+        this.giftMsg = giftMsg;
+        return this;
+    }
+
+
+    public String getGiftColour() {
+        return giftColour;
+    }
+
+    public SendBlindGiftEvent setGiftColour(String giftColour) {
+        this.giftColour = giftColour;
+        return this;
+    }
+
+    public String getBoxType() {
+        return boxType;
+    }
+
+    public SendBlindGiftEvent setBoxType(String boxType) {
+        this.boxType = boxType;
+        return this;
+    }
+
+    public String getBoxTypeName() {
+        return boxTypeName;
+    }
+
+    public SendBlindGiftEvent setBoxTypeName(String boxTypeName) {
+        this.boxTypeName = boxTypeName;
+        return this;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public SendBlindGiftEvent setAction(String action) {
+        this.action = action;
+        return this;
+    }
+
+    public String isDressNotification() {
+        return dressNotification;
+    }
+
+    public SendBlindGiftEvent setDressNotification(String dressNotification) {
+        this.dressNotification = dressNotification;
+        return this;
+    }
+
+    public Object getDressType() {
+        return dressType;
+    }
+
+    public SendBlindGiftEvent setDressType(Object dressType) {
+        this.dressType = dressType;
+        return this;
+    }
+
+    public Object getDressId() {
+        return dressId;
+    }
+
+    public SendBlindGiftEvent setDressId(Object dressId) {
+        this.dressId = dressId;
+        return this;
+    }
+
+    public String getDressName() {
+        return dressName;
+    }
+
+    public SendBlindGiftEvent setDressName(String dressName) {
+        this.dressName = dressName;
+        return this;
+    }
+
+    public Object getDisplaySrc() {
+        return displaySrc;
+    }
+
+    public SendBlindGiftEvent setDisplaySrc(Object displaySrc) {
+        this.displaySrc = displaySrc;
+        return this;
+    }
+
+    public Object getEffectSrc() {
+        return effectSrc;
+    }
+
+    public SendBlindGiftEvent setEffectSrc(Object effectSrc) {
+        this.effectSrc = effectSrc;
+        return this;
+    }
+
+    public Object getDressDescription() {
+        return dressDescription;
+    }
+
+    public SendBlindGiftEvent setDressDescription(Object dressDescription) {
+        this.dressDescription = dressDescription;
+        return this;
+    }
+
+    public Object getNobleDress() {
+        return nobleDress;
+    }
+
+    public SendBlindGiftEvent setNobleDress(Object nobleDress) {
+        this.nobleDress = nobleDress;
+        return this;
+    }
+
+    public String getDressMsg() {
+        return dressMsg;
+    }
+
+    public SendBlindGiftEvent setDressMsg(String dressMsg) {
+        this.dressMsg = dressMsg;
+        return this;
+    }
+
+    public String getDressColour() {
+        return dressColour;
+    }
+
+    public SendBlindGiftEvent setDressColour(String dressColour) {
+        this.dressColour = dressColour;
+        return this;
+    }
+
+    public String getDressThresholdValue() {
+        return dressThresholdValue;
+    }
+
+    public SendBlindGiftEvent setDressThresholdValue(String dressThresholdValue) {
+        this.dressThresholdValue = dressThresholdValue;
+        return this;
+    }
+
+    public String getLiveGiftNotify() {
+        return liveGiftNotify;
+    }
+
+    public SendBlindGiftEvent setLiveGiftNotify(String liveGiftNotify) {
+        this.liveGiftNotify = liveGiftNotify;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/fragment/LiveNewWishGiftFragment.java

@@ -0,0 +1,136 @@
+package com.yunbao.common.fragment;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.tabs.TabLayout;
+import com.shencoder.pagergridlayoutmanager.PagerGridLayoutManager;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.LiveNewWishGiftAdapter;
+import com.yunbao.common.bean.GiftListModel;
+import com.yunbao.common.utils.DpUtil;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class LiveNewWishGiftFragment extends BaseFragment {
+    private List<GiftListModel> giftListModels;
+    private RecyclerView giftList;
+    private LiveNewWishGiftAdapter liveNewWishGiftAdapter;
+    private TabLayout wishTab;
+
+    @Override
+    public View createView(LayoutInflater inflater, ViewGroup container) {
+        return inflater.inflate(R.layout.view_live_new_wish_gitf, container, false);
+    }
+
+    @Override
+    protected void initVariables(Bundle bundle) {
+        giftListModels = (List<GiftListModel>) bundle.getSerializable("GiftList");
+        for (GiftListModel model : giftListModels) {
+            Log.e("LiveNewWishGiftFragment", model.getName());
+        }
+//
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState, View contentView) {
+        wishTab = contentView.findViewById(R.id.wish_tab);
+        wishTab.setSelectedTabIndicatorColor(Color.TRANSPARENT);
+        wishTab.setFocusableInTouchMode(false);
+
+        //计算总页数
+        int pagerCount = giftListModels.size() / 8;
+        if (giftListModels.size() % 8 != 0) {
+            ++pagerCount;
+        }
+
+        if (pagerCount > 1) {
+            for (int i = 0; i < pagerCount; i++) {
+                TextView wishItem = (TextView) LayoutInflater.from(getContext()).inflate(R.layout.view_tablaout_wish_item, null, false);
+                TabLayout.Tab tab = wishTab.newTab().setCustomView(wishItem).setId(i);
+
+                wishTab.addTab(tab, i == 0);
+            }
+            ViewGroup tabs = (ViewGroup) wishTab.getChildAt(0);
+            //设置边距,tab宽
+            for (int i = 0; i < tabs.getChildCount(); i++) {
+                View tab = tabs.getChildAt(i);
+                LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) tab.getLayoutParams();
+                layoutParams.rightMargin = DpUtil.dp2px(5);
+                layoutParams.leftMargin = DpUtil.dp2px(5);
+                layoutParams.width = DpUtil.dp2px(6);
+                layoutParams.height = DpUtil.dp2px(6);
+                tab.setLayoutParams(layoutParams);
+                wishTab.requestLayout();
+            }
+            wishTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+                @Override
+                public void onTabSelected(TabLayout.Tab tab) {
+                    View customView = tab.getCustomView();
+                    customView.setSelected(true);
+                }
+
+                @Override
+                public void onTabUnselected(TabLayout.Tab tab) {
+                    View customView = tab.getCustomView();
+                    customView.setSelected(false);
+                }
+
+                @Override
+                public void onTabReselected(TabLayout.Tab tab) {
+
+                }
+            });
+        } else {
+            wishTab.setVisibility(View.GONE);
+        }
+
+        giftList = contentView.findViewById(R.id.gift_list);
+        liveNewWishGiftAdapter = new LiveNewWishGiftAdapter(giftListModels);
+        PagerGridLayoutManager layoutManager = new PagerGridLayoutManager( /*rows*/2,
+                /*columns*/ 4,
+                /*PagerGridLayoutManager.VERTICAL*/PagerGridLayoutManager.HORIZONTAL,
+                /*reverseLayout*/ false);
+        layoutManager.setHandlingSlidingConflictsEnabled(true);
+        giftList.setLayoutManager(layoutManager);
+        giftList.setAdapter(liveNewWishGiftAdapter);
+        layoutManager.setPagerChangedListener(new PagerGridLayoutManager.PagerChangedListener() {
+            @Override
+            public void onPagerCountChanged(int pagerCount) {
+                Log.e("LiveNewWishGiftFragment", "onPagerCountChanged-pagerCount:" + pagerCount);
+
+            }
+
+            @Override
+            public void onPagerIndexSelected(int prePagerIndex, int currentPagerIndex) {
+                Log.e("LiveNewWishGiftFragment", "onPagerIndexSelected-prePagerIndex " + prePagerIndex + ",currentPagerIndex:" + currentPagerIndex);
+                if (wishTab.getVisibility() == View.VISIBLE)
+                    wishTab.getTabAt(currentPagerIndex).select();
+
+
+            }
+        });
+    }
+
+    @Override
+    protected void loadData() {
+
+    }
+
+    public static LiveNewWishGiftFragment newInstance(List<GiftListModel> giftListModels) {
+        LiveNewWishGiftFragment searchRecommendFragment = new LiveNewWishGiftFragment();
+        Bundle bundle = new Bundle();
+        bundle.putSerializable("GiftList", (Serializable) giftListModels);
+        searchRecommendFragment.setArguments(bundle);
+        return searchRecommendFragment;
+    }
+}

common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java

@@ -0,0 +1,156 @@
+package com.yunbao.common.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.gson.Gson;
+import com.lxj.xpopup.XPopup;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.LiveNewWishAdapter;
+import com.yunbao.common.bean.WishListModel;
+import com.yunbao.common.bean.WishModel;
+import com.yunbao.common.bean.WishModel2;
+import com.yunbao.common.event.LiveNewWishListCloseEvent;
+import com.yunbao.common.event.PopupViewDismissEvent;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.LiveNewWishGiftPopup;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LiveNewWishListFragment extends BaseFragment {
+    private int type = 0;
+    private RecyclerView wishList;
+    private LiveNewWishAdapter liveNewWishAdapter;
+    private ImageView imageView2, tvDone;
+
+    @Override
+    public View createView(LayoutInflater layoutInflater, ViewGroup viewGroup) {
+        return layoutInflater.inflate(R.layout.view_live_new_wish, viewGroup, false);
+    }
+
+    @Override
+    protected void initVariables(Bundle bundle) {
+        type = bundle.getInt("type", 0);
+
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState, View contentView) {
+        wishList = contentView.findViewById(R.id.wish_list);
+        imageView2 = contentView.findViewById(R.id.imageView2);
+        tvDone = contentView.findViewById(R.id.tvDone);
+        liveNewWishAdapter = new LiveNewWishAdapter();
+        wishList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+        wishList.setAdapter(liveNewWishAdapter);
+        imageView2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                new XPopup.Builder(getContext())
+                        .enableDrag(false)
+                        .asCustom(new LiveNewWishGiftPopup(getActivity(), type))
+                        .show();
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(tvDone, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                saveWish();
+                Bus.get().post(new PopupViewDismissEvent());
+            }
+        });
+    }
+
+    @Override
+    protected void loadData() {
+        LiveNetManager.get(getContext()).getWishlistV2(type, new HttpCallback<WishListModel>() {
+            @Override
+            public void onSuccess(WishListModel data) {
+
+                liveNewWishAdapter.addData(data.getWishList(), type);
+            }
+
+            @Override
+            public void onError(String error) {
+                ToastUtil.show(R.string.net_error);
+            }
+        });
+    }
+
+    public static LiveNewWishListFragment newInstance(int type) {
+        LiveNewWishListFragment searchRecommendFragment = new LiveNewWishListFragment();
+        Bundle bundle = new Bundle();
+        bundle.putInt("type", type);
+
+        searchRecommendFragment.setArguments(bundle);
+        return searchRecommendFragment;
+    }
+
+    public void addGiftListModel(WishModel model) {
+        liveNewWishAdapter.addGiftListModel(model);
+    }
+
+    public void clearGiftListModel() {
+        List<WishModel> wishList = new ArrayList<>();
+        liveNewWishAdapter.addData(wishList, type);
+    }
+
+    public void saveWish() {
+        List<WishModel> wishList = liveNewWishAdapter.getWishList();
+        List<WishModel2> wishList2 = new ArrayList<>();
+        Gson gson = new Gson();
+        for (WishModel model : wishList) {
+            if (model!=null){
+                WishModel2 model2 = gson.fromJson(gson.toJson(model), WishModel2.class);
+                wishList2.add(model2);
+            }
+
+        }
+        if (wishList2.size() == 0) {
+            Bus.get().post(new PopupViewDismissEvent());
+        } else {
+            if (wishList2.size()>10){
+                ToastUtil.show(R.string.must_hint);
+                return;
+            }
+            LiveNetManager.get(getContext()).
+                    setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
+                        @Override
+                        public void onSuccess(String data) {
+
+                        }
+
+                        @Override
+                        public void onError(String error) {
+                            ToastUtil.show(R.string.net_error);
+                        }
+                    });
+            switch (type) {
+                case 1:
+                    Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
+                    break;
+                case 2:
+                    Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
+                    break;
+                case 3:
+                    Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
+                    break;
+                case 4:
+                    Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
+                    break;
+            }
+        }
+
+
+    }
+}

common/src/main/java/com/yunbao/common/http/API.java

@@ -44,7 +44,7 @@ public class API extends BaseApi {
     public PDLiveApi pdLiveApi(Context context) {
         if (null == pdLiveApi) {
             //实例化gson
-           pdLiveApi=createPDLiveApi(true);
+            pdLiveApi = createPDLiveApi(true, true);
         }
         return pdLiveApi;
     }
@@ -52,10 +52,23 @@ public class API extends BaseApi {
     /**
      * 创建新的PDLiveApi，兼容部分接口需要控制是否添加UID参数
      * 仅有需要不添加uid的接口使用，默认请用pdLiveApi()
+     *
      * @param isNeedUid 是否需要用户uid参数
      * @return PDLiveApi
      */
-    public PDLiveApi createPDLiveApi(boolean isNeedUid){
+    public PDLiveApi createPDLiveApi(boolean isNeedUid) {
+        return createPDLiveApi(isNeedUid, true);
+    }
+
+    /**
+     * 创建新的PDLiveApi，兼容部分接口需要控制是否添加UID参数
+     * 仅有需要不添加uid或token的接口使用，默认请用pdLiveApi()
+     *
+     * @param isNeedUid   是否需要用户uid参数
+     * @param isNeedToken 是否需要用户Token
+     * @return PDLiveApi
+     */
+    public PDLiveApi createPDLiveApi(boolean isNeedUid, boolean isNeedToken) {
         Gson gson = new GsonBuilder()
                 .registerTypeAdapter(Date.class, new DateTypeAdapter())
                 .create();
@@ -64,20 +77,20 @@ public class API extends BaseApi {
         OkHttpClient.Builder builder = new OkHttpClient()
                 .newBuilder()
 
-                .addInterceptor(initQuery(isNeedUid,CommonAppContext.sInstance.getApplicationContext()))
+                .addInterceptor(initQuery(isNeedUid, isNeedToken, CommonAppContext.sInstance.getApplicationContext()))
                 .addInterceptor(loggingInterceptor);
         return create(builder.build(),
                 GsonConverterFactory.create(gson), RxJava2CallAdapterFactory.create(), CommonAppConfig.HOST, PDLiveApi.class);
     }
 
     //公共参数
-    public Interceptor initQuery(boolean isNeedUid,final Context context) {
+    public Interceptor initQuery(boolean isNeedUid, boolean isNeedToken, final Context context) {
         Interceptor addQueryParameterInterceptor = new Interceptor() {
             @Override
             public Response intercept(Chain chain) throws IOException {
                 Request request = chain.request();
                 //配置公共参数
-                request = new ParamsContext(request, context).getInRequest(isNeedUid);
+                request = new ParamsContext(request, context).getInRequest(isNeedUid, isNeedToken);
                 return chain.proceed(request);
             }
         };

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -1,5 +1,6 @@
 package com.yunbao.common.http;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.os.Build;
 import android.util.Log;
@@ -19,7 +20,10 @@ import com.yunbao.common.event.FollowEvent;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.APKManager;
 import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.manager.LiveClassManager;
 import com.yunbao.common.manager.NewLevelManager;
+import com.yunbao.common.utils.AppManager;
+import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.MD5Util;
 import com.yunbao.common.utils.SpUtil;
@@ -156,12 +160,14 @@ public class CommonHttpUtil {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 locale = context.getResources().getConfiguration().getLocales().get(0);
             } else {
-                locale = context.getResources().getConfiguration().locale;
+                locale = IMLoginManager.get(context).getLocaleLanguage();
             }
-            if (locale.getLanguage().equals("en")) {
-                lang = "english";
-            } else {
+            if (locale.getLanguage().equals("zh")) {
                 lang = "chinese";
+
+            } else {
+                lang = "english";
+
             }
         }
         Log.i("来了", lang);
@@ -200,6 +206,10 @@ public class CommonHttpUtil {
                                     JSONArray levelArray = obj.getJSONArray("levelanchor_new");
                                     new NewLevelManager(context).UpAnchorDataLevel(levelArray.toJSONString());
                                 }
+                                if (obj.containsKey("liveclass")) {//缓存直播间分类
+                                    JSONArray levelArray = obj.getJSONArray("liveclass");
+                                    new LiveClassManager(context).UpDataLiveClass(levelArray.toJSONString());
+                                }
                                 if (obj.containsKey("apk_ver")) {
                                     APKManager.get().setApkVer(obj.getString("apk_ver"));
                                 }
@@ -218,10 +228,30 @@ public class CommonHttpUtil {
                                 if (obj.containsKey("clarity")) {
                                     IMLoginManager.get(context).setClarity(obj.getString("clarity"));
                                 }
+                                if (obj.containsKey("defaultBubbleUrl")) {
+                                    IMLoginManager.get(context).setDefaultBubbleUrl(obj.getString("defaultBubbleUrl"));
+                                }
                             } catch (Exception e) {
+                                e.printStackTrace();
                                 String error = "info[0]:" + info[0] + "\n\n\n" + "Exception:" + e.getClass() + "---message--->" + e.getMessage();
                                 ErrorActivity.forward("GetConfig接口返回数据异常", error);
                             }
+                        } else if (code == 1000) {
+                            new DialogUitl
+                                    .Builder(context)
+                                    .setContent(msg)
+                                    .setCancelable(false)
+                                    .setClickCallback3(new DialogUitl.SimpleCallback3() {
+                                        @Override
+                                        public void onConfirmClick(Dialog dialog) {
+                                            AppManager.getInstance().AppExit();
+                                        }
+
+                                        @Override
+                                        public void onCancel() {
+                                            AppManager.getInstance().AppExit();
+                                        }
+                                    }).build().show();
                         }
                     }
 

common/src/main/java/com/yunbao/common/http/HttpCallback.java

@@ -62,6 +62,7 @@ public abstract class HttpCallback extends AbsCallback<JsonBean> {
     @Override
     public void onError(Response<JsonBean> response) {
         Throwable t = response.getException();
+        t.printStackTrace();
         L.e("网络请求错误---->" + t.getClass() + " : " + t.getMessage());
         if (t instanceof SocketTimeoutException || t instanceof ConnectException || t instanceof UnknownHostException || t instanceof UnknownServiceException || t instanceof SocketException) {
             ToastUtil.show(R.string.load_failure);