1 优化QmuiDialogUtil

YangShuai
1 parent 46a9e528
Showing 12 changed files with 137 additions and 67 deletions
app/strike/src/main/java/com/cnlive/strike/LoginSuccessActivity.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoFragment.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoMvpActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/util/QMUITipDialogUtil.java
core/base/src/main/res/drawable/selector_my_dialog_btn_left.xml
core/base/src/main/res/drawable/selector_my_dialog_btn_right.xml
core/base/src/main/res/drawable/selector_xiaojia_tip_dialog_btn_bottom.xml → core/base/src/main/res/drawable/selector_tip_dialog_btn_bottom.xml
core/base/src/main/res/drawable/shape_select_dialog_btn_left_press.xml
core/base/src/main/res/drawable/shape_select_dialog_btn_right_press.xml
core/base/src/main/res/drawable/shape_xiaojia_tip_dialog_btn_bottom_press.xml → core/base/src/main/res/drawable/shape_tip_dialog_btn_bottom_press.xml
core/base/src/main/res/layout/dialog_tip.xml
@@ -9,8 +9,6 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.strike.user.auth.UserService;
 import com.cnlive.strike.user.model.LoginSuccessInfo;
 import com.cnlive.strike.user.ui.activity.FirstLoginActivity;
@@ -48,8 +46,6 @@ public class LoginSuccessActivity extends BaseActivity {
     private void initAction() {
         switch (eventType) {
             case UserRouterHelper.SHOW_MAIN_VIEW://显示主界面
-//                CommonInfo.setUserInfo(this, UserService.getUid(this), UserService.getInstance(this).getAppAccount().getNickName(), UserService.getInstance(this).getAppAccount().getFaceUrl(), UserService.getInstance(this).getAppAccount().getMobile());
-//                RunLineActivity.newInstance(this, null, null, null, null);
                 startActivity(new Intent(me, PersonalDataActivity.class));
                 finish();
                 break;
-package com.cnlive.strike.demo.activity;
-
-import android.os.Handler;
-
-import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
-import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-
-import java.util.Observable;
-
-public class DemoFragment extends BaseFragment {
-
-    @Override
-    protected void initView() {
-        super.initView();
-        addObservable(MyOb.getInstance());
-        Handler handler = getMyFragHandler();
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                MyOb.getInstance().noti("我是你");
-            }
-        }, 3000);
-    }
-    @Override
-    public void update(Observable o, Object data) {
-        super.update(o, data);
-        if (data instanceof String) {
-            QMUITipDialogUtil.successDialog(me, (String) data, 3);
-        }
-    }
-}
@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
+import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
@@ -148,7 +149,7 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
         binding.btnObser.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                addObservable(MyOb.getInstance(),MyOb.getInstance(),MyOb.getInstance());
+                addObservable(MyOb.getInstance(), MyOb.getInstance(), MyOb.getInstance());
                 MyOb.getInstance().noti("观察者信息");
             }
         });
@@ -297,8 +298,10 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
     @Override
     public void update(Observable o, Object data) {
         super.update(o, data);
-        if (o instanceof MyOb){
-            QMUITipDialogUtil.textDialog(me, (String) data, 2);
+        if (o instanceof MyOb) {
+//            AlertUtil.showDeftToast(getBaseContext(),(String) data);
+            QMUITipDialogUtil.loadingDialog(me, (String) data);
+//            QMUITipDialogUtil.textDialog(me, (String) data, 2);
         }
     }
 }
@@ -224,7 +224,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     @Override
     public void update(Observable o, Object data) {
-
+        if (null == getMvpView()) {
+            return;
+        }
     }
     /**
@@ -492,9 +494,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mDelegate.onDestroy();
         //删除观察者
         deleteObservable();
+        mDelegate.onDestroy();
         if (null != baseBinding) {
             baseBinding.unbind();
         }
@@ -673,7 +675,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     public void requestPermission(String[] permissions, OnPermissionResponseListener
             onPermissionResponseListener) {
         this.onPermissionResponseListener = onPermissionResponseListener;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -688,7 +690,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
             onPermissionResponseListener) {
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -713,7 +715,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
             onPermissionResponseListener) {
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.isDefinePermissionCloseActivity = isDefineActivity;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -729,7 +731,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.isDefinePermissionCloseActivity = isDefineActivity;
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -796,7 +798,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
             onPermissionResponseListener) {
         this.userSetDefinePermissionTip = defineTip;
         this.onPermissionResponseListener = onPermissionResponseListener;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -812,7 +814,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.userSetDefinePermissionTip = defineTip;
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -835,7 +837,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.isDefinePermissionCloseActivity = isDefineActivity;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -852,7 +854,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.isDefinePermissionCloseActivity = isDefineActivity;
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -874,7 +876,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
             permissions, OnPermissionResponseListener onPermissionResponseListener) {
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -890,7 +892,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -914,7 +916,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.isDefinePermissionCloseActivity = isDefineActivity;
         this.userSetDefinePermissionTip = defineTip;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -932,7 +934,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.isDefinePermissionCloseActivity = isDefineActivity;
         this.userSetDefinePermissionTip = defineTip;
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -955,7 +957,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.userSetDefinePermissionTip = defineTip;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -972,7 +974,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.userSetDefinePermissionTip = defineTip;
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -997,7 +999,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.userSetDefinePermissionTip = getResources().getString(defineTip);
         this.isDefinePermissionCloseActivity = isDefineActivity;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -1015,7 +1017,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.userSetDefinePermissionTip = getResources().getString(defineTip);
         this.isDefinePermissionCloseActivity = isDefineActivity;
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -1039,7 +1041,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.onPermissionResponseListener = onPermissionResponseListener;
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.userSetDefinePermissionTip = getResources().getString(defineTip);
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -1056,7 +1058,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
         this.userSetDefinePermissionTip = getResources().getString(defineTip);
         this.isShowRefuseDialog = isShowRefuseDialog;
-        this.userSetPermission=permissions;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -1214,6 +1216,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
      * 显示提示对话框
      */
     private void showTipsDialog() {
+        if (null == getMvpView()) {
+            return;
+        }
         String tip = "";
         if (TextUtils.isEmpty(userSetDefinePermissionTip)) {
             tip = defaultDefinePermissionTip;
@@ -1571,6 +1576,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
+
     /**
      * 显示fragment栈视图
      */
 package com.cnlive.core.libs.base.util;
+import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
+import android.util.Log;
 import androidx.appcompat.app.AppCompatActivity;
@@ -15,13 +17,47 @@ import java.lang.ref.WeakReference;
  * 创建日期: 2018/10/22 18:51
  * 描    述:
  * 修 改 人:
- * 修改时间：
+ * 修改时间：2019/12/4
  * 修改备注：
  */
 public class QMUITipDialogUtil {
     private static QMUITipDialog tipDialog;
     private static WeakReference<Context> currentContext;
+    private static Handler handler = new Handler();
+    /**
+     * Loading 类型提示框
+     *
+     * @param context
+     * @param tipStr
+     */
+    public static void loadingDialog(Context context, String tipStr) {
+        try {
+            if (context instanceof Activity) {
+                if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                    return;
+                }
+            }
+            currentContext = new WeakReference<>(context);
+            if (currentContext == null) {
+                return;
+            }
+            if (tipDialog != null && tipDialog.isShowing()) {
+                tipDialog.dismiss();
+            }
+            tipDialog = new QMUITipDialog.Builder(currentContext.get())
+                    .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                    .setTipWord(tipStr)
+                    .create();
+            tipDialog.setCanceledOnTouchOutside(false);//屏蔽返回键
+            tipDialog.setCancelable(true);
+            if (!tipDialog.isShowing()) {
+                tipDialog.show();
+            }
+        } catch (Exception e) {
+
+        }
+    }
     /**
      * Loading 类型提示框
      *
@@ -30,6 +66,11 @@ public class QMUITipDialogUtil {
      */
     public static void loadingDialog(Context context, String tipStr, boolean isCancel) {
         try {
+            if (context instanceof Activity) {
+                if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                    return;
+                }
+            }
             currentContext = new WeakReference<>(context);
             if (currentContext == null) {
                 return;
@@ -59,6 +100,11 @@ public class QMUITipDialogUtil {
      */
     public static void successDialog(Context context, String tipStr, int second) {
         try {
+            if (context instanceof Activity) {
+                if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                    return;
+                }
+            }
             currentContext = new WeakReference<>(context);
             if (currentContext == null) {
                 return;
@@ -73,12 +119,18 @@ public class QMUITipDialogUtil {
             tipDialog.setCanceledOnTouchOutside(false);//屏蔽返回键
             if (!tipDialog.isShowing()) {
                 tipDialog.show();
-                new Handler().postDelayed(new Runnable() {
+                handler.removeCallbacksAndMessages(null);
+                handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         if (currentContext == null) {
                             return;
                         }
+                        if (context instanceof Activity) {
+                            if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                                return;
+                            }
+                        }
                         /**
                          * 延时执行的代码
                          */
@@ -101,6 +153,11 @@ public class QMUITipDialogUtil {
      */
     public static void failedDialog(Context context, String tipStr, int second) {
         try {
+            if (context instanceof Activity) {
+                if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                    return;
+                }
+            }
             currentContext = new WeakReference<>(context);
             if (currentContext == null) {
                 return;
@@ -115,12 +172,18 @@ public class QMUITipDialogUtil {
             tipDialog.setCanceledOnTouchOutside(false);//屏蔽返回键
             if (!tipDialog.isShowing()) {
                 tipDialog.show();
-                new Handler().postDelayed(new Runnable() {
+                handler.removeCallbacksAndMessages(null);
+                handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         if (currentContext == null) {
                             return;
                         }
+                        if (context instanceof Activity) {
+                            if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                                return;
+                            }
+                        }
                         /**
                          * 延时执行的代码
                          */
@@ -147,6 +210,11 @@ public class QMUITipDialogUtil {
      */
     public static void messageDialog(Context context, String tipStr, int second) {
         try {
+            if (context instanceof Activity) {
+                if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                    return;
+                }
+            }
             currentContext = new WeakReference<>(context);
             if (currentContext == null) {
                 return;
@@ -161,12 +229,18 @@ public class QMUITipDialogUtil {
             tipDialog.setCanceledOnTouchOutside(false);//屏蔽返回键
             if (!tipDialog.isShowing()) {
                 tipDialog.show();
-                new Handler().postDelayed(new Runnable() {
+                handler.removeCallbacksAndMessages(null);
+                handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         if (currentContext == null) {
                             return;
                         }
+                        if (context instanceof Activity) {
+                            if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                                return;
+                            }
+                        }
                         /**
                          * 延时执行的代码
                          */
@@ -191,6 +265,11 @@ public class QMUITipDialogUtil {
      */
     public static void textDialog(Context context, String tipStr, int second) {
         try {
+            if (context instanceof Activity) {
+                if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                    return;
+                }
+            }
             currentContext = new WeakReference<>(context);
             if (currentContext == null) {
                 return;
@@ -204,12 +283,18 @@ public class QMUITipDialogUtil {
             tipDialog.setCanceledOnTouchOutside(false);//屏蔽返回键
             if (!tipDialog.isShowing()) {
                 tipDialog.show();
-                new Handler().postDelayed(new Runnable() {
+                handler.removeCallbacksAndMessages(null);
+                handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
                         if (currentContext == null) {
                             return;
                         }
+                        if (context instanceof Activity) {
+                            if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                                return;
+                            }
+                        }
                         /**
                          * 延时执行的代码
                          */
@@ -228,6 +313,7 @@ public class QMUITipDialogUtil {
             if (currentContext == null) {
                 return;
             }
+            handler.removeCallbacksAndMessages(null);
             if (tipDialog != null && tipDialog.isShowing()) {
                 tipDialog.dismiss();
             }
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/transparent" android:state_pressed="false" />
-    <item android:drawable="@drawable/shape_xiaojia_dialog_btn_left_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_select_dialog_btn_left_press" android:state_pressed="true" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/transparent" android:state_pressed="false" />
-    <item android:drawable="@drawable/shape_xiaojia_dialog_btn_right_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_select_dialog_btn_right_press" android:state_pressed="true" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/transparent" android:state_pressed="false" />
-    <item android:drawable="@drawable/shape_xiaojia_tip_dialog_btn_bottom_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_tip_dialog_btn_bottom_press" android:state_pressed="true" />
 </selector>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:bottomLeftRadius="20dp" />
+    <solid android:color="@color/my_dialog_line" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:bottomRightRadius="20dp" />
+    <solid android:color="@color/my_dialog_line" />
+</shape>
 \ No newline at end of file
@@ -52,7 +52,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_xiaojia_tip_dialog_btn_bottom"
+                    android:background="@drawable/selector_tip_dialog_btn_bottom"
                     android:text="好的"
                     android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="15sp" />