悬浮窗关闭

FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java

@@ -71,7 +71,7 @@ public class FaceManager implements SensorEventListener {
      * 配置美颜SDK
      */
     public void initFURender(Context context) {
-        initFaceUnity(context);
+
         mFURenderer = FURenderer.getInstance();
         mFURenderer.setInputTextureType(FUInputTextureEnum.FU_ADM_FLAG_COMMON_TEXTURE);
         mFURenderer.setCameraFacing(CameraFacingEnum.CAMERA_FRONT);
@@ -105,11 +105,9 @@ public class FaceManager implements SensorEventListener {
             }
         });
     }
-
-    public void loadConfig() {
+    public void loadConfig(){
         initFaceBeauty();
     }
-
     public void initFaceBeauty() {
         FaceBeautyDataFactory faceBeautyDataFactory;
         faceBeautyDataFactory = new FaceBeautyDataFactory();
@@ -117,13 +115,9 @@ public class FaceManager implements SensorEventListener {
         for (String key : configMap.keySet()) {
             if ("FilterViewHolder_".equals(key)) {
                 for (FaceBeautyFilterBean filter : faceBeautyDataFactory.getBeautyFilters()) {
-                    if (filter.getKey().equals(configMap.get(key)) && !"origin".equals(configMap.get(key))) {
-                        try {
-                            faceBeautyDataFactory.onFilterSelected(filter.getKey(), Double.parseDouble((String) Objects.requireNonNull(configMap.get("FilterViewHolder_" + configMap.get(key) + "_val"))) / 100, filter.getDesRes());
-                            Log.i(TAG, "test: 设置滤镜  =" + filter.getKey() + " val = " + configMap.get("FilterViewHolder_" + configMap.get(key) + "_val"));
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+                    if (filter.getKey().equals(configMap.get(key))&&!"origin".equals(configMap.get(key))) {
+                        faceBeautyDataFactory.onFilterSelected(filter.getKey(), Double.parseDouble((String) Objects.requireNonNull(configMap.get("FilterViewHolder_" + configMap.get(key) + "_val")))/100, filter.getDesRes());
+                        Log.i(TAG, "test: 设置滤镜  ="+filter.getKey()+" val = "+configMap.get("FilterViewHolder_" + configMap.get(key) + "_val"));
                         break;
                     }
                 }
@@ -131,25 +125,17 @@ public class FaceManager implements SensorEventListener {
                 String name = key.replace("BeautySkinViewHolder_", "");
                 for (FaceBeautyBean bean : faceBeautyDataFactory.getShapeBeauty()) {
                     if (bean.getKey().equals(name)) {
-                        try {
-                            faceBeautyDataFactory.updateParamIntensity(bean.getKey(), Double.parseDouble((String) Objects.requireNonNull(configMap.get(key))));
-                            Log.i(TAG, "test: 设置美颜 = " + bean.getKey() + " val = " + configMap.get(key));
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+                        faceBeautyDataFactory.updateParamIntensity(bean.getKey(),Double.parseDouble((String) Objects.requireNonNull(configMap.get(key))));
+                        Log.i(TAG, "test: 设置美颜 = "+bean.getKey()+" val = "+configMap.get(key));
                         break;
                     }
                 }
-            } else if (key.startsWith("BeautyShapeViewHolder")) {
+            }else if(key.startsWith("BeautyShapeViewHolder")){
                 String name = key.replace("BeautyShapeViewHolder_", "");
                 for (FaceBeautyBean bean : faceBeautyDataFactory.getShapeBeauty()) {
                     if (bean.getKey().equals(name)) {
-                        try {
-                            faceBeautyDataFactory.updateParamIntensity(bean.getKey(), Double.parseDouble((String) Objects.requireNonNull(configMap.get(key))));
-                            Log.i(TAG, "test: 设置美肤 = " + bean.getKey() + " val = " + configMap.get(key));
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+                        faceBeautyDataFactory.updateParamIntensity(bean.getKey(),Double.parseDouble((String) Objects.requireNonNull(configMap.get(key))));
+                        Log.i(TAG, "test: 设置美肤 = "+bean.getKey()+" val = "+configMap.get(key));
                         break;
                     }
                 }
@@ -291,7 +277,6 @@ public class FaceManager implements SensorEventListener {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        isInit = false;
 
     }
 

FaceUnity/src/main/java/com/yunbao/faceunity/adapters/ContainerRecyclerAdapter.java

@@ -80,11 +80,11 @@ public class ContainerRecyclerAdapter extends RecyclerView.Adapter<BaseViewHolde
     }
 
     public void hideSeekBar() {
-        if (seekBar.getVisibility() == View.INVISIBLE) {
+        if (seekBar.getVisibility() == View.GONE) {
             return;
         }
         seekBar.setOnProgressChangeListener(null);
-        seekBar.setVisibility(View.INVISIBLE);
+        seekBar.setVisibility(View.GONE);
     }
 
 

FaceUnity/src/main/res/values/colors.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#FF8D41</color>
-    <color name="colorPrimaryDark">#FF8D41</color>
-    <color name="colorAccent">#FF8D41</color>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
 
     <!--fulive demo 主配色-->
     <color name="primary_background">#050F14</color>

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

@@ -299,7 +299,7 @@
     <string name="beautify_hip_slim">Hip</string>
     <string name="beautify_head_slim">Head shrink</string>
     <string name="beautify_leg_thin_slim">Thin leg</string>
-    <string name="toast_not_detect_body">No message tracking</string>
+    <string name="toast_not_detect_body">No body tracking</string>
     <string name="pta_human_full_body">Body driver</string>
     <string name="pta_human_half_body">Bust driver</string>
 

Share/.gitignore

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

Share/build.gradle

@@ -1,73 +0,0 @@
-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

@@ -1,21 +0,0 @@
-# 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

@@ -1,26 +0,0 @@
-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

@@ -1,44 +0,0 @@
-<?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

@@ -1,34 +0,0 @@
-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

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

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

@@ -1,130 +0,0 @@
-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

@@ -1,140 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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

@@ -1,57 +0,0 @@
-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

@@ -1,73 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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

@@ -1,158 +0,0 @@
-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

@@ -1,146 +0,0 @@
-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

@@ -1,9 +0,0 @@
-<?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

@@ -1,10 +0,0 @@
-<?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

@@ -1,12 +0,0 @@
-<?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

@@ -1,56 +0,0 @@
-<?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

@@ -1,66 +0,0 @@
-<?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

@@ -1,34 +0,0 @@
-<?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

@@ -1,75 +0,0 @@
-<?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

@@ -1,8 +0,0 @@
-<?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

@@ -1,17 +0,0 @@
-<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

@@ -1,17 +0,0 @@
-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/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'img-optimizer'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
-apply plugin: 'com.alibaba.arouter'
+
 android {
     dexOptions {
         jumboMode = true
@@ -230,7 +230,6 @@ dependencies {
     annotationProcessor rootProject.ext.dependencies["arouter-compiler"]
 
     //  implementation rootProject.ext.dependencies["leakcanary"]
-    //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
 
 }

app/src/main/AndroidManifest.xml

@@ -6,8 +6,6 @@
     <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"
@@ -80,21 +78,16 @@
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
     <!-- Android11新增 -->
 <!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
-<!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
-    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
-    <queries>
-        <package android:name="com.twitter.android"/>
 
-    </queries>
     <application
         android:name="com.shayu.phonelive.AppContext"
         android:allowBackup="true"
         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,11 +13,14 @@ 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;
 
+import com.adjust.sdk.Adjust;
+import com.adjust.sdk.AdjustConfig;
+import com.adjust.sdk.AdjustEvent;
+import com.adjust.sdk.LogLevel;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.Utils;
 import com.facebook.appevents.AppEventsLogger;
@@ -25,7 +28,6 @@ import com.fm.openinstall.OpenInstall;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.analytics.FirebaseAnalytics;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
-import com.shayu.phonelive.utils.LogUtils;
 import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.tencent.imsdk.v2.V2TIMSimpleMsgListener;
@@ -35,15 +37,16 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.CrashSaveBean;
+import com.yunbao.common.http.CommonHttpUtil;
+import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.manager.imrongcloud.InstructorSendReward;
 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.faceunity.FaceManager;
 import com.yunbao.live.socket.SocketRyClient;
 import com.yunbao.live.utils.LiveImDeletUtil;
 import com.yunbao.live.views.PortraitLiveManager;
@@ -80,14 +83,15 @@ 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) {
+            Adjust.onResume();
         }
 
         @Override
         public void onActivityPaused(Activity activity) {
+            Adjust.onPause();
         }
 
         @Override
@@ -108,14 +112,12 @@ 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
@@ -128,20 +130,13 @@ public class AppContext extends CommonAppContext {
     @Override
     public void onCreate() {
         super.onCreate();
+        //注册全局异常捕获
         if (!isMainProcess()) {
             return;
         }
-        AppManager.runDebugCode(new Runnable() {
-            @Override
-            public void run() {
-                ToastUtil.show("Debug代码");
-            }
-        });
         CrashSaveBean.getInstance().setStartTime(System.currentTimeMillis());
-        //注册全局异常捕获
         registerError();
         registerFirebaseCrash();
-        LogUtils.start(this);
         sInstance = this;
         L.setDeBug(BuildConfig.DEBUG);
         AppEventsLogger.activateApp(this);
@@ -166,8 +161,38 @@ public class AppContext extends CommonAppContext {
             OpenInstall.init(this);
         }
 
-
+        String environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
+        AdjustConfig config = new AdjustConfig(this, "3om5fbglyqdc", environment);
+        if (CommonAppConfig.IS_GOOGLE_PLAY == false) {
+            config.setDefaultTracker("xa7k5ut");
+        }
+        Adjust.onCreate(config);
         registerActivityLifecycleCallbacks(new AdjustLifecycleCallbacks());
+        config.setLogLevel(LogLevel.WARN);
+        //激活操作记录
+        AdjustEvent adjustEvent = new AdjustEvent("m7wk0c");
+        Adjust.trackEvent(adjustEvent);
+
+        //谷歌激活
+        mFirebaseAnalytics.logEvent("FS_activation", null);
+
+        //FB激活
+        logger.logEvent("FB_activation");
+
+        AdjustEvent adjustEvent2 = new AdjustEvent("p7igfz");
+        Adjust.trackEvent(adjustEvent2);
+        CommonHttpUtil.setAdvertisingChannels("p7igfz", new HttpCallback() {
+            @Override
+            public void onSuccess(int code, String msg, String[] info) {
+                if (code == 0) {
+                    //谷歌激活
+                    mFirebaseAnalytics.logEvent("FS_complete_1st_loading", null);
+                    //FB激活
+                    logger.logEvent("FB_complete_1st_loading");
+                }
+            }
+        });
+
         //初始化 AndroidUtilCode
         Utils.init(this);
         liveImDeletUtil = new LiveImDeletUtil();
@@ -243,11 +268,10 @@ public class AppContext extends CommonAppContext {
                     mSocketHandler.sendMessage(msg);
                 }
             }
-
         });
         configSPApp();
         //初始化美颜SDK
-        // FaceManager.initFaceUnity(this);
+        FaceManager.initFaceUnity(this);
     }
 
     /**
@@ -289,21 +313,18 @@ public class AppContext extends CommonAppContext {
                 .setMainCrashHandler((t, e) -> {
                     Log.e("ApplicationError", "主线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息
                     e.printStackTrace();
-                    AppManager.runDebugCode(()->{
-                        //闪退后finish所有Activity并且杀死进程
-                        for (WeakReference<Activity> activity : activities) {
-                            if (activity != null && activity.get() != null) {
-                                activity.get().finish();
-                            }
+                    //闪退后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,9 +8,7 @@ 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;
 
@@ -92,12 +90,10 @@ public class NeverCrashUtils {
      *
      * @param application application
      */
-    private boolean errorWhile = true;
-
     public void register(Application application) {
         //主线程异常拦截
         new Handler(Looper.getMainLooper()).post(() -> {
-            while (errorWhile) {
+            while (true) {
                 try {
                     Looper.loop();
                 } catch (Throwable e) {
@@ -105,12 +101,10 @@ public class NeverCrashUtils {
                         Log.e(TAG, "未捕获的主线程异常行为", e);
                     }
                     e.printStackTrace();
-
-                    AppManager.runDebugCode(() -> Toast.makeText(application, "发生闪退:" + e.getMessage(), Toast.LENGTH_SHORT).show());
+                    Toast.makeText(application, "发生闪退", 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);
-                    AppManager.runDebugCode(() -> errorWhile = false);
-                    //     return;
+                    return;
                 }
             }
         });
@@ -145,11 +139,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,11 +1,10 @@
 package com.shayu.phonelive.activity;
 
+import static com.yunbao.common.CommonAppContext.logger;
+import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
 
-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;
@@ -22,10 +21,9 @@ 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.adjust.sdk.Adjust;
+import com.adjust.sdk.AdjustEvent;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -50,7 +48,6 @@ 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;
@@ -104,22 +101,20 @@ 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();
         setContentView(R.layout.activity_launcher);
+        //开屏
+        AdjustEvent adjustEvent = new AdjustEvent("vjqk8g");
+        Adjust.trackEvent(adjustEvent);
+
+        //谷歌激活
+        mFirebaseAnalytics.logEvent("FS_screen", null);
+        //FB激活
+        logger.logEvent("FB_screen");
         mContext = this;
         mRoot = findViewById(R.id.root);
         mCover = findViewById(R.id.cover);
@@ -145,7 +140,6 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
         };
         mHandler.sendEmptyMessageDelayed(WHAT_GET_CONFIG, 1000);
         LogUtil.uploadErrorLog(AppContext.sInstance);
-        SpUtil.getInstance().setBooleanValue("NOTIFICATION", NotificationManagerCompat.from(this).areNotificationsEnabled());
     }
 
 
@@ -200,7 +194,6 @@ 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) {
@@ -285,19 +278,8 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
         if (getIntent().getStringExtra("activityUrl") != null) {
             intent.putExtra("activityUrl", getIntent().getStringExtra("activityUrl"));
         }
-        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);
-        }
+
+        LauncherActivity.this.startActivity(intent);
         finish();
     }
 
@@ -406,7 +388,6 @@ 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);
                 }
@@ -540,7 +521,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(mContext.getString(R.string.live_play_error));
+                    ToastUtil.show(WordUtil.getString(R.string.live_play_error));
                     checkUidAndToken();
                 } else if (e == TXLiveConstants.PLAY_EVT_PLAY_PROGRESS) {
                     int progress = bundle.getInt("EVT_PLAY_PROGRESS_MS");

app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java

@@ -2,10 +2,7 @@ package com.shayu.phonelive.utils;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Dialog;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -20,7 +17,6 @@ import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.net.Uri;
-import android.os.Build;
 import android.util.Log;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -35,12 +31,9 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
 import com.makeramen.roundedimageview.RoundedImageView;
-import com.shayu.phonelive.AppContext;
 import com.shayu.phonelive.activity.LauncherActivity;
 import com.yunbao.common.bean.NotificationMsgBean;
 import com.yunbao.common.glide.ImgLoader;
-import com.yunbao.common.utils.DialogUitl;
-import com.yunbao.common.utils.SpUtil;
 import com.yunbao.main.activity.MainActivity;
 
 import org.json.JSONException;
@@ -59,7 +52,7 @@ public class CustomMessageReceiver extends PushMessageReceiver {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             NotificationManager manager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
             NotificationChannel channel = new NotificationChannel(channelID, channelNAME, level);
-            channel.setSound(Uri.parse("android.resource://" + context.getPackageName() + "/raw/pdlive_sound"), null);
+            channel.setSound(Uri.parse("android.resource://" + context.getPackageName() + "/raw/pdlive_sound"),null);
             manager.createNotificationChannel(channel);
             return channelID;
         } else {
@@ -88,26 +81,6 @@ public class CustomMessageReceiver extends PushMessageReceiver {
     @Override
     public boolean onNotificationMessageArrived(Context context, PushType pushType, PushNotificationMessage notificationMessage) {
         Log.i("gmc", notificationMessage.getPushContent() + "VVV" + notificationMessage.getPushTitle() + "gmc11112222" + notificationMessage.getExtra());
-        if (!SpUtil.getInstance().getBooleanValue("NOTIFICATION")) {
-            if (AppContext.activityWeakReference != null) {
-                Activity activity = AppContext.activityWeakReference.get();
-                if (activity != null) {
-                    DialogUitl.showSimpleDialog(activity, "应用需要通知权限", new DialogUitl.SimpleCallback() {
-                        @Override
-                        public void onConfirmClick(Dialog dialog, String content) {
-                            Intent intent = new Intent();
-                            intent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
-                            intent.putExtra("app_package", context.getPackageName());
-                            intent.putExtra("app_uid", context.getApplicationInfo().uid);
-                            // for Android 8 and above
-                            intent.putExtra("android.provider.extra.APP_PACKAGE", context.getPackageName());
-                            activity.startActivity(intent);
-
-                        }
-                    });
-                }
-            }
-        }
         if (notificationMessage.getExtra() == null) {
             msg.setImg("" + notificationMessage.getSenderPortrait());
             msg.setTitle(notificationMessage.getPushTitle());
@@ -226,7 +199,7 @@ public class CustomMessageReceiver extends PushMessageReceiver {
         PendingIntent pendingIntent;
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
-        } else {
+        }else {
             pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         }
         String channelId = createNotificationChannel(context, "my_channel_ID", "my_channel_NAME", NotificationManager.IMPORTANCE_HIGH);
@@ -260,7 +233,7 @@ public class CustomMessageReceiver extends PushMessageReceiver {
         PendingIntent pendingIntent;
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
-        } else {
+        }else {
             pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         }
         String channelId = createNotificationChannel(context, "my_channel_ID", "my_channel_NAME", NotificationManager.IMPORTANCE_HIGH);
@@ -303,7 +276,7 @@ public class CustomMessageReceiver extends PushMessageReceiver {
         PendingIntent pendingIntent;
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
-        } else {
+        }else {
             pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         }
         String channelId = createNotificationChannel(context, "my_channel_ID", "my_channel_NAME", NotificationManager.IMPORTANCE_HIGH);

app/src/main/java/com/shayu/phonelive/utils/LogUtils.java

@@ -1,90 +0,0 @@
-package com.shayu.phonelive.utils;
-
-import static java.text.DateFormat.DEFAULT;
-
-import android.content.Context;
-
-import com.yunbao.common.CommonAppConfig;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Objects;
-
-public class LogUtils {
-    /**
-     * 采集所有日志
-     */
-    public static void start(Context context) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-
-                    String[] exec = new String[]{"logcat", "-c"};
-                    Runtime.getRuntime().exec(exec).waitFor();
-
-                    exec = new String[]{"logcat", "-v", "color", "UTC-8"};
-
-                    Process process = Runtime.getRuntime().exec(exec);
-                    BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-                    String line;
-                    PrintWriter writer = null;
-                    String title = "[PDLIVE]" + CommonAppConfig.getInstance().getUid() + "_";
-                    String today = title + SimpleDateFormat.getDateInstance(DEFAULT, Locale.CHINA).format(new Date());
-                    File dir = new File(context.getDir("files", Context.MODE_PRIVATE).getAbsolutePath() + File.separator);
-                    if (dir.listFiles() != null) {
-                        for (File file : dir.listFiles()) {
-                            if (file.getName().endsWith(".log") && !"error.log".equals(file.getName())) {
-                                String fileName = file.getName().replace(".log", "").split("_")[1];
-                                if (isDelLog(fileName)) {
-                                    file.delete();
-                                }
-                            }
-                        }
-                    }
-                    File saveFile = new File(context.getDir("files", Context.MODE_PRIVATE).getAbsolutePath() + File.separator + today + ".log");
-                    FileOutputStream os = new FileOutputStream(saveFile, true);
-                    writer = new PrintWriter(os);
-                    while ((line = bufferedReader.readLine()) != null) {
-                        writer.append(line).write("\n");
-                        writer.flush();
-                    }
-                    writer.flush();
-                    writer.close();
-                    exec = new String[]{"logcat", "-c"};
-                    Runtime.getRuntime().exec(exec).waitFor();
-                    bufferedReader.close();
-                    start(context);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }).start();
-
-    }
-
-    /**
-     * 判断是否是要删除的日志
-     **/
-    private static boolean isDelLog(String time) {
-        try {
-            Calendar timeCal = Calendar.getInstance(Locale.CHINA);
-            timeCal.setTime(Objects.requireNonNull(SimpleDateFormat.getDateInstance(DEFAULT, Locale.CHINA).parse(time)));
-            Calendar calendar = Calendar.getInstance(Locale.CHINA);
-            calendar.setTime(new Date());
-            calendar.add(Calendar.DATE, -3);
-            return calendar.after(timeCal);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-}

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

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">PDLIVE</string>
-    <string name="leak_canary_test_class_name">assertk.Assert</string>
 </resources>

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(mContext.getString(R.string.tiezhi_download_failed));
+                                        ToastUtil.show(WordUtil.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(mContext.getString(R.string.tiezhi_download_failed));
+                                ToastUtil.show(WordUtil.getString(R.string.tiezhi_download_failed));
                                 bean.setDownloading(false);
                                 notifyItemChanged(position, Constants.PAYLOAD);
                                 mLoadingTaskMap.remove(position);

build.gradle

@@ -22,7 +22,6 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
-        classpath "com.alibaba:arouter-register:1.0.2"
     }
 
 

common/build.gradle

@@ -147,6 +147,7 @@ dependencies {
     //谷歌支付
     //谷歌内购
     api 'com.android.billingclient:billing:5.0.0'
+    implementation 'com.teprinciple:updateapputils:2.3.0'
     api 'com.squareup.picasso:picasso:2.5.2'
     api "com.immomo.cosmos.mediax:beautyutils:2.2.1_01071700"
     api files('libs/liteavsdk.jar')
@@ -154,21 +155,20 @@ dependencies {
     //腾讯im
     api 'com.tencent.imsdk:imsdk-plus:5.4.666'
     api 'com.google.code.gson:gson:2.8.8'
-    api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库
-    //此处以集成 5.1.2 版本为例
-    api 'cn.rongcloud.sdk:im_lib:5.2.0.2'
-
+    api 'cn.rongcloud.sdk:rtc_lib:5.2.5.8' // 音视频通话基础能力库
     //此处以集成 5.1.2 版本为例
+    api 'cn.rongcloud.sdk:im_lib:5.2.5.4' // 即时通讯基础能力库
     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.2.0'
-    implementation 'com.facebook.android:facebook-android-sdk:15.2.0'
+    api 'com.facebook.android:facebook-android-sdk:15.0.1'
+    implementation 'com.facebook.android:facebook-android-sdk:15.0.1'
 
     api('com.twitter.sdk.android:twitter-core:3.1.1@aar') {
         transitive = true
     }
     api 'com.linecorp:linesdk:5.0.1'
+    api 'com.adjust.sdk:adjust-android:4.30.1'
     api 'com.android.installreferrer:installreferrer:2.2'
     //Retrofit2库
     api 'com.squareup.retrofit2:retrofit:2.3.0'
@@ -188,7 +188,4 @@ dependencies {
     api 'com.github.princekin-f:EasyFloat:2.0.4'
     api files('libs/Msc.jar')
 
-    api 'com.github.li-xiaojun:XPopup:2.9.1'
-
-    api 'com.github.shenbengit:PagerGridLayoutManager:1.1.7'
 }

common/src/main/AndroidManifest.xml

@@ -32,9 +32,8 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-<!--
 
-        支付宝
+        <!--支付宝-->
         <activity
             android:name="com.alipay.sdk.app.H5PayActivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
@@ -47,8 +46,7 @@
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize|stateHidden"></activity>
-        支付宝 end
--->
+        <!--支付宝 end-->
 
         <activity
             android:name="com.yunbao.common.activity.ErrorActivity"

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

@@ -1,22 +1,22 @@
 package com.yunbao.common;
 
-import static com.facebook.FacebookSdk.setAdvertiserIDCollectionEnabled;
-import static com.facebook.FacebookSdk.setAutoLogAppEventsEnabled;
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
-
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 
+import android.text.TextUtils;
+import android.util.Log;
+
 import com.facebook.FacebookSdk;
+import com.facebook.appevents.AppEventsLogger;
+import com.google.android.gms.common.api.ApiException;
+import com.google.firebase.analytics.FirebaseAnalytics;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.utils.L;
 
-import java.lang.ref.WeakReference;
 import java.util.Locale;
 
 import io.rong.imlib.RongIMClient;
@@ -24,6 +24,9 @@ import io.rong.push.RongPushClient;
 import io.rong.push.pushconfig.PushConfig;
 import me.leolin.shortcutbadger.ShortcutBadger;
 
+import static com.facebook.FacebookSdk.setAdvertiserIDCollectionEnabled;
+import static com.facebook.FacebookSdk.setAutoLogAppEventsEnabled;
+
 
 /**
  * Created by cxf on 2017/8/3.
@@ -32,12 +35,13 @@ import me.leolin.shortcutbadger.ShortcutBadger;
 public class CommonAppContext extends MultiDexApplication {
 
     public static CommonAppContext sInstance;
-    public static WeakReference<Activity> activityWeakReference;
     private int mCount;
     private boolean mFront;//是否前台
     public static int jpushMsgNum;
     public static int Ingroup = 0;
     public static String lang = "chinese";
+    public static FirebaseAnalytics mFirebaseAnalytics;
+    public static AppEventsLogger logger;
     public static boolean isReady = false;
     public static String home_zdy_img_us = "";
     public static String home_zdy_img_cn = "";
@@ -63,31 +67,33 @@ public class CommonAppContext extends MultiDexApplication {
         //初始化友盟统计
 //        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, null);
         FacebookSdk.sdkInitialize(getApplicationContext());
+        mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
+        mFirebaseAnalytics.setAnalyticsCollectionEnabled(true);
+        mFirebaseAnalytics.setUserProperty("ALLOW_AD_PERSONALIZATION_SIGNALS", "true" );
+
+
+
+        logger = AppEventsLogger.newLogger(this);
         setAutoLogAppEventsEnabled(true);
         FacebookSdk.fullyInitialize();
         setAdvertiserIDCollectionEnabled(true);
         registerActivityLifecycleCallbacks();
 
-        Locale locale;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            locale = getResources().getConfiguration().getLocales().get(0);
-        } else {
-            locale = getResources().getConfiguration().locale;
-        }
-        if (locale.getLanguage().equals("zh")) {
-            lang = "chinese";
-
-        } else {
-            lang = "english";
-
-        }
-        Log.i("lang", lang);
+            Locale locale;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                locale = getResources().getConfiguration().getLocales().get(0);
+            } else {
+                locale = getResources().getConfiguration().locale;
+            }
+            if(locale.getLanguage().equals("en")){
+                lang = "english";
+            }else{
+                lang = "chinese";
+            }
+        Log.i("lang",lang);
 
     }
 
-    public static Activity getTopActivity() {
-        return activityWeakReference.get();
-    }
 
     @Override
     protected void attachBaseContext(Context base) {
@@ -105,12 +111,11 @@ public class CommonAppContext extends MultiDexApplication {
             @Override
             public void onActivityStarted(Activity activity) {
                 mCount++;
-                activityWeakReference = new WeakReference<>(activity);
                 if (!mFront) {
                     mFront = true;
                     L.e("AppContext------->处于前台");
-                    ShortcutBadger.applyCount(activity, 0);
-                    jpushMsgNum = 0;
+                    ShortcutBadger.applyCount(activity,0);
+                    jpushMsgNum=0;
                     CommonAppConfig.getInstance().setFrontGround(true);
                 }
             }

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

@@ -10,8 +10,6 @@ import java.util.List;
  */
 
 public class Constants {
-    public static final String NEW_ENTER_ROOM = "enterRoom";
-
     public static final String URL = "url";
     public static final String PAYLOAD = "payload";
     public static final String SEX = "sex";
@@ -76,7 +74,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";
@@ -132,8 +130,6 @@ public class Constants {
     public static final int LIVE_FUNC_MIC = 2013;//語音
     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;//机器人
 
     //socket
     public static final String SOCKET_CONN = "conn";
@@ -147,7 +143,6 @@ public class Constants {
     public static final String SOCKET_ALL_SERVER_NOTIFY = "AllServerNotify";//全服通知
     public static final String SOCKET_SEND_BARRAGE = "SendBarrage";//发弹幕
     public static final String SOCKET_LIVE_DRPK = "LiveDRPK";//多人PK
-    public static final String SOCKET_LIVE_DRPK_RANDOM = "LiveRandomPK";//随机PK
     public static final String SOCKET_LEAVE_ROOM = "disconnect";//用户离开房间
     public static final String SOCKET_LIVE_END = "StartEndLive";//主播关闭直播
     public static final String SOCKET_SYSTEM = "SystemNot";//系统消息
@@ -172,13 +167,7 @@ public class Constants {
     public static final String RECOMMEND_CARD_NOTIFY = "recommendCardNotify";//推荐卡通知消息
     public static final String STAR_CHALLENGE_UPDATE = "starChallengeUpdate";//星级助力
     public static final String AI_AUTOMATIC_SPEECH = "aiAutomaticSpeech";//机器人助手
-    public static final String AI_AUTOMATIC_SPEECH_LIVE = "aiAutomaticSpeechNew";//机器人助手
     public static final String STAR_CHALLENGE_UPGRADE_NOTIFY = "starChallengeUpgradeNotify";//星级挑战成功
-    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";//心愿单进度通知
 
     //游戏socket
     public static final String SOCKET_GAME_ZJH = "startGame";//炸金花
@@ -193,7 +182,6 @@ public class Constants {
     public static final String LOVE_CHECK = "LoveCheck";//热度卡消息
     public static final String TRUMPET_NOTIFY = "TrumpetNotify";//全栈喇叭
     public static final String LuckyAngel = "LuckyCheck";//幸运天使
-    public static final String Lucky100Check = "Lucky100Check";//幸运天使
 
     public static final int SOCKET_WHAT_CONN = 0;
     public static final int SOCKET_WHAT_DISCONN = 2;

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

@@ -10,7 +10,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.View;
@@ -27,7 +26,6 @@ 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;
@@ -49,7 +47,6 @@ 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;
     }
@@ -57,9 +54,8 @@ public abstract class AbsActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        create();
-        Intent intent = getIntent();
-        if (intent != null) {
+        Intent intent=getIntent();
+        if(intent!=null) {
             isFullWindow = getIntent().getBooleanExtra("isFull", false);
             if (isFullWindow) {
                 getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
@@ -89,9 +85,6 @@ public abstract class AbsActivity extends AppCompatActivity {
 
     protected void main() {
 
-    }
-    protected void create(){
-
     }
 
     protected boolean isStatusBarWhite() {
@@ -365,15 +358,4 @@ public abstract class AbsActivity extends AppCompatActivity {
         return result;
     }
 
-    @Override
-    public void onTrimMemory(int level) {
-        super.onTrimMemory(level);
-        Log.i("memory", "onTrimMemory: " + level);
-        switch (level) {
-            case TRIM_MEMORY_RUNNING_CRITICAL://内存低值危险值
-                break;
-            case TRIM_MEMORY_RUNNING_LOW://内存过低
-                break;
-        }
-    }
 }

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(mContext.getString(R.string.copy_success));
+        ToastUtil.show(WordUtil.getString(R.string.copy_success));
     }
 }

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

@@ -1,6 +1,5 @@
 package com.yunbao.common.activity;
 
-import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -8,9 +7,12 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
+import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
@@ -21,33 +23,15 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 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.views.HintCustomPopup;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.Locale;
-import java.util.Stack;
+import com.yunbao.common.utils.WordUtil;
 
 /**
  * Created by cxf on 2018/9/25.
@@ -75,19 +59,19 @@ 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);
 
+        mWebView = new WebView(mContext);
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
         params.topMargin = DpUtil.dp2px(1);
-        // mWebView.setLayoutParams(params);
-        //mWebView.setOverScrollMode(View.OVER_SCROLL_NEVER);
+        mWebView.setLayoutParams(params);
+        mWebView.setOverScrollMode(View.OVER_SCROLL_NEVER);
+        rootView.addView(mWebView);
         mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -109,11 +93,6 @@ public class WebViewActivity extends AbsActivity {
                 if (url.contains("for")) {
                     mWebView.loadUrl("javascript:goAnchorTab()");
                 }
-                //真实屏幕高度-(ft_title的高度+导航栏高度)
-                int height = DeviceUtils.getScreenRealHeight(mContext) - DpUtil.dp2px(72) - getCurrentNavigationBarHeight(mContext);
-                if (!navigationGestureEnabled(mContext)) {
-                    view.loadUrl("javascript:window.androidObject.setHeight(" + height + ",0,false)");
-                }
 
             }
         });
@@ -157,7 +136,7 @@ public class WebViewActivity extends AbsActivity {
             }
 
         });
-        mWebView.addJavascriptInterface(JavascriptInterfaceUtils.getInstance().setmContext(mContext, mWebView).setPageClose(true).setLiveZhuangBana(false), "androidObject");
+        mWebView.addJavascriptInterface(new JsInteration(), "androidObject");
         mWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
@@ -186,6 +165,58 @@ public class WebViewActivity extends AbsActivity {
         }
     }
 
+    //js调用原生
+    public class JsInteration {
+        @JavascriptInterface
+        public void onBack() {
+            finish();
+        }
+
+        @JavascriptInterface
+        public void modifyMydata() {
+            indexInto = 1;
+            RouteUtil.forwardEditProfileActivity();
+        }
+
+        @JavascriptInterface
+        public void reportUser(String touid) {
+            RouteUtil.forwardLiveReportActivity(touid);
+        }
+
+        @JavascriptInterface
+        public void gotoHomePage(String indexStr) {
+            Log.e("tgasss","indexStr4"+indexStr);
+
+            if (!"".equals(indexStr) && indexStr != null) {
+                int index = -1;
+                if ("0".equals(indexStr)) {
+                    index = 0;
+                } else if ("1".equals(indexStr)) {
+                    index = 1;
+                } else if ("2".equals(indexStr)) {
+                    index = 2;
+                } else if ("3".equals(indexStr)) {
+                    index = 3;
+                }
+                if (index != -1) {
+                    finish();
+                    Constants.isShowPage = index;
+                }
+            }
+        }
+
+        @JavascriptInterface
+        public void openWebView(String url) {
+            Constants.isTitle = false;
+            RouteUtil.forwardZhuangBanActivity(url);
+        }
+
+        @JavascriptInterface
+        public void openWebViewTitle(String url) {
+            Constants.isTitle = true;
+            RouteUtil.forwardZhuangBanActivity(url);
+        }
+    }
 
     private void openImageChooserActivity(ValueCallback<Uri> valueCallback) {
         mValueCallback = valueCallback;
@@ -197,7 +228,7 @@ public class WebViewActivity extends AbsActivity {
             intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
         }
         intent.setType("image/*");
-        startActivityForResult(Intent.createChooser(intent, mContext.getString(R.string.choose_flie)), CHOOSE);
+        startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -247,13 +278,13 @@ public class WebViewActivity extends AbsActivity {
             }
         }
         Intent intent = new Intent(context, WebViewActivity.class);
-        intent.putExtra(Constants.URL, url + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+        intent.putExtra(Constants.URL, url);
         context.startActivity(intent);
     }
 
     public static void forward(Context context, String url) {
-        forward(context, url, true);    }
-
+        forward(context, url, true);
+    }
 
     @Override
     protected void onDestroy() {
@@ -267,7 +298,6 @@ public class WebViewActivity extends AbsActivity {
         Constants.myIntoIndex = 0;
         indexInto = 0;
         Constants.LoginKefu = true;
-        Bus.getOff(this);
         super.onDestroy();
     }
 
@@ -318,61 +348,11 @@ public class WebViewActivity extends AbsActivity {
         if (Constants.isShowPage != -1) {
             finish();
         }
-    }
-
-    @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();
-        }
+//        new Handler().postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                mWebView.reload();
+//            }
+//        }, 100);
     }
 }

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 = context.getString(R.string.coin_give);
+        mGiveString = WordUtil.getString(R.string.coin_give);
         mOnClickListener = new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -1,181 +0,0 @@
-package com.yunbao.common.adapter;
-
-import android.app.Activity;
-import android.content.Context;
-import android.text.TextUtils;
-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.AnchorRecommendItemModel;
-import com.yunbao.common.bean.AnchorRecommendModel;
-import com.yunbao.common.bean.CustomSidebarInfoModel;
-import com.yunbao.common.http.main.MainNetManager;
-import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.views.DrawerRecommendViewHolder;
-import com.yunbao.common.views.DrawerTaskViewHolder;
-import com.yunbao.common.views.FunGamesViewHolder;
-import com.yunbao.common.views.RecommendViewHolder;
-import com.yunbao.common.views.RigtsInterestsViewHolder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 新侧边栏适配器
- */
-public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {
-    private Context mContext;
-    //  "type": 1,//模块类型 1 充值送好礼类型2 任务中心类型 3趣味游戏类4 权益 ,5为你推荐
-    private final int GOOD_GIFTS = 1;
-    private final int TASK_CENTER = 2;
-    private final int FUN_GAMES = 3;
-    private final int RIGHTS_INTERESTS = 4;
-    private final int RECOMMEND = 5;
-    private String liveId;
-    private List<AnchorRecommendItemModel> list = new ArrayList<>();
-
-    private List<CustomSidebarInfoModel> infoModels = new ArrayList<>();
-
-    public CustomDrawerPopupAdapter(Context mContext) {
-        this.mContext = mContext;
-    }
-
-
-    public CustomDrawerPopupAdapter setLiveId(String liveId) {
-        this.liveId = liveId;
-        return this;
-    }
-
-    public CustomDrawerPopupAdapter setList(List<AnchorRecommendItemModel> list) {
-        this.list = list;
-        return this;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        switch (viewType) {
-            case GOOD_GIFTS:
-                View goodGiftsView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_good_gifts, parent, false);
-                return new DrawerRecommendViewHolder(goodGiftsView);
-            case TASK_CENTER:
-                View taskCenterView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_tsak_center, parent, false);
-                return new DrawerTaskViewHolder(taskCenterView);
-            case FUN_GAMES:
-                View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_fun_games_view, parent, false);
-                return new FunGamesViewHolder(runGamesView);
-            case RIGHTS_INTERESTS:
-                View rightsInterestsView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_rights_interests, parent, false);
-                return new RigtsInterestsViewHolder(rightsInterestsView);
-            default:
-                View recommendView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_recommend, parent, false);
-                return new RecommendViewHolder(recommendView);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof DrawerRecommendViewHolder) {
-            DrawerRecommendViewHolder recommendViewHolder = (DrawerRecommendViewHolder) holder;
-            recommendViewHolder.setData(infoModels.get(position));
-        } else if (holder instanceof DrawerTaskViewHolder) {
-            DrawerTaskViewHolder taskViewHolder = (DrawerTaskViewHolder) holder;
-            taskViewHolder.setData(infoModels.get(position));
-        } else if (holder instanceof FunGamesViewHolder) {
-            FunGamesViewHolder funGamesViewHolder = (FunGamesViewHolder) holder;
-            funGamesViewHolder.setData(infoModels.get(position));
-        } else if (holder instanceof RigtsInterestsViewHolder) {
-            RigtsInterestsViewHolder rigtsInterestsViewHolder = (RigtsInterestsViewHolder) holder;
-            rigtsInterestsViewHolder.setData(infoModels.get(position));
-        } else if (holder instanceof RecommendViewHolder) {
-
-            RecommendViewHolder recommendViewHolder = (RecommendViewHolder) holder;
-            recommendViewHolder.setData(infoModels.get(position));
-            recommendViewHolder.updateData(list);
-
-            recommendViewHolder.setListener(new RecommendViewHolder.RecommendViewListener() {
-                @Override
-                public void changeOneBatch() {
-                    //推荐位
-                    MainNetManager.get((Activity) mContext)
-                            .anchorRecommend("9", new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
-                                @Override
-                                public void onSuccess(AnchorRecommendModel anchorRecommendModel) {
-
-                                    List<AnchorRecommendItemModel> models = anchorRecommendModel.getList();
-                                    int userIndex = -1;
-                                    for (int i = 0; i < models.size(); i++) {
-                                        if (TextUtils.equals(models.get(i).getUid(), liveId)) {
-                                            userIndex = i;
-                                        }
-                                    }
-                                    if (userIndex != -1) {
-                                        models.remove(userIndex);
-                                    }
-                                    recommendViewHolder.updateData(models);
-                                }
-
-                                @Override
-                                public void onError(String error) {
-                                    ToastUtil.show(R.string.net_error);
-                                }
-                            });
-                }
-
-                @Override
-                public void goToLive(AnchorRecommendItemModel model) {
-                    if (listener != null) {
-                        listener.goToLive(model);
-                    }
-                }
-            });
-
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return infoModels.size();
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        CustomSidebarInfoModel model = infoModels.get(position);
-        switch (model.getType()) {
-            case "1":
-                return GOOD_GIFTS;
-            case "2":
-                return TASK_CENTER;
-            case "3":
-                return FUN_GAMES;
-            case "4":
-                return RIGHTS_INTERESTS;
-            case "5":
-                return RECOMMEND;
-        }
-        return super.getItemViewType(position);
-
-    }
-
-    public void updateData(List<CustomSidebarInfoModel> mInfoModels) {
-        infoModels.clear();
-        infoModels.addAll(mInfoModels);
-        notifyDataSetChanged();
-    }
-
-    private CustomDrawerListener listener;
-
-    public CustomDrawerPopupAdapter setListener(CustomDrawerListener listener) {
-        this.listener = listener;
-        return this;
-    }
-
-    public interface CustomDrawerListener {
-        void goToLive(AnchorRecommendItemModel model);
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.yunbao.common.adapter;
-
-import android.content.Context;
-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.CustomSidebarChildModel;
-import com.yunbao.common.views.DrawerRecommendChildViewHolder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DrawerRecommendAdapter extends RecyclerView.Adapter {
-    private Context mContext;
-    private List<CustomSidebarChildModel> child = new ArrayList<>();
-
-    public DrawerRecommendAdapter(Context mContext) {
-        this.mContext = mContext;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View goodGiftsView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_drawer_recommend_child, parent, false);
-        return new DrawerRecommendChildViewHolder(goodGiftsView);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        DrawerRecommendChildViewHolder childViewHolder = (DrawerRecommendChildViewHolder) holder;
-        childViewHolder.setData(child.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return child.size();
-    }
-
-    public void updateData(List<CustomSidebarChildModel> mChild) {
-        child.clear();
-        child.addAll(mChild);
-        notifyDataSetChanged();
-    }
-}

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

@@ -1,59 +0,0 @@
-package com.yunbao.common.adapter;
-
-import android.content.Context;
-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.CustomSidebarChildModel;
-import com.yunbao.common.event.CustomDrawerPopupEvent;
-import com.yunbao.common.utils.Bus;
-import com.yunbao.common.views.DrawerTaskChildViewHolder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DrawerTaskAdapter extends RecyclerView.Adapter {
-    private Context mContext;
-    private List<CustomSidebarChildModel> child = new ArrayList<>();
-
-    public DrawerTaskAdapter(Context mContext) {
-        this.mContext = mContext;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View taskCenterView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_tsak_center_child, parent, false);
-        return new DrawerTaskChildViewHolder(taskCenterView);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        DrawerTaskChildViewHolder taskChildViewHolder = (DrawerTaskChildViewHolder) holder;
-        taskChildViewHolder.setData(child.get(position), position);
-        taskChildViewHolder.setListener(new DrawerTaskChildViewHolder.DrawerTaskChildListener() {
-            @Override
-            public void giftSuccess(CustomSidebarChildModel model, int index) {
-                //将领取的任务移动至任务列表尾部
-                Bus.get().post(new CustomDrawerPopupEvent()
-                        .setDisMiss(false).setRefresh(true));
-            }
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return 2;
-    }
-
-    public void updateData(List<CustomSidebarChildModel> mChild) {
-        child.clear();
-        child.addAll(mChild);
-        notifyDataSetChanged();
-    }
-}

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

@@ -1,63 +0,0 @@
-package com.yunbao.common.adapter;
-
-import android.content.Context;
-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.CustomSidebarChildModel;
-import com.yunbao.common.views.FunGamesChildViewHolder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FunGamesAdapter extends RecyclerView.Adapter {
-    private Context mContext;
-    private boolean rigts;
-    private List<CustomSidebarChildModel> child = new ArrayList<>();
-
-    public FunGamesAdapter(Context mContext, boolean rigts) {
-        this.mContext = mContext;
-        this.rigts = rigts;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_fun_games_child_view, parent, false);
-        return new FunGamesChildViewHolder(runGamesView);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        FunGamesChildViewHolder childViewHolder = (FunGamesChildViewHolder) holder;
-        childViewHolder.setData(child.get(position), rigts);
-    }
-
-    @Override
-    public int getItemCount() {
-        return child.size();
-    }
-
-    public void updateData(List<CustomSidebarChildModel> mChild) {
-        child.clear();
-        if (mChild.size() > 8) {
-            for (int i = 0; i < 8; i++) {
-                child.add(mChild.get(i));
-            }
-        } else {
-            child.addAll(mChild);
-        }
-        notifyDataSetChanged();
-    }
-
-    public void selectAll(List<CustomSidebarChildModel> mChild){
-        child.clear();
-        child.addAll(mChild);
-        notifyDataSetChanged();
-    }
-}

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

@@ -1,164 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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/adapter/LiveSystemMessageAdapter.java

@@ -1,52 +0,0 @@
-package com.yunbao.common.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.yunbao.common.R;
-import com.yunbao.common.bean.ListInfoMessageModel;
-import com.yunbao.common.views.LiveSystemMessageViewHolder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 主播消息中心适配器
- */
-public class LiveSystemMessageAdapter extends RecyclerView.Adapter {
-    private Context mContext;
-    private LayoutInflater mInflater;
-    private List<ListInfoMessageModel> listInfoMessageModels = new ArrayList<>();
-
-    public LiveSystemMessageAdapter(Context mContext) {
-        this.mContext = mContext;
-        mInflater = LayoutInflater.from(mContext);
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new LiveSystemMessageViewHolder(mInflater.inflate(R.layout.view_live_system_message, parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        LiveSystemMessageViewHolder messageViewHolder = (LiveSystemMessageViewHolder) holder;
-        messageViewHolder.setViewData(listInfoMessageModels.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return listInfoMessageModels.size();
-    }
-
-    public void addData(List<ListInfoMessageModel> list) {
-        listInfoMessageModels.addAll(list);
-        notifyDataSetChanged();
-
-    }
-}

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

@@ -1,67 +0,0 @@
-package com.yunbao.common.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.yunbao.common.R;
-import com.yunbao.common.bean.AnchorRecommendItemModel;
-import com.yunbao.common.views.RecommendChildViewHolder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RecommendAdapter extends RecyclerView.Adapter {
-    private List<AnchorRecommendItemModel> list = new ArrayList<>();
-    private Context mContext;
-
-    public RecommendAdapter(Context mContext) {
-        this.mContext = mContext;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new RecommendChildViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_sidebar_lives_new, parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-
-        RecommendChildViewHolder itemViewHolder = (RecommendChildViewHolder) holder;
-        itemViewHolder.setData(list.get(position));
-        itemViewHolder.setListener(new RecommendChildViewHolder.RecommendChildListener() {
-            @Override
-            public void goToLive(AnchorRecommendItemModel model) {
-                if (callback != null) {
-                    callback.goToLive(model);
-                }
-            }
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return list.size();
-    }
-
-    public void updateData(List<AnchorRecommendItemModel> mList) {
-        list.clear();
-        list.addAll(mList);
-        notifyDataSetChanged();
-    }
-
-    private RecommendCallback callback;
-
-    public RecommendAdapter setCallback(RecommendCallback callback) {
-        this.callback = callback;
-        return this;
-    }
-
-    public interface RecommendCallback {
-        void goToLive(AnchorRecommendItemModel model);
-    }
-}

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

@@ -95,7 +95,7 @@ public abstract class RefreshAdapter<T> extends RecyclerView.Adapter {
         return position;
     }
 
-    protected static boolean canClick() {
+    protected boolean canClick() {
         return ClickUtil.canClick();
     }
 

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

@@ -1,51 +0,0 @@
-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.LiveAiRobotBean;
-import com.yunbao.common.views.RobotMessageViewHolder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RobotMessageAdapter extends RecyclerView.Adapter {
-    private List<LiveAiRobotBean.Message> messageList = new ArrayList<>();
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View robotMessageView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_robot_message, parent, false);
-        return new RobotMessageViewHolder(robotMessageView);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        RobotMessageViewHolder messageViewHolder = (RobotMessageViewHolder) holder;
-        messageViewHolder.setData(messageList.get(position), position + 1);
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return messageList.size();
-    }
-
-
-    public void setDataAll(List<LiveAiRobotBean.Message> messages) {
-        messageList.clear();
-        messageList.addAll(messages);
-        notifyDataSetChanged();
-    }
-
-    //  删除数据
-    public void removeData(int position) {
-        messageList.remove(position);
-        //删除动画
-        notifyItemRemoved(position);
-    }
-}

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

@@ -1,51 +0,0 @@
-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.LiveAiRobotBean;
-import com.yunbao.common.views.RobotSayHelloViewHoler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RobotSayHelloAdapter extends RecyclerView.Adapter {
-    private List<LiveAiRobotBean.Message> messageList = new ArrayList<>();
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View robotSayHelloView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_robot_message, parent, false);
-        return new RobotSayHelloViewHoler(robotSayHelloView);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        RobotSayHelloViewHoler robotSayHelloViewHoler = (RobotSayHelloViewHoler) holder;
-        robotSayHelloViewHoler.setData(messageList.get(position), position + 1);
-    }
-
-    @Override
-    public int getItemCount() {
-        return messageList.size();
-    }
-
-
-    public void setDataAll(List<LiveAiRobotBean.Message> messages) {
-        messageList.clear();
-        messageList.addAll(messages);
-        notifyDataSetChanged();
-    }
-
-    //  删除数据
-    public void removeData(int position) {
-        messageList.remove(position);
-        //删除动画
-        notifyItemRemoved(position);
-    }
-}

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

@@ -9,7 +9,6 @@ import com.alibaba.fastjson.annotation.JSONField;
 public class AdBean {
     private String mUrl;
     private String mLink;
-    private int animation;//是否使用过度动画
 
     @JSONField(name = "thumb")
     public String getUrl() {
@@ -27,12 +26,4 @@ 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/AnchorRecommendItemModel.java

@@ -75,7 +75,7 @@ public class AnchorRecommendItemModel extends BaseModel {
     private String avatarThumb = "";
     @SerializedName("avatar2")
     private String avatar2 = "";
-    @SerializedName(value = "user_nicename", alternate = "userNiceName")
+    @SerializedName("user_nicename")
     private String userNicename = "";
     @SerializedName("level")
     private String level = "";

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

@@ -1,9 +1,6 @@
 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.
@@ -18,81 +15,7 @@ public class BannerBean {
     private String mIntoUrl;
     private int type;
     private String name;
-    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 int activityId=0;
 
     private StarChallengeStatusModel model;
 
@@ -156,49 +79,27 @@ 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{" +
@@ -209,12 +110,6 @@ 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/CheckLiveModel.java

@@ -1,53 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.Gson;
-import com.google.gson.annotations.SerializedName;
-
-public class CheckLiveModel extends BaseModel {
-
-    @SerializedName("type")
-    private int type;
-    @SerializedName("type_val")
-    private String typeVal;
-    @SerializedName("type_msg")
-    private String typeMsg;
-    @SerializedName("live_sdk")
-    private String liveSdk;
-
-    public static CheckLiveModel objectFromData(String str) {
-
-        return new Gson().fromJson(str, CheckLiveModel.class);
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public String getTypeVal() {
-        return typeVal;
-    }
-
-    public void setTypeVal(String typeVal) {
-        this.typeVal = typeVal;
-    }
-
-    public String getTypeMsg() {
-        return typeMsg;
-    }
-
-    public void setTypeMsg(String typeMsg) {
-        this.typeMsg = typeMsg;
-    }
-
-    public String getLiveSdk() {
-        return liveSdk;
-    }
-
-    public void setLiveSdk(String liveSdk) {
-        this.liveSdk = liveSdk;
-    }
-}

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

@@ -3,7 +3,6 @@ package com.yunbao.common.bean;
 import android.app.Activity;
 
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -15,7 +14,7 @@ public class CrashSaveBean {
     private long enterRoom;//进入房间次数
     private long slidingRoom;//滑动直播间次数
     private long playSvga;//加载播放svga次数
-    private List<WeakReference<Activity>> activities = new ArrayList<>();//Activity数量
+    private List<WeakReference<Activity>> activities;//Activity数量
 
     private CrashSaveBean() {
 
@@ -61,14 +60,10 @@ public class CrashSaveBean {
     }
 
     public String getActivitySize() {
-        StringBuilder builder = new StringBuilder();
+        StringBuilder builder=new StringBuilder();
         for (WeakReference<Activity> activity : activities) {
-            try {
-                if (activity.get() != null) {
-                    builder.append(activity.get().getClass().getSimpleName()).append(",");
-                }
-            } catch (Exception ignored) {
-
+            if(activity.get()!=null){
+                builder.append(activity.get()).append(",");
             }
         }
         return builder.toString();

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

@@ -1,172 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-
-public class CustomSidebarChildModel extends BaseModel {
-    @SerializedName("id")
-    private String id;
-    @SerializedName("parent_id")
-    private String parentId;
-    @SerializedName("title")
-    private String title;
-    @SerializedName("subtitle")
-    private String subtitle;
-    @SerializedName("icon")
-    private String icon;
-    @SerializedName("src")
-    private String src;
-    @SerializedName("show_type")
-    private String showType;
-    @SerializedName("sort")
-    private String sort;
-    @SerializedName("english")
-    private String english;
-    //奖励领取状态 0未达到领取要求 1已领取 2未领取
-    @SerializedName("status")
-    private String status;
-    @SerializedName("need_num")
-    private String needNum;
-    @SerializedName("now_num")
-    private String nowNum;
-    @SerializedName("activity_id")
-    private String activityId;
-    @SerializedName("flag")
-    private String flag;
-
-    public String getFlag() {
-        return flag;
-    }
-
-    public CustomSidebarChildModel setFlag(String flag) {
-        this.flag = flag;
-        return this;
-    }
-
-    public String getActivityId() {
-        return activityId;
-    }
-
-    public CustomSidebarChildModel setActivityId(String activityId) {
-        this.activityId = activityId;
-        return this;
-    }
-
-    private int resIcon;
-
-    public int getResIcon() {
-        return resIcon;
-    }
-
-    public CustomSidebarChildModel setResIcon(int resIcon) {
-        this.resIcon = resIcon;
-        return this;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public CustomSidebarChildModel setId(String id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public CustomSidebarChildModel setParentId(String parentId) {
-        this.parentId = parentId;
-        return this;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public CustomSidebarChildModel setTitle(String title) {
-        this.title = title;
-        return this;
-    }
-
-    public String getSubtitle() {
-        return subtitle;
-    }
-
-    public CustomSidebarChildModel setSubtitle(String subtitle) {
-        this.subtitle = subtitle;
-        return this;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public CustomSidebarChildModel setIcon(String icon) {
-        this.icon = icon;
-        return this;
-    }
-
-    public String getSrc() {
-        return src;
-    }
-
-    public CustomSidebarChildModel setSrc(String src) {
-        this.src = src;
-        return this;
-    }
-
-    public String getShowType() {
-        return showType;
-    }
-
-    public CustomSidebarChildModel setShowType(String showType) {
-        this.showType = showType;
-        return this;
-    }
-
-    public String getSort() {
-        return sort;
-    }
-
-    public CustomSidebarChildModel setSort(String sort) {
-        this.sort = sort;
-        return this;
-    }
-
-    public String getEnglish() {
-        return english;
-    }
-
-    public CustomSidebarChildModel setEnglish(String english) {
-        this.english = english;
-        return this;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public CustomSidebarChildModel setStatus(String status) {
-        this.status = status;
-        return this;
-    }
-
-    public String getNeedNum() {
-        return needNum;
-    }
-
-    public CustomSidebarChildModel setNeedNum(String needNum) {
-        this.needNum = needNum;
-        return this;
-    }
-
-    public String getNowNum() {
-        return nowNum;
-    }
-
-    public CustomSidebarChildModel setNowNum(String nowNum) {
-        this.nowNum = nowNum;
-        return this;
-    }
-}

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

@@ -1,103 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.List;
-
-/**
- * 新版自定义侧边栏
- */
-public class CustomSidebarInfoModel extends BaseModel {
-    @SerializedName("id")
-    private String id;
-    //一级标题
-    @SerializedName("title")
-    private String title;
-    //二级标题
-    @SerializedName("subtitle")
-    private String subtitle;
-    @SerializedName("sort")
-    private String sort;
-    //1全屏  2半屏
-    @SerializedName("show_type")
-    private String showType;
-    //跳转链接
-    @SerializedName("src")
-    private String src;
-    @SerializedName("type")
-    private String type;
-    @SerializedName("child")
-    private List<CustomSidebarChildModel> child;
-
-    public String getId() {
-        return id;
-    }
-
-    public CustomSidebarInfoModel setId(String id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public CustomSidebarInfoModel setTitle(String title) {
-        this.title = title;
-        return this;
-    }
-
-    public String getSubtitle() {
-        return subtitle;
-    }
-
-    public CustomSidebarInfoModel setSubtitle(String subtitle) {
-        this.subtitle = subtitle;
-        return this;
-    }
-
-    public String getSort() {
-        return sort;
-    }
-
-    public CustomSidebarInfoModel setSort(String sort) {
-        this.sort = sort;
-        return this;
-    }
-
-    public String getShowType() {
-        return showType;
-    }
-
-    public CustomSidebarInfoModel setShowType(String showType) {
-        this.showType = showType;
-        return this;
-    }
-
-    public String getSrc() {
-        return src;
-    }
-
-    public CustomSidebarInfoModel setSrc(String src) {
-        this.src = src;
-        return this;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public CustomSidebarInfoModel setType(String type) {
-        this.type = type;
-        return this;
-    }
-
-    public List<CustomSidebarChildModel> getChild() {
-        return child;
-    }
-
-    public CustomSidebarInfoModel setChild(List<CustomSidebarChildModel> child) {
-        this.child = child;
-        return this;
-    }
-}

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

@@ -1,109 +0,0 @@
-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

@@ -1,554 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-import com.yunbao.common.utils.StringUtil;
-
-import java.util.List;
-
-public class EnterRoomInfoModel extends BaseModel {
-    @SerializedName("votestotal")
-    private String votestotal;
-    @SerializedName("medalRankNum")
-    private String medalRankNum;
-    @SerializedName("barrage_fee")
-    private String barrageFee;
-    @SerializedName("userlist_time")
-    private String userlistTime;
-    @SerializedName("chatserver")
-    private String chatserver;
-    @SerializedName("linkmic_uid")
-    private String linkmicUid;
-    @SerializedName("linkmic_pull")
-    private String linkmicPull;
-    @SerializedName("nums")
-    private String nums;
-    @SerializedName("game")
-    private List<?> game;
-    @SerializedName("gamebet")
-    private List<String> gamebet;
-    @SerializedName("gametime")
-    private String gametime;
-    @SerializedName("gameid")
-    private String gameid;
-    @SerializedName("gameaction")
-    private String gameaction;
-    @SerializedName("game_bankerid")
-    private String gameBankerid;
-    @SerializedName("game_banker_name")
-    private String gameBankerName;
-    @SerializedName("game_banker_avatar")
-    private String gameBankerAvatar;
-    @SerializedName("game_banker_coin")
-    private String gameBankerCoin;
-    @SerializedName("game_banker_limit")
-    private String gameBankerLimit;
-    @SerializedName("shut_time")
-    private String shutTime;
-    @SerializedName("kick_time")
-    private String kickTime;
-    @SerializedName("speak_limit")
-    private String speakLimit;
-    @SerializedName("barrage_limit")
-    private String barrageLimit;
-    @SerializedName("coin")
-    private String coin;
-    @SerializedName("vip")
-    private VipModel vip;
-    @SerializedName("liang")
-    private LiangModel liang;
-    @SerializedName("medal_level")
-    private String medalLevel;
-    @SerializedName("medal_name")
-    private String medalName;
-    @SerializedName("issuper")
-    private String issuper;
-    @SerializedName("usertype")
-    private String usertype;
-    @SerializedName("front_task")
-    private String frontTask;
-    @SerializedName("ismic")
-    private String ismic;
-    @SerializedName("isattention")
-    private String isattention;
-    @SerializedName("userlists")
-    private List<LiveUserGiftBean> userlists;
-    @SerializedName("guard")
-    private GuardModel guard;
-    @SerializedName("guard_nums")
-    private String guardNums;
-    @SerializedName("pkinfo")
-    private PkinfoModel pkinfo;
-    @SerializedName("lminfo")
-    private LminfoModel lminfo;
-    @SerializedName("isred")
-    private String isred;
-    @SerializedName("is_fans")
-    private String isFans;
-    @SerializedName("count_fans")
-    private String countFans;
-    @SerializedName("isconnection")
-    private String isconnection;
-    @SerializedName("isleave")
-    private String isleave;
-    @SerializedName("landscape")
-    private String landscape;
-    @SerializedName("un_charge")
-    private String unCharge;
-    @SerializedName("see_time")
-    private String seeTime;
-    @SerializedName("greetings")
-    private List<String> greetings;
-    @SerializedName("live_bg")
-    private String liveBg;
-    @SerializedName("anchor_goodnum")
-    private String anchorGoodnum;
-    @SerializedName("jackpot_level")
-    private String jackpotLevel="-1";
-
-    public String getJackpotLevel() {
-
-        return jackpotLevel;
-    }
-
-    public EnterRoomInfoModel setJackpotLevel(String jackpotLevel) {
-        this.jackpotLevel = jackpotLevel;
-        return this;
-    }
-
-    public String getVotestotal() {
-        return votestotal;
-    }
-
-    public EnterRoomInfoModel setVotestotal(String votestotal) {
-        this.votestotal = votestotal;
-        return this;
-    }
-
-    public String getMedalRankNum() {
-        return medalRankNum;
-    }
-
-    public EnterRoomInfoModel setMedalRankNum(String medalRankNum) {
-        this.medalRankNum = medalRankNum;
-        return this;
-    }
-
-    public String getBarrageFee() {
-        return barrageFee;
-    }
-
-    public EnterRoomInfoModel setBarrageFee(String barrageFee) {
-        this.barrageFee = barrageFee;
-        return this;
-    }
-
-    public String getUserlistTime() {
-        return userlistTime;
-    }
-
-    public EnterRoomInfoModel setUserlistTime(String userlistTime) {
-        this.userlistTime = userlistTime;
-        return this;
-    }
-
-    public String getChatserver() {
-        return chatserver;
-    }
-
-    public EnterRoomInfoModel setChatserver(String chatserver) {
-        this.chatserver = chatserver;
-        return this;
-    }
-
-    public String getLinkmicUid() {
-        return linkmicUid;
-    }
-
-    public EnterRoomInfoModel setLinkmicUid(String linkmicUid) {
-        this.linkmicUid = linkmicUid;
-        return this;
-    }
-
-    public String getLinkmicPull() {
-        return linkmicPull;
-    }
-
-    public EnterRoomInfoModel setLinkmicPull(String linkmicPull) {
-        this.linkmicPull = linkmicPull;
-        return this;
-    }
-
-    public String getNums() {
-        return nums;
-    }
-
-    public EnterRoomInfoModel setNums(String nums) {
-        this.nums = nums;
-        return this;
-    }
-
-    public List<?> getGame() {
-        return game;
-    }
-
-    public EnterRoomInfoModel setGame(List<?> game) {
-        this.game = game;
-        return this;
-    }
-
-    public List<String> getGamebet() {
-        return gamebet;
-    }
-
-    public EnterRoomInfoModel setGamebet(List<String> gamebet) {
-        this.gamebet = gamebet;
-        return this;
-    }
-
-    public String getGametime() {
-        return gametime;
-    }
-
-    public EnterRoomInfoModel setGametime(String gametime) {
-        this.gametime = gametime;
-        return this;
-    }
-
-    public String getGameid() {
-        return gameid;
-    }
-
-    public EnterRoomInfoModel setGameid(String gameid) {
-        this.gameid = gameid;
-        return this;
-    }
-
-    public String getGameaction() {
-        return gameaction;
-    }
-
-    public EnterRoomInfoModel setGameaction(String gameaction) {
-        this.gameaction = gameaction;
-        return this;
-    }
-
-    public String getGameBankerid() {
-        return gameBankerid;
-    }
-
-    public EnterRoomInfoModel setGameBankerid(String gameBankerid) {
-        this.gameBankerid = gameBankerid;
-        return this;
-    }
-
-    public String getGameBankerName() {
-        return gameBankerName;
-    }
-
-    public EnterRoomInfoModel setGameBankerName(String gameBankerName) {
-        this.gameBankerName = gameBankerName;
-        return this;
-    }
-
-    public String getGameBankerAvatar() {
-        return gameBankerAvatar;
-    }
-
-    public EnterRoomInfoModel setGameBankerAvatar(String gameBankerAvatar) {
-        this.gameBankerAvatar = gameBankerAvatar;
-        return this;
-    }
-
-    public String getGameBankerCoin() {
-        return gameBankerCoin;
-    }
-
-    public EnterRoomInfoModel setGameBankerCoin(String gameBankerCoin) {
-        this.gameBankerCoin = gameBankerCoin;
-        return this;
-    }
-
-    public String getGameBankerLimit() {
-        return gameBankerLimit;
-    }
-
-    public EnterRoomInfoModel setGameBankerLimit(String gameBankerLimit) {
-        this.gameBankerLimit = gameBankerLimit;
-        return this;
-    }
-
-    public String getShutTime() {
-        return shutTime;
-    }
-
-    public EnterRoomInfoModel setShutTime(String shutTime) {
-        this.shutTime = shutTime;
-        return this;
-    }
-
-    public String getKickTime() {
-        return kickTime;
-    }
-
-    public EnterRoomInfoModel setKickTime(String kickTime) {
-        this.kickTime = kickTime;
-        return this;
-    }
-
-    public String getSpeakLimit() {
-        return speakLimit;
-    }
-
-    public EnterRoomInfoModel setSpeakLimit(String speakLimit) {
-        this.speakLimit = speakLimit;
-        return this;
-    }
-
-    public String getBarrageLimit() {
-        return barrageLimit;
-    }
-
-    public EnterRoomInfoModel setBarrageLimit(String barrageLimit) {
-        this.barrageLimit = barrageLimit;
-        return this;
-    }
-
-    public String getCoin() {
-        return coin;
-    }
-
-    public EnterRoomInfoModel setCoin(String coin) {
-        this.coin = coin;
-        return this;
-    }
-
-    public VipModel getVip() {
-        return vip;
-    }
-
-    public EnterRoomInfoModel setVip(VipModel vip) {
-        this.vip = vip;
-        return this;
-    }
-
-    public LiangModel getLiang() {
-        return liang;
-    }
-
-    public EnterRoomInfoModel setLiang(LiangModel liang) {
-        this.liang = liang;
-        return this;
-    }
-
-    public String getMedalLevel() {
-        return medalLevel;
-    }
-
-    public EnterRoomInfoModel setMedalLevel(String medalLevel) {
-        this.medalLevel = medalLevel;
-        return this;
-    }
-
-    public String getMedalName() {
-        return medalName;
-    }
-
-    public EnterRoomInfoModel setMedalName(String medalName) {
-        this.medalName = medalName;
-        return this;
-    }
-
-    public String getIssuper() {
-        return issuper;
-    }
-
-    public EnterRoomInfoModel setIssuper(String issuper) {
-        this.issuper = issuper;
-        return this;
-    }
-
-    public String getUsertype() {
-        return usertype;
-    }
-
-    public EnterRoomInfoModel setUsertype(String usertype) {
-        this.usertype = usertype;
-        return this;
-    }
-
-    public String getFrontTask() {
-        return frontTask;
-    }
-
-    public EnterRoomInfoModel setFrontTask(String frontTask) {
-        this.frontTask = frontTask;
-        return this;
-    }
-
-    public String getIsmic() {
-        return ismic;
-    }
-
-    public EnterRoomInfoModel setIsmic(String ismic) {
-        this.ismic = ismic;
-        return this;
-    }
-
-    public String getIsattention() {
-        return isattention;
-    }
-
-    public EnterRoomInfoModel setIsattention(String isattention) {
-        this.isattention = isattention;
-        return this;
-    }
-
-    public List<LiveUserGiftBean> getUserlists() {
-        return userlists;
-    }
-
-    public EnterRoomInfoModel setUserlists(List<LiveUserGiftBean> userlists) {
-        this.userlists = userlists;
-        return this;
-    }
-
-    public GuardModel getGuard() {
-        return guard;
-    }
-
-    public EnterRoomInfoModel setGuard(GuardModel guard) {
-        this.guard = guard;
-        return this;
-    }
-
-    public String getGuardNums() {
-        return guardNums;
-    }
-
-    public EnterRoomInfoModel setGuardNums(String guardNums) {
-        this.guardNums = guardNums;
-        return this;
-    }
-
-    public PkinfoModel getPkinfo() {
-        return pkinfo;
-    }
-
-    public EnterRoomInfoModel setPkinfo(PkinfoModel pkinfo) {
-        this.pkinfo = pkinfo;
-        return this;
-    }
-
-    public LminfoModel getLminfo() {
-        return lminfo;
-    }
-
-    public EnterRoomInfoModel setLminfo(LminfoModel lminfo) {
-        this.lminfo = lminfo;
-        return this;
-    }
-
-    public String getIsred() {
-        return isred;
-    }
-
-    public EnterRoomInfoModel setIsred(String isred) {
-        this.isred = isred;
-        return this;
-    }
-
-    public String getIsFans() {
-        return isFans;
-    }
-
-    public EnterRoomInfoModel setIsFans(String isFans) {
-        this.isFans = isFans;
-        return this;
-    }
-
-    public String getCountFans() {
-        return countFans;
-    }
-
-    public EnterRoomInfoModel setCountFans(String countFans) {
-        this.countFans = countFans;
-        return this;
-    }
-
-    public String getIsconnection() {
-        if(StringUtil.isEmpty(isconnection)){
-            isconnection="0";
-        }
-        return isconnection;
-    }
-
-    public EnterRoomInfoModel setIsconnection(String isconnection) {
-        this.isconnection = isconnection;
-        return this;
-    }
-
-    public String getIsleave() {
-        return isleave;
-    }
-
-    public EnterRoomInfoModel setIsleave(String isleave) {
-        this.isleave = isleave;
-        return this;
-    }
-
-    public String getLandscape() {
-        return landscape;
-    }
-
-    public EnterRoomInfoModel setLandscape(String landscape) {
-        this.landscape = landscape;
-        return this;
-    }
-
-    public String getUnCharge() {
-        return unCharge;
-    }
-
-    public EnterRoomInfoModel setUnCharge(String unCharge) {
-        this.unCharge = unCharge;
-        return this;
-    }
-
-    public String getSeeTime() {
-        return seeTime;
-    }
-
-    public EnterRoomInfoModel setSeeTime(String seeTime) {
-        this.seeTime = seeTime;
-        return this;
-    }
-
-    public List<String> getGreetings() {
-        return greetings;
-    }
-
-    public EnterRoomInfoModel setGreetings(List<String> greetings) {
-        this.greetings = greetings;
-        return this;
-    }
-
-    public String getLiveBg() {
-        return liveBg;
-    }
-
-    public EnterRoomInfoModel setLiveBg(String liveBg) {
-        this.liveBg = liveBg;
-        return this;
-    }
-
-    public String getAnchorGoodnum() {
-        return anchorGoodnum;
-    }
-
-    public EnterRoomInfoModel setAnchorGoodnum(String anchorGoodnum) {
-        this.anchorGoodnum = anchorGoodnum;
-        return this;
-    }
-
-
-}

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

@@ -1,149 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 整合进入直播间接口
- */
-public class EnterRoomNewModel extends BaseModel {
-
-    @SerializedName("liveInfo")
-    private LiveInfoModel liveInfo = new LiveInfoModel();//直播间信息
-    @SerializedName("enterRoomInfo")
-    private EnterRoomInfoModel enterRoomInfo = new EnterRoomInfoModel();//原接口进入直播间数据返回
-    @SerializedName("rankHour")
-    private RankHourModel rankHour = new RankHourModel();//.热度卡
-    @SerializedName("newPeopleTask")
-    private NewPeopleTaskModel newPeopleTask = new NewPeopleTaskModel();//新人任务
-    @SerializedName("wishList")
-    private WishListModel wishList = new WishListModel();//心愿单
-    @SerializedName("guardUser")
-    private GuardUserModel guardUserAvatar = new GuardUserModel();//守护
-    @SerializedName("activeList")
-    private List<ActiveModel> activeList = new ArrayList<>();//活动列表
-    @SerializedName("isUseHotCard")
-    private String isUseHotCard = "";//是否使用热度卡
-    @SerializedName("liveRoomActivity")
-    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;
-    }
-
-    public EnterRoomNewModel setLiveRoomActivityModels(List<LiveRoomActivityModel> liveRoomActivityModels) {
-        this.liveRoomActivityModels = liveRoomActivityModels;
-        return this;
-    }
-
-    public LiveInfoModel getLiveInfo() {
-        return liveInfo;
-    }
-
-    public EnterRoomNewModel setLiveInfo(LiveInfoModel liveInfo) {
-        this.liveInfo = liveInfo;
-        return this;
-    }
-
-    public EnterRoomInfoModel getEnterRoomInfo() {
-        return enterRoomInfo;
-    }
-
-    public EnterRoomNewModel setEnterRoomInfo(EnterRoomInfoModel enterRoomInfo) {
-        this.enterRoomInfo = enterRoomInfo;
-        return this;
-    }
-
-    public RankHourModel getRankHour() {
-        return rankHour;
-    }
-
-    public EnterRoomNewModel setRankHour(RankHourModel rankHour) {
-        this.rankHour = rankHour;
-        return this;
-    }
-
-    public NewPeopleTaskModel getNewPeopleTask() {
-        return newPeopleTask;
-    }
-
-    public EnterRoomNewModel setNewPeopleTask(NewPeopleTaskModel newPeopleTask) {
-        this.newPeopleTask = newPeopleTask;
-        return this;
-    }
-
-    public WishListModel getWishList() {
-        return wishList;
-    }
-
-    public EnterRoomNewModel setWishList(WishListModel wishList) {
-        this.wishList = wishList;
-        return this;
-    }
-
-    public GuardUserModel getGuardUserAvatar() {
-        return guardUserAvatar;
-    }
-
-    public EnterRoomNewModel setGuardUserAvatar(GuardUserModel guardUserAvatar) {
-        this.guardUserAvatar = guardUserAvatar;
-        return this;
-    }
-
-    public List<ActiveModel> getActiveList() {
-        return activeList;
-    }
-
-    public EnterRoomNewModel setActiveList(List<ActiveModel> activeList) {
-        this.activeList = activeList;
-        return this;
-    }
-
-    public String getIsUseHotCard() {
-        return isUseHotCard;
-    }
-
-    public EnterRoomNewModel setIsUseHotCard(String isUseHotCard) {
-        this.isUseHotCard = isUseHotCard;
-        return this;
-    }
-
-    public int getClarityType() {
-        return clarityType;
-    }
-
-    public void setClarityType(int clarityType) {
-        this.clarityType = clarityType;
-    }
-
-    @Override
-    public String toString() {
-        return "EnterRoomNewModel{" +
-                "liveInfo=" + liveInfo +
-                ", enterRoomInfo=" + enterRoomInfo +
-                ", rankHour=" + rankHour +
-                ", newPeopleTask=" + newPeopleTask +
-                ", wishList=" + wishList +
-                ", guardUserAvatar=" + guardUserAvatar +
-                ", activeList=" + activeList +
-                ", isUseHotCard='" + isUseHotCard + '\'' +
-                ", liveRoomActivityModels=" + liveRoomActivityModels +
-                ", clarityType=" + clarityType +
-                '}';
-    }
-}

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

@@ -1,72 +0,0 @@
-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/GiftModel.java

@@ -1,105 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-
-public class GiftModel extends BaseModel{
-   @SerializedName("id")
-   private String id;
-   @SerializedName("sendtype")
-   private String sendtype;
-   @SerializedName("type")
-   private String type;
-   @SerializedName("mark")
-   private String mark;
-   @SerializedName("giftname")
-   private String giftname;
-   @SerializedName("needcoin")
-   private String needcoin;
-   @SerializedName("gifticon")
-   private String gifticon;
-   @SerializedName("swf")
-   private String swf;
-   @SerializedName("gift_uid")
-   private String giftUid;
-
-   public String getId() {
-      return id;
-   }
-
-   public GiftModel setId(String id) {
-      this.id = id;
-      return this;
-   }
-
-   public String getSendtype() {
-      return sendtype;
-   }
-
-   public GiftModel setSendtype(String sendtype) {
-      this.sendtype = sendtype;
-      return this;
-   }
-
-   public String getType() {
-      return type;
-   }
-
-   public GiftModel setType(String type) {
-      this.type = type;
-      return this;
-   }
-
-   public String getMark() {
-      return mark;
-   }
-
-   public GiftModel setMark(String mark) {
-      this.mark = mark;
-      return this;
-   }
-
-   public String getGiftname() {
-      return giftname;
-   }
-
-   public GiftModel setGiftname(String giftname) {
-      this.giftname = giftname;
-      return this;
-   }
-
-   public String getNeedcoin() {
-      return needcoin;
-   }
-
-   public GiftModel setNeedcoin(String needcoin) {
-      this.needcoin = needcoin;
-      return this;
-   }
-
-   public String getGifticon() {
-      return gifticon;
-   }
-
-   public GiftModel setGifticon(String gifticon) {
-      this.gifticon = gifticon;
-      return this;
-   }
-
-   public String getSwf() {
-      return swf;
-   }
-
-   public GiftModel setSwf(String swf) {
-      this.swf = swf;
-      return this;
-   }
-
-   public String getGiftUid() {
-      return giftUid;
-   }
-
-   public GiftModel setGiftUid(String giftUid) {
-      this.giftUid = giftUid;
-      return this;
-   }
-}

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

@@ -1,29 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-
-public class GuardModel extends BaseModel {
-
-    @SerializedName("type")
-    private String type;
-    @SerializedName("endtime")
-    private String endtime;
-
-    public String getType() {
-        return type;
-    }
-
-    public GuardModel setType(String type) {
-        this.type = type;
-        return this;
-    }
-
-    public String getEndtime() {
-        return endtime;
-    }
-
-    public GuardModel setEndtime(String endtime) {
-        this.endtime = endtime;
-        return this;
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.Gson;
-import com.google.gson.annotations.SerializedName;
-
-public class GuardUserModel extends BaseModel{
-
-    @SerializedName("guardUserAvatar")
-    private String guardUserAvatar;
-    @SerializedName("guardType")
-    private String guardType;
-
-    public static GuardUserModel objectFromData(String str) {
-
-        return new Gson().fromJson(str, GuardUserModel.class);
-    }
-
-    public String getGuardUserAvatar() {
-        return guardUserAvatar;
-    }
-
-    public void setGuardUserAvatar(String guardUserAvatar) {
-        this.guardUserAvatar = guardUserAvatar;
-    }
-
-    public String getGuardType() {
-        return guardType;
-    }
-
-    public void setGuardType(String guardType) {
-        this.guardType = guardType;
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.yunbao.common.bean;
-
-
-public class HttpCallbackModel extends BaseModel {
-    private int code;
-    private String msg;
-
-    public HttpCallbackModel() {
-    }
-
-    public HttpCallbackModel(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    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/IMLoginModel.java

@@ -1,7 +1,5 @@
 package com.yunbao.common.bean;
 
-import android.text.TextUtils;
-
 import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
@@ -66,7 +64,6 @@ public class IMLoginModel extends BaseModel {
      * noble_name : 贵族
      * sex : 1
      * slide : [{"listorder":0,"slide_cid":4,"slide_content":"","slide_des":"首充特惠大禮包","slide_id":91,"slide_name":"首充特惠大禮包","slide_pic":"https://qny.shayucm.com/20220531/90f6942fb928c3034baeb380b9c4003d.gif","slide_status":1,"slide_url":"https://ceshi.yaoulive.com/h5/activity/firstTopUp/newUp.html"},{"listorder":0,"slide_cid":4,"slide_content":"","slide_des":"充值反饋活動","slide_id":88,"slide_name":"充值反饋活動","slide_pic":"https://qny.shayucm.com/20220511/faacb51d5a45f7ff24a6f0314df133fb.gif","slide_status":1,"slide_url":"https://ceshi.yaoulive.com/h5/GuildTournament/202204/Tournament.html"}]
-     * slide : [{"listorder":0,"slide_cid":4,"slide_content":"","slide_des":"首充特惠大禮包","slide_id":91,"slide_name":"首充特惠大禮包","slide_pic":"https://qny.shayucm.com/20220531/90f6942fb928c3034baeb380b9c4003d.gif","slide_status":1,"slide_url":"https://ceshi.yaoulive.com/h5/activity/firstTopUp/newUp.html"},{"listorder":0,"slide_cid":4,"slide_content":"","slide_des":"充值反饋活動","slide_id":88,"slide_name":"充值反饋活動","slide_pic":"https://qny.shayucm.com/20220511/faacb51d5a45f7ff24a6f0314df133fb.gif","slide_status":1,"slide_url":"https://ceshi.yaoulive.com/h5/GuildTournament/202204/Tournament.html"}]
      * users_type : A
      * votes : 0.00
      * votestotal : 0
@@ -225,126 +222,6 @@ public class IMLoginModel extends BaseModel {
     //超皇字体颜色
     @SerializedName("contentColor")
     private String contentColor = "";
-    //创建时间
-    @SerializedName("create_time")
-    private String createTime = "";
-
-    @SerializedName("is_guess")
-    private String isGuess = "";
-
-    @SerializedName("goodnum_expire_time")
-    private String goodnumExpireTime = "";
-
-    @SerializedName("version")
-    private String version = "";
-
-    @SerializedName("max_noble_end_time")
-    private String maxNobleEndTime = "";
-
-    @SerializedName("custom_color_id")
-    private String customColorId = "";
-
-    @SerializedName("is_chat")
-    private String isChat = "";
-
-    @SerializedName("is_rong")
-    private String isRong = "";
-
-    @SerializedName("contribution")
-    private String contribution = "";
-
-    @SerializedName("guard_type")
-    private String guardType = "";
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public IMLoginModel setCreateTime(String createTime) {
-        this.createTime = createTime;
-        return this;
-    }
-
-    public String getIsGuess() {
-        return isGuess;
-    }
-
-    public IMLoginModel setIsGuess(String isGuess) {
-        this.isGuess = isGuess;
-        return this;
-    }
-
-    public String getGoodnumExpireTime() {
-        return goodnumExpireTime;
-    }
-
-    public IMLoginModel setGoodnumExpireTime(String goodnumExpireTime) {
-        this.goodnumExpireTime = goodnumExpireTime;
-        return this;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public IMLoginModel setVersion(String version) {
-        this.version = version;
-        return this;
-    }
-
-    public String getMaxNobleEndTime() {
-        return maxNobleEndTime;
-    }
-
-    public IMLoginModel setMaxNobleEndTime(String maxNobleEndTime) {
-        this.maxNobleEndTime = maxNobleEndTime;
-        return this;
-    }
-
-    public String getCustomColorId() {
-        return customColorId;
-    }
-
-    public IMLoginModel setCustomColorId(String customColorId) {
-        this.customColorId = customColorId;
-        return this;
-    }
-
-    public String getIsChat() {
-        return isChat;
-    }
-
-    public IMLoginModel setIsChat(String isChat) {
-        this.isChat = isChat;
-        return this;
-    }
-
-    public String getIsRong() {
-        return isRong;
-    }
-
-    public IMLoginModel setIsRong(String isRong) {
-        this.isRong = isRong;
-        return this;
-    }
-
-    public String getContribution() {
-        return contribution;
-    }
-
-    public IMLoginModel setContribution(String contribution) {
-        this.contribution = contribution;
-        return this;
-    }
-
-    public String getGuardType() {
-        return guardType;
-    }
-
-    public IMLoginModel setGuardType(String guardType) {
-        this.guardType = guardType;
-        return this;
-    }
 
     public String getNobleEndTime() {
         return nobleEndTime;
@@ -802,15 +679,6 @@ public class IMLoginModel extends BaseModel {
         return usersType;
     }
 
-    /**
-     * usersType ==C 是主播身份
-     *
-     * @return
-     */
-    public boolean anchorUserType() {
-        return TextUtils.equals("C", usersType);
-    }
-
     public IMLoginModel setUsersType(String usersType) {
         this.usersType = usersType;
         return this;

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

@@ -1,98 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-
-public class LinkMicUserBean extends BaseModel {
-    @SerializedName("user_nicename")
-    private String uname;
-    @SerializedName("avatar")
-    private String avatar;
-    @SerializedName("dress_avatar")
-    private String dress_avatar;
-    private String uid = "";
-    private String action;
-    @SerializedName("id")
-    private String id;//连麦显示右侧头像时要用
-    @SerializedName("level")
-    private int level;
-    @SerializedName("sex")
-    private int sex;
-
-    public String getUname() {
-        return uname;
-    }
-
-    public void setUname(String uname) {
-        this.uname = uname;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public String getDress_avatar() {
-        return dress_avatar;
-    }
-
-    public void setDress_avatar(String dress_avatar) {
-        this.dress_avatar = dress_avatar;
-    }
-
-    public int getLevel() {
-        return level;
-    }
-
-    public void setLevel(int level) {
-        this.level = level;
-    }
-
-    public int getSex() {
-        return sex;
-    }
-
-    public void setSex(int sex) {
-        this.sex = sex;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String toString() {
-        return "LinkMicUserBean{" +
-                "uname='" + uname + '\'' +
-                ", avatar='" + avatar + '\'' +
-                ", dress_avatar='" + dress_avatar + '\'' +
-                ", uid='" + uid + '\'' +
-                ", action='" + action + '\'' +
-                ", id='" + id + '\'' +
-                ", level=" + level +
-                ", sex=" + sex +
-                '}';
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.yunbao.common.bean;
-
-import java.util.List;
-
-public class LinkMicUserBeanV2 extends BaseModel {
-    private String roomuserid;
-    private int status;
-    private List<LinkMicUserBean> userlist;
-
-    public String getRoomuserid() {
-        return roomuserid;
-    }
-
-    public void setRoomuserid(String roomuserid) {
-        this.roomuserid = roomuserid;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public List<LinkMicUserBean> getUserlist() {
-        return userlist;
-    }
-
-    public void setUserlist(List<LinkMicUserBean> userlist) {
-        this.userlist = userlist;
-    }
-}