Merge branch 'master' into master_sud

# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	config.gradle

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -88,6 +88,7 @@ import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.APKManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.NoviceInstructorManager;
+import com.yunbao.common.manager.OpenAdManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.DpUtil;
@@ -210,13 +211,14 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     @Override
     protected void onPause() {
         super.onPause();
-
+        OpenAdManager.getInstance().dismiss();
     }
 
     @Override
     protected void main() {
         ActivityCompat.postponeEnterTransition(this);
         ConversationIMListManager.get(this);
+        OpenAdManager.getInstance();
         //在请求一下这个接口给我后台版本号
         CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
             @Override
@@ -526,7 +528,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         //获取指导员账号
         ConversationIMListManager.get(this).getUserInstructor(this);
         checkVersion();
-
     }
 
     @Override
@@ -875,7 +876,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         NoviceInstructorManager.get(mContext).getNoviceInstructor();
         NoviceInstructorManager.get(mContext).checktHomeZdyPop();
         initAnchorRecommendBanner();
-
+        OpenAdManager.getInstance().show(OpenAdManager.TYPE_HOME, false);
     }
 
     /**
@@ -1074,6 +1075,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             if (EasyFloat.isShow("LiveFloatView")) {
                 EasyFloat.dismiss("LiveFloatView", true);
             }
+            OpenAdManager.getInstance().reset();
             super.onBackPressed();
         }
     }

main/src/main/java/com/yunbao/main/dialog/EncourageDialog.java

@@ -1,11 +1,16 @@
 package com.yunbao.main.dialog;
 
+import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
+
 import android.annotation.SuppressLint;
+import android.app.Dialog;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,12 +21,14 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.fastjson.JSON;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.yunbao.common.Constants;
 import com.yunbao.common.dialog.AbsDialogFragment;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.main.R;
@@ -265,8 +272,23 @@ public class EncourageDialog extends AbsDialogFragment implements View.OnClickLi
             public void onSuccess(int code, String msg, String[] info) {
                 if (code == 0) {
                     dismiss();
+                } else if (code == 1001) {
+                    DialogUitl.showSimpleDialog(mContext, msg, new DialogUitl.SimpleCallback2() {
+                        @Override
+                        public void onCancelClick() {
+
+                        }
+
+                        @Override
+                        public void onConfirmClick(Dialog dialog, String content) {
+                            dialog.dismiss();
+                            ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation();
+                        }
+                    });
+                } else {
+                    ToastUtil.show(msg);
                 }
-                ToastUtil.show(msg);
+
             }
         });
 

main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java

@@ -244,7 +244,7 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
                         LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
                     });
                 } else {
-                    String tips="需要下载开播插件，是否下载";
+                    String tips="需要下載開播插件，是否下載";
                     if(!WordUtil.isNewZh()){
                         tips="You need to download the plug-in, whether to download";
                     }