版本更新

OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.angcyo.tablayout.DslTabLayout;
 import com.angcyo.tablayout.DslTabLayoutConfig;
 import com.angcyo.tablayout.delegate2.ViewPager2Delegate;
+import com.lxj.xpopup.XPopup;
 import com.shayu.onetoone.R;
 import com.shayu.onetoone.activity.fragments.BaseFragment;
 import com.shayu.onetoone.activity.fragments.DynamicFragment;
@@ -31,13 +32,21 @@ import com.shayu.onetoone.manager.CallClientManager;
 import com.shayu.onetoone.manager.OTONetManager;
 import com.shayu.onetoone.manager.RouteManager;
 import com.shayu.onetoone.manager.SendMessageManager;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.manager.APKManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.VersionUtil;
+import com.yunbao.common.views.APKUpdateCustomPopup;
+import com.yunbao.common.views.APKUpdateOneToOnePopup;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -118,6 +127,35 @@ public class MainActivity extends AbsOTOActivity {
             }
         });
         CallClientManager.getManager();
+        checkVersion();
+    }
+
+    /**
+     * 检查版本更新
+     */
+    private void checkVersion() {
+        CommonAppConfig.getInstance().getConfig(new CommonCallback<ConfigBean>() {
+            @Override
+            public void callback(ConfigBean configBean) {
+                if (configBean != null) {
+                    if (configBean.getMaintainSwitch() == 1) {//开启维护
+                        DialogUitl.showSimpleTipDialog(mContext, mContext.getString(R.string.main_maintain_notice), configBean.getMaintainTips());
+                    }
+                    if (!VersionUtil.isLatest(configBean.getVersion())) {
+                        if (!APKManager.get().getApkVerNew()) {
+                            new XPopup.Builder(mContext)
+                                    .isDestroyOnDismiss(true)
+                                    .dismissOnBackPressed(false) // 按返回键是否关闭弹窗，默认为true
+                                    .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true
+                                    .asCustom(new APKUpdateOneToOnePopup(MainActivity.this, false))
+                                    .show();
+                        }
+                    } else {
+                        //requestBonus();
+                    }
+                }
+            }
+        });
     }
 
     private void initFirstLoginTips() {

OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java

@@ -53,7 +53,6 @@ public class AuthBloggerInletActivity extends AbsActivity {
 
         dialog = DialogUitl.loadingDialog(mContext, WordUtil.getNewString(R.string.query));
 
-        getAuthInfo();
     }
 
     AuthBean authBean;
@@ -92,7 +91,7 @@ public class AuthBloggerInletActivity extends AbsActivity {
                     });
                 } else {
                     personLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1));
-                    personImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_suc));
+                    personImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_fail));
                     perStatus.setText(R.string.to_upload);
                     perStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_5));
                     findViewById(R.id.personBt).setOnClickListener(new View.OnClickListener() {
@@ -167,8 +166,6 @@ public class AuthBloggerInletActivity extends AbsActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if (Constants.isShowPage != -1) {
-            finish();
-        }
+        getAuthInfo();
     }
 }

OneToOne/src/main/res/layout/activity_auth_blogger.xml

@@ -339,6 +339,8 @@
         android:layout_marginTop="20dp"
         android:layout_marginRight="70dp"
         android:layout_marginBottom="20dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
         android:background="@drawable/bg_auth_submit_1"
         android:gravity="center"
         android:paddingTop="10dp"