1 优化基类自动解除订阅关系逻辑

YangShuai
1 parent d6c3ecde
Showing 66 changed files with 184 additions and 326 deletions
app/strike/build.gradle
app/strike/src/BaseRequest.java
app/strike/src/main/java/com/cnlive/strike/MainActivity.java
app/strike/src/main/res/layout/activity_my.xml
app/strike/src/main/res/mipmap-hdpi/timgs.png
build.gradle
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/QuickLoginPresenter.java
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/QuickLoginView.java
cloud/user/src/release/res/mipmap-hdpi/icon_account.png
cloud/user/src/release/res/mipmap-mdpi/icon_account.png
cloud/user/src/release/res/mipmap-xhdpi/icon_account.png
cloud/user/src/release/res/mipmap-xxhdpi/icon_account.png
cloud/user/src/release/res/mipmap-xxxhdpi/icon_account.png
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
core/base/src/main/java/com/cnlive/core/libs/base/network/manager/SubscriptionManager.java
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/SelectDialog.java → core/base/src/main/java/com/cnlive/core/libs/base/ui/widget/SelectDialog.java
module/xiaojiasoundbox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/TipDialog.java → core/base/src/main/java/com/cnlive/core/libs/base/ui/widget/TipDialog.java
core/base/src/main/java/com/kongzue/dialog/v3/InputDialog.java
core/base/src/main/java/com/kongzue/dialog/v3/MessageDialog.java
@@ -95,6 +95,7 @@ android {
         release {
             signingConfig signingConfigs.releaseConfig
             zipAlignEnabled true
+            debuggable = true
             resValue("string", "app_name", "网家家")
             buildConfigField("boolean", "VERSION_AS_DEBUG", "false")
             buildConfigField("String", "APP_ID", stringValue("769_jetj7bq525"))
-package com.cnlive.strike.user.network.api;
-
-
-import android.text.TextUtils;
-
-import com.cnlive.core.libs.base.application.AppConfig;
-import com.cnlive.core.network.BaseResult;
-import com.cnlive.core.network.NetBuilder;
-import com.cnlive.core.network.ServerException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.reactivex.Observable;
-import okhttp3.Interceptor;
-
-/**
- * 基本请求
- *  ys
- */
-public class BaseRequest {
-    private String userSetUrl;
-    private static BaseRequest request;
-    private long connectTimeout;//连接超时
-    private long readTimeout;//读取超时
-    private long writeTimeout;//写入超时
-    private List<Interceptor> interceptorList;//拦截器
-    private String baseUrl = "http://gank.io/api/data/";
-    private final String SP_CMS_URL_DEBUT = "http://cmstest.cnlive.com:8768/";
-    private final String SP_CMS_URL = "http://cms.cnlive.com:8768/";
-    //网++ 接口域名
-    public final String SP_BASE_URL = "https://apiwjj.cnlive.com/";
-    //网++ 测试环境 接口域名
-    public final String SP_DEBUG_URL = "http://apiwjjtest.cnlive.com/";
-    //OPEN API 接口域名
-    private final String OPEN_URL = "https://api.cnlive.com/";
-
-    /**
-     * 构造函数初始化
-     */
-    public BaseRequest() {
-        interceptorList = new ArrayList<>();
-    }
-
-
-    /**
-     * 设置连接超时
-     *
-     * @param connectTimeout
-     * @return
-     */
-    public BaseRequest setConnectTimeout(long connectTimeout) {
-        init();
-        connectTimeout = connectTimeout;
-        return request;
-    }
-
-    /**
-     * 设置读取超时
-     *
-     * @param readTimeout
-     * @return
-     */
-    public BaseRequest setReadTimeout(long readTimeout) {
-        init();
-        readTimeout = readTimeout;
-        return request;
-    }
-
-    /**
-     * 设置写入超时
-     *
-     * @param writeTimeout
-     * @return
-     */
-    public BaseRequest setWriteTimeout(long writeTimeout) {
-        init();
-        writeTimeout = writeTimeout;
-        return request;
-    }
-
-
-    /**
-     * 初始化接口地址
-     */
-    private String initBaseUrl(Class clazz) {
-        if (AppConfig.isDebug()) {
-            baseUrl = SP_DEBUG_URL;//还原初始地址
-            if (clazz == ApiBaseServiceOpen.class) {
-                return OPEN_URL;
-            }
-        }
-        return baseUrl;
-    }
-
-    /**
-     * 设置连接地址
-     *
-     * @param url
-     * @return
-     */
-    public BaseRequest setUrl(String url) {
-        init();
-        userSetUrl = url;
-        return request;
-    }
-
-    /**
-     * 添加拦截器
-     *
-     * @param interceptor
-     * @return
-     */
-    public BaseRequest addInterceptor(Interceptor interceptor) {
-        if (null != interceptor) {
-            interceptorList.add(interceptor);
-        }
-        return request;
-    }
-
-    /**
-     * @return
-     */
-    public static synchronized BaseRequest init() {
-        if (null == request) {
-            request = new BaseRequest();
-        }
-        return request;
-    }
-
-    public <NetService> NetService service(Class<NetService> clz) {
-        NetService service = null;
-        NetBuilder builder = new NetBuilder(clz);
-        if (connectTimeout > 0) {
-            builder.setConnectTimeout(connectTimeout);
-        }
-        if (readTimeout > 0) {
-            builder.setReadTimeout(readTimeout);
-        }
-        if (writeTimeout > 0) {
-            builder.setWriteTimeout(writeTimeout);
-        }
-        if (null != interceptorList && interceptorList.size() > 0) {
-            builder.addInterceptors(interceptorList);
-        }
-        //设置接口请求头地址
-        if (!TextUtils.isEmpty(userSetUrl)) {
-            builder.setBaseUrl(userSetUrl);
-            userSetUrl = "";
-        } else {
-            builder.setBaseUrl(initBaseUrl(clz));
-        }
-        service = (NetService) builder.getService();
-        builder = null;
-        //重置属性
-        resetData();
-        return service;
-
-    }
-
-    private void resetData() {
-        interceptorList.clear();
-
-        connectTimeout = 0;
-        readTimeout = 0;
-        writeTimeout = 0;
-    }
-
-
-
-
-}
 \ No newline at end of file
@@ -12,6 +12,7 @@ import android.view.View;
 import com.cnlive.strike.demo.activity.DemoActivity;
 import com.cnlive.strike.imgutil.ImgActivity;
 import com.cnlive.strike.user.ui.activity.LoginActivity;
+import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
  
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -24,8 +25,14 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        findViewById(R.id.go_to).setOnClickListener(view ->   startActivity(new Intent(this, DemoActivity.class)) );
-        findViewById(R.id.to_img).setOnClickListener(view ->   startActivity(new Intent(this, ImgActivity.class)) );
+        findViewById(R.id.go_to).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, MyActivity.class));
+//                finish();
+            }
+        });
+        findViewById(R.id.to_img).setOnClickListener(view -> startActivity(new Intent(this, ImgActivity.class)));
     }
  
     @Nullable
@@ -5,10 +5,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.cnlive.strike.MyActivity">
+
     <RelativeLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
  
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="sfwerfwef" />
     </RelativeLayout>
 </RelativeLayout>
@@ -97,10 +97,14 @@ allprojects {
                     keyPassword "www.cnlive.com"
                 }
                 releaseConfig {
-                    if (store_file != null) storeFile file(store_file)
-                    if (store_password != null) storePassword store_password
-                    if (key_alias != null) keyAlias key_alias
-                    if (key_password != null) keyPassword key_password
+//                    if (store_file != null) storeFile file(store_file)
+//                    if (store_password != null) storePassword store_password
+//                    if (key_alias != null) keyAlias key_alias
+//                    if (key_password != null) keyPassword key_password
+                    storeFile file("www.cnlive.com.key")
+                    storePassword "www.cnlive.comPassw0rd"
+                    keyAlias "strike"
+                    keyPassword "www.cnlive.com"
                 }
             }
         }
@@ -65,12 +65,8 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
         Account account = accounts.length > 0 ? accounts[0] : null;
         String name = account == null ? "" : account.name;
         //页面填充数据
-        if (!TextUtils.isEmpty(name)) {
             ifViewAttached(view -> view.uploadInputData(name));
-        }
-        if (null != accounts) {
             ifViewAttached(view -> view.uploadListData(accounts));
-        }
     }
  
     private void startTimer() {
@@ -168,9 +164,9 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
                 } else {
                     //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
 //                        MobclickAgent.onProfileSignIn("CNLive", user.getUid());
-//                    ifViewAttached(view -> view.showMainView(false, false));
+                    ifViewAttached(view -> view.showMainView(false, false));
                     //todo 测试首次用户
-                    ifViewAttached(view -> view.showEditView(false));
+//                    ifViewAttached(view -> view.showEditView(false));
                 }
                 AppConfig.setCountryCode("");
                 AppConfig.setVerificationCode("");
@@ -78,7 +78,6 @@ public class QuickLoginView extends BaseView {
         }
         String contryCode = AppConfig.getCountryCode();
         //设置区号
-//        CNLiveUserInfo userInfo = UserService.getInstance(fragment.getActivity()).getAppAccount();
         if (!TextUtils.isEmpty(contryCode)) {
             fragment.binding.tvCountry.setText("+ " + contryCode);
         } else {
@@ -209,6 +208,7 @@ public class QuickLoginView extends BaseView {
         successInfo.setClickAd(fragment.clickAd);
         successInfo.setTagShare(fragment.tagShare);
         successInfo.setTagMsg(fragment.tagMsg);
+
         if (isNewUser) {
 //            HelperUtil.isNewUser(fragment.getActivity(), successInfo, isHasOtherUserInfo);
         } else {
@@ -266,8 +266,8 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
  
     @Override
     protected void onDestroy() {
-        mDelegate.onDestroy();
         super.onDestroy();
+        mDelegate.onDestroy();
         if (null != baseBinding) {
             baseBinding.unbind();
         }
@@ -275,6 +275,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         AppManager.getInstance().deleteActivity(me);
         //清除当前订阅
         SubscriptionManager.getInstance().cancel(TAG);
+
     }
  
     /**
@@ -65,6 +65,8 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getActivity() == null) return;
+        //创建订阅映射
+        SubscriptionManager.getInstance().setCurrentDisposables(TAG);
         me = (BaseActivity) getActivity();
         mDelegate.onCreate(savedInstanceState);
         mSwipeDelegate.onCreate(savedInstanceState);
@@ -98,8 +100,6 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        //创建订阅映射
-        SubscriptionManager.getInstance().setCurrentDisposables(TAG);
         mSwipeDelegate.onViewCreated(view, savedInstanceState);
         if (null != getMvpView() && null != getPresenter()) {
             initBindingData();
@@ -199,14 +199,14 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
  
     @Override
     public void onDestroy() {
-        mDelegate.onDestroy();
-        mSwipeDelegate.onDestroyView();
-        //清除当前订阅
-        SubscriptionManager.getInstance().cancel(TAG);
         super.onDestroy();
         if (null != baseBinding) {
             baseBinding.unbind();
         }
+        mDelegate.onDestroy();
+        mSwipeDelegate.onDestroyView();
+        //清除当前订阅
+        SubscriptionManager.getInstance().cancel(TAG);
     }
  
     /**
@@ -333,6 +333,8 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     public void onDestroyView() {
         mDelegate.onDestroyView();
         super.onDestroyView();
+        //清除当前订阅
+        SubscriptionManager.getInstance().cancel(TAG);
     }
  
     @Override
@@ -18,18 +18,22 @@ public class SubscriptionManager {
     public static SubscriptionManager instance;
     public HashMap<String, CompositeDisposable> hashDisposable;//所有订阅关系
     public HashMap<Integer, String> hashTag;//当前activity
+    public HashMap<String, Integer> hashTagIndex;//当前activity
     private String currentClassName;
  
     /**
      * 构造函数 new CompositeDisposable对象
      */
-    public SubscriptionManager() {
+    public  SubscriptionManager() {
         if (null == hashDisposable) {
             hashDisposable = new HashMap<>();
         }
         if (null == hashTag) {
             hashTag = new HashMap<>();
         }
+        if (null == hashTagIndex) {
+            hashTagIndex = new HashMap<>();
+        }
     }
  
     /**
@@ -48,27 +52,44 @@ public class SubscriptionManager {
         return instance;
     }
  
-    public void setCurrentDisposables(String TAG) {
+    public synchronized void setCurrentDisposables(String TAG) {
         if (null == hashDisposable.get(TAG)) {
             currentClassName = TAG;
             hashDisposable.put(TAG, new CompositeDisposable());
             //存放当前class映射
             hashTag.put(hashDisposable.size() - 1, TAG);
+            hashTagIndex.put(TAG, hashTag.size() - 1);
+            Log.e(TAG, "初始化: ");
         }
     }
  
     /**
      * 取消订阅事件
      */
-    public void cancel(String TAG) {
-        if (null != hashDisposable && hashDisposable.size() > 0) {
-            if (null != hashDisposable.get(TAG) && hashDisposable.get(TAG).size() > 0) {
-                CompositeDisposable mDisposables = hashDisposable.get(TAG);
-                if (!mDisposables.isDisposed()) {
-                    Log.e(TAG, "cancel: 解除订阅");
-                    mDisposables.clear();
+    public synchronized void cancel(String TAG) {
+        try {
+            if (null != hashDisposable && hashDisposable.size() > 0) {
+                if (null != hashDisposable.get(TAG) && hashDisposable.get(TAG).size() > 0) {
+                    CompositeDisposable mDisposables = hashDisposable.get(TAG);
+                    if (!mDisposables.isDisposed()) {
+                        Log.e(TAG, "cancel: 解除订阅");
+                        mDisposables.clear();
+                    }
+                }
+                //移除
+                hashDisposable.remove(TAG);
+            }
+            if (null != hashTagIndex.get(TAG)) {
+                int currentIndex = hashTagIndex.get(TAG);
+                //移除
+                if (null != hashTag.get(currentIndex)) {
+                    Log.e(TAG, "cancel: " + hashTag.get(currentIndex));
+                    hashTag.remove(currentIndex);
                 }
+                hashTagIndex.remove(TAG);
             }
+        } catch (Exception e) {
+            Log.e(TAG, "cancel: " + e.getMessage());
         }
     }
  
@@ -77,7 +98,7 @@ public class SubscriptionManager {
      *
      * @param disposable 订阅事件
      */
-    public void add(Disposable disposable) {
+    public synchronized void add(Disposable disposable) {
         if (disposable == null) return;
         //每次去除最新的activity进行存放
         if (null != hashDisposable && hashDisposable.size() > 0) {
@@ -85,7 +106,7 @@ public class SubscriptionManager {
                 if (null != hashDisposable.get(currentClassName)) {
                     //存放当前activity对应的订阅
                     hashDisposable.get(currentClassName).add(disposable);
-                    Log.e(currentClassName, "add: 添加订阅关系");
+                    Log.e(currentClassName, "add: 添加订阅关系" + hashDisposable.size());
                 }
             }
         }
@@ -105,7 +126,7 @@ public class SubscriptionManager {
     /**
      * 清除容器所有
      */
-    public void cancelAll() {
+    public synchronized void cancelAll() {
         //解除所有订阅
         if (null != hashDisposable && hashDisposable.size() > 0) {
             if (null != hashTag && hashTag.size() > 0) {
@@ -118,5 +139,8 @@ public class SubscriptionManager {
                 }
             }
         }
+        hashDisposable.clear();
+        hashTag.clear();
+        hashTagIndex.clear();
     }
 }
-package com.cnlive.strike.xiaojiaspeaker.ui.widget;
+package com.cnlive.core.libs.base.ui.widget;
  
 import android.app.Dialog;
 import android.content.Context;
@@ -15,7 +15,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
  
-import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.base.R;
  
  
 /**
@@ -38,7 +38,7 @@ public class SelectDialog extends Dialog {
     public SelectDialog(@NonNull Context context, String tipText, String btnCancelText, DialogInterface cancelInterface, String btnOkText, DialogInterface okInterface) {
         super(context, R.style.MyDialog);
         this.context = context;
-        view = LayoutInflater.from(context).inflate(R.layout.dialog_select, null);
+        view = LayoutInflater.from(context).inflate(R.layout.my_dialog_select, null);
         initView(view);
         layoutParams = new LinearLayout.LayoutParams((int) (getScreenWidth(context) * 0.8), ViewGroup.LayoutParams.WRAP_CONTENT);
         ll_child.setLayoutParams(layoutParams);
-package com.cnlive.strike.xiaojiaspeaker.ui.widget;
+package com.cnlive.core.libs.base.ui.widget;
  
 import android.app.Dialog;
 import android.content.Context;
@@ -14,7 +14,7 @@ import android.widget.TextView;
  
 import androidx.annotation.NonNull;
  
-import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.base.R;
  
  
 /**
@@ -68,7 +68,7 @@ public class InputDialog extends MessageDialog {
                     inputDialog.build(inputDialog, R.layout.dialog_select_ios);
                     break;
                 case STYLE_KONGZUE:
-                    inputDialog.build(inputDialog, R.layout.dialog_select);
+                    inputDialog.build(inputDialog, R.layout.my_dialog_select);
                     break;
                 case STYLE_MATERIAL:
                     inputDialog.build(inputDialog);
@@ -686,7 +686,7 @@ public class InputDialog extends MessageDialog {
                 build(this, R.layout.dialog_select_ios);
                 break;
             case STYLE_KONGZUE:
-                build(this, R.layout.dialog_select);
+                build(this, R.layout.my_dialog_select);
                 break;
             case STYLE_MATERIAL:
  
@@ -97,7 +97,7 @@ public class MessageDialog extends BaseDialog {
                     messageDialog.build(messageDialog, R.layout.dialog_select_ios);
                     break;
                 case STYLE_KONGZUE:
-                    messageDialog.build(messageDialog, R.layout.dialog_select);
+                    messageDialog.build(messageDialog, R.layout.my_dialog_select);
                     break;
                 case STYLE_MATERIAL:
                     messageDialog.build(messageDialog);
@@ -880,7 +880,7 @@ public class MessageDialog extends BaseDialog {
                 build(this, R.layout.dialog_select_ios);
                 break;
             case STYLE_KONGZUE:
-                build(this, R.layout.dialog_select);
+                build(this, R.layout.my_dialog_select);
                 break;
             case STYLE_MATERIAL:
                 build(this);
@@ -3,5 +3,5 @@
     <corners
         android:bottomLeftRadius="20dp"
         android:bottomRightRadius="20dp" />
-    <solid android:color="@color/line" />
+    <solid android:color="@color/my_dialog_line" />
 </shape>
 \ No newline at end of file
@@ -9,7 +9,7 @@
         android:id="@+id/ll_child"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/free_xiaojia_dialog_bg"
+        android:background="@drawable/my_dialog_bg"
         android:orientation="vertical"
         android:paddingTop="10dp">
  
@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="3dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
  
         <LinearLayout
             android:layout_width="match_parent"
@@ -54,7 +54,7 @@
                     android:layout_gravity="center"
                     android:background="@drawable/selector_xiaojia_tip_dialog_btn_bottom"
                     android:text="好的"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="15sp" />
             </LinearLayout>
  
@@ -9,7 +9,7 @@
         android:id="@+id/ll_child"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/free_xiaojia_dialog_bg"
+        android:background="@drawable/my_dialog_bg"
         android:orientation="vertical"
         android:paddingTop="10dp">
  
@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="3dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
  
         <LinearLayout
             android:layout_width="match_parent"
@@ -52,9 +52,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_xiaojia_dialog_btn_left"
+                    android:background="@drawable/selector_my_dialog_btn_left"
                     android:text="否"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="15sp"
                     android:textStyle="bold" />
             </LinearLayout>
@@ -62,7 +62,7 @@
             <View
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
-                android:background="@color/line" />
+                android:background="@color/my_dialog_line" />
  
             <LinearLayout
                 android:layout_width="0dp"
@@ -76,9 +76,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_xiaojia_dialog_btn_right"
+                    android:background="@drawable/selector_my_dialog_btn_right"
                     android:text="否"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="15sp"
                     android:textStyle="bold" />
             </LinearLayout>
@@ -60,4 +60,7 @@
     <color name="tipTextColor">#8f8f8f</color>
     <color name="menuSplitSpaceKongzue">#f1f2f4</color>
     <!--    -->
+    <color name="my_dialog_line">#80EEEEEE</color>
+    <color name="my_dialog_btn_text_color">#23D41E</color>
+
 </resources>
 \ No newline at end of file
@@ -155,5 +155,16 @@
         <item name="android:windowEnterAnimation">@anim/top_menu_enter</item>
         <item name="android:windowExitAnimation">@anim/top_menu_exit</item>
     </style>
-<!--    -->
+    <!--    -->
+    <!--    自定义对话框-->
+    <!--自定义Dialog背景全透明无边框theme-->
+    <style name="MyDialog" parent="android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+    <!--    -->
 </resources>
 \ No newline at end of file
@@ -40,12 +40,12 @@ public class BaseRequest {
     private String initBaseUrl(Class clazz) {
         if (AppConfig.isDebug()) {
             baseUrl = BASE_DEBUG_URL;//还原初始地址
-            if (clazz == ApiBaseServiceOpen.class) {
-                return OPEN_URL;
-            }
         } else {
             baseUrl = BASE_URL;
         }
+        if (clazz == ApiBaseServiceOpen.class) {
+            return OPEN_URL;
+        }
         return baseUrl;
     }
  
@@ -17,10 +17,9 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeWifiFragmentPresen
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeWifiFragment;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.TipDialog;
+import com.cnlive.core.libs.base.ui.widget.TipDialog;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.WifiPwdDialog;
 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 import java.util.ArrayList;
 import java.util.List;
@@ -87,7 +86,7 @@ public class ChangeWifiFragmentView extends BaseView {
     }
  
     private void initErrorDialog() {
-        errorDialog = new TipDialog(getContext(), "", "关闭", R.color.btn_green, new TipDialog.DialogInterface() {
+        errorDialog = new TipDialog(getContext(), "", "关闭", R.color.my_dialog_btn_text_color, new TipDialog.DialogInterface() {
             @Override
             public void onClick(TipDialog dialog) {
                 dialog.dismiss();
@@ -142,7 +141,7 @@ public class ChangeWifiFragmentView extends BaseView {
             }
         });
         wifiPwdDialog.setLeftBtnColor(R.color.color_999999);
-        wifiPwdDialog.setRightBtnColor(R.color.btn_green);
+        wifiPwdDialog.setRightBtnColor(R.color.my_dialog_btn_text_color);
         wifiPwdDialog.setCancelable(false);
         wifiPwdDialog.setCanceledOnTouchOutside(false);
     }
@@ -25,10 +25,9 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.ChangeWifiActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceInfoActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.FirmwareUpdateActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.DeviceManagerFragment;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
+import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 public class DeviceManagerFragmentView extends BaseView {
     private DeviceManagerFragment fragment;
@@ -143,7 +142,7 @@ public class DeviceManagerFragmentView extends BaseView {
                 selectDialog.setCancelable(false);
                 selectDialog.setCanceledOnTouchOutside(false);
                 selectDialog.setTipTextStyle(Typeface.DEFAULT);
-                selectDialog.setRightBtnColor(R.color.btn_green);
+                selectDialog.setRightBtnColor(R.color.my_dialog_btn_text_color);
                 if (!selectDialog.isShowing()) {
                     selectDialog.show();
                 }
@@ -19,9 +19,8 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothHelpActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.SelectWifiActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.BluetoothDeviceAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SearchDevicefragment;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
+import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 import java.util.ArrayList;
 import java.util.List;
@@ -112,7 +111,7 @@ public class SearchDevicefragmentView extends BaseView {
                 dialog.dismiss();
             }
         });
-        wifiDialog.setRightBtnColor(R.color.btn_green);
+        wifiDialog.setRightBtnColor(R.color.my_dialog_btn_text_color);
         wifiDialog.setCancelable(false);
         wifiDialog.setCanceledOnTouchOutside(false);
     }
@@ -30,12 +30,11 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnFailActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.TipDialog;
+import com.cnlive.core.libs.base.ui.widget.TipDialog;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.WifiPwdDialog;
 import com.cnlive.strike.xiaojiaspeaker.util.BlueToothUtil;
 import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 import org.greenrobot.eventbus.EventBus;
  
@@ -120,7 +119,7 @@ public class SelectWifiFragmentView extends BaseView {
     }
  
     private void initErrorDialog() {
-        errorDialog = new TipDialog(getContext(), "", "关闭", R.color.btn_green, new TipDialog.DialogInterface() {
+        errorDialog = new TipDialog(getContext(), "", "关闭", R.color.my_dialog_btn_text_color, new TipDialog.DialogInterface() {
             @Override
             public void onClick(TipDialog dialog) {
                 dialog.dismiss();
@@ -161,7 +160,7 @@ public class SelectWifiFragmentView extends BaseView {
             }
         });
         wifiPwdDialog.setLeftBtnColor(R.color.color_999999);
-        wifiPwdDialog.setRightBtnColor(R.color.btn_green);
+        wifiPwdDialog.setRightBtnColor(R.color.my_dialog_btn_text_color);
         wifiPwdDialog.setCancelable(false);
         wifiPwdDialog.setCanceledOnTouchOutside(false);
     }
@@ -23,10 +23,9 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.SelectIMFriendActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.UserＭanagerAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.UserManagerFragment;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.EditRoleDialog;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
+import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 import java.util.ArrayList;
 import java.util.List;
@@ -163,7 +162,7 @@ public class UserManagerView extends BaseView {
                         });
                     }
                 });
-                deleteDialog.setRightBtnColor(R.color.btn_green);
+                deleteDialog.setRightBtnColor(R.color.my_dialog_btn_text_color);
                 deleteDialog.setTipTextStyle(Typeface.DEFAULT);
                 if (!deleteDialog.isShowing()) {
                     deleteDialog.show();
@@ -7,15 +7,10 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
-
-import androidx.databinding.DataBindingUtil;
-
 import com.clj.fastble.BleManager;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
@@ -24,10 +19,8 @@ import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityBlueToothStep2Binding;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
+import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
-import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
-import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
  
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -35,7 +28,6 @@ import org.greenrobot.eventbus.ThreadMode;
 public class BlueToothStep2Activity extends BaseActivity {
     private ActivityBlueToothStep2Binding binding;
     private int permissionRequestCount = 0;//权限请求次数
-    private boolean isClickNextBtn = false;
     private SelectDialog selectDialog;
  
     @Override
@@ -119,7 +111,7 @@ public class BlueToothStep2Activity extends BaseActivity {
      * 一次申请一组权限（使用拒绝弹框）点击事件
      */
     public void getPermissionsWithTip() {
-        String[] permissions = new String[]{ Manifest.permission.INTERNET
+        String[] permissions = new String[]{Manifest.permission.INTERNET
                 , Manifest.permission.ACCESS_FINE_LOCATION
                 , Manifest.permission.ACCESS_COARSE_LOCATION};
         requestPermission(permissions, "您尚未授予程序运行所需权限\n是否设置?", new OnPermissionResponseListener() {
@@ -178,10 +170,8 @@ public class BlueToothStep2Activity extends BaseActivity {
                     switch (blueState) {
                         case BluetoothAdapter.STATE_TURNING_ON:
                             Log.e(TAG, "监听到蓝牙已开启");
-                            if (isClickNextBtn) {
-                                SearchDeviceActivity.startActivity(BlueToothStep2Activity.this);
-                                finish();
-                            }
+                            SearchDeviceActivity.startActivity(BlueToothStep2Activity.this);
+                            finish();
                             break;
                         case BluetoothAdapter.STATE_ON:
                             Log.e(TAG, "监听到蓝牙已启动");
@@ -3,7 +3,6 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -11,16 +10,13 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
  
-import androidx.annotation.NonNull;
-
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeWifiFragment;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
+import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
-import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
  
 public class ChangeWifiActivity extends BaseActivity {
@@ -37,6 +37,11 @@ public class RemoteControlActivity extends BaseActivity {
         return R.layout.activity_remote_control;
     }
  
+    @Override
+    protected void initBindingData() {
+        super.initBindingData();
+        binding= (ActivityRemoteControlBinding) baseBinding;
+    }
  
     @Override
     protected void initView() {
@@ -3,9 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
 import android.util.Log;
@@ -14,7 +12,7 @@ import com.clj.fastble.data.BleDevice;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
+import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
@@ -87,7 +87,7 @@ public class AllDeviceFragment extends BaseFragment&lt;AllDeviceFragmentView, AllDe
             binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    getActivity().finish();
+                    finish();
                 }
             });
             //添加设备按钮
@@ -50,7 +50,7 @@ public class SelectWifiFragment extends BaseFragment&lt;SelectWifiFragmentView, Sel
     @Override
     protected void initFragmentStyle() {
         super.initFragmentStyle();
-        setStatusBarTextColor(StatusBarConfig.WHITE);
+        setStatusBarTextColor(StatusBarConfig.BLACK);
         setStatusBarColor(R.color.white,0);
     }
  
@@ -88,7 +88,7 @@ public class WifiPwdDialog extends Dialog {
         //显示视图
         this.setContentView(view);
         this.btn_ok.setClickable(false);
-        this.btn_ok.setTextColor(ContextCompat.getColor(context, R.color.line));
+        this.btn_ok.setTextColor(ContextCompat.getColor(context, R.color.my_dialog_line));
         this.et_pwd.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -99,12 +99,12 @@ public class WifiPwdDialog extends Dialog {
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
                 if (charSequence.length() < 8) {
                     btn_ok.setClickable(false);
-                    btn_ok.setTextColor(ContextCompat.getColor(context, R.color.line));
+                    btn_ok.setTextColor(ContextCompat.getColor(context, R.color.my_dialog_line));
  
                 } else {
                     btn_ok.setClickable(true);
                     btn_ok.setTextColor(ContextCompat.getColor(context, rightColor));
-                    btn_ok.setBackground(context.getResources().getDrawable(R.drawable.selector_xiaojia_dialog_btn_right));
+                    btn_ok.setBackground(context.getResources().getDrawable(R.drawable.selector_my_dialog_btn_right));
                 }
             }
  
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/line">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/my_dialog_line">
     <item android:drawable="@color/transparent"/>
 </ripple>
  
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/line">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/my_dialog_line">
     <item android:drawable="@color/white"/>
 </ripple>
  
@@ -9,7 +9,7 @@
     </item>
     <item android:state_checked="true">
         <shape>
-            <solid android:color="@color/btn_green" />
+            <solid android:color="@color/my_dialog_btn_text_color" />
             <corners android:radius="99dp" />
             <stroke android:width="1px" android:color="#DEDEDE" />
         </shape>
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/abc_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
     <item android:drawable="@drawable/abc_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true"/>
-    <item android:drawable="@color/line" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@color/line" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@color/my_dialog_line" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@color/my_dialog_line" android:state_focused="false" android:state_pressed="true"/>
     <item android:drawable="@color/white"/>
 </selector>
  
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/abc_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
     <item android:drawable="@drawable/abc_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true"/>
-    <item android:drawable="@color/line" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@color/line" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@color/my_dialog_line" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@color/my_dialog_line" android:state_focused="false" android:state_pressed="true"/>
     <item android:drawable="@color/white"/>
 </selector>
  
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/abc_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true"/>
     <item android:drawable="@drawable/abc_list_selector_disabled_holo_light" android:state_enabled="false" android:state_focused="true"/>
-    <item android:drawable="@color/line" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@color/line" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@color/my_dialog_line" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@color/my_dialog_line" android:state_focused="false" android:state_pressed="true"/>
     <item android:drawable="@color/white"/>
 </selector>
  
@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="50dp" />
     <!-- 填充的颜色 -->
-    <solid android:color="@color/btn_green" />
+    <solid android:color="@color/my_dialog_btn_text_color" />
     <!--设置渐变-->
     <!--设置渐变-->
     <gradient
-        android:endColor="@color/btn_green"
+        android:endColor="@color/my_dialog_btn_text_color"
         android:startColor="#49EE1D" />
 </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:bottomLeftRadius="20dp" />
-    <solid android:color="@color/line" />
+    <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/line" />
+    <solid android:color="@color/my_dialog_line" />
 </shape>
 \ No newline at end of file
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="1dp"
-        android:color="@color/line" />
-    <solid android:color="@color/line" />
+        android:color="@color/my_dialog_line" />
+    <solid android:color="@color/my_dialog_line" />
     <corners android:radius="10dp" />
 </shape>
 \ No newline at end of file
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="1dp"
-        android:color="@color/btn_green" />
+        android:color="@color/my_dialog_btn_text_color" />
     <solid android:color="@color/white" />
     <corners android:radius="20dp" />
 </shape>
 \ No newline at end of file
@@ -37,7 +37,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:text="@string/conn_success"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="20sp"
                     android:textStyle="bold" />
             </LinearLayout>
@@ -70,7 +70,7 @@
                     android:layout_marginTop="30dp"
                     android:background="@drawable/shape_xiaojia_green_stroke"
                     android:text="完成"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="18sp" />
  
                 <TextView
@@ -81,7 +81,7 @@
                     android:layout_marginTop="30sp"
                     android:gravity="center"
                     android:text="给音箱取个名字吧 >>"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="13sp" />
  
             </LinearLayout>
@@ -98,7 +98,7 @@
                     android:layout_height="1dp"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
-                    android:background="@color/line" />
+                    android:background="@color/my_dialog_line" />
  
                 <TextView
                     android:layout_width="wrap_content"
@@ -116,7 +116,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="15dp"
                     android:text="@string/go_to_liaten_china"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="13sp" />
             </LinearLayout>
         </LinearLayout>
@@ -9,7 +9,7 @@
         android:id="@+id/ll_child"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/free_xiaojia_dialog_bg"
+        android:background="@drawable/my_dialog_bg"
         android:orientation="vertical"
         android:paddingTop="10dp">
  
@@ -31,7 +31,7 @@
             android:layout_marginLeft="10dp"
             android:layout_marginTop="15dp"
             android:layout_marginRight="10dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
  
         <LinearLayout
             android:layout_width="match_parent"
@@ -66,7 +66,7 @@
             android:layout_height="1dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
  
         <LinearLayout
             android:layout_width="match_parent"
@@ -86,7 +86,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_xiaojia_dialog_btn_left"
+                    android:background="@drawable/selector_my_dialog_btn_left"
                     android:text="取消"
                     android:textColor="@color/color_282828"
                     android:textSize="17sp" />
@@ -95,7 +95,7 @@
             <View
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
-                android:background="@color/line" />
+                android:background="@color/my_dialog_line" />
  
             <LinearLayout
                 android:layout_width="0dp"
@@ -109,9 +109,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_xiaojia_dialog_btn_right"
+                    android:background="@drawable/selector_my_dialog_btn_right"
                     android:text="保存"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="17sp" />
             </LinearLayout>
  
@@ -9,7 +9,7 @@
         android:id="@+id/ll_child"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/free_xiaojia_dialog_bg"
+        android:background="@drawable/my_dialog_bg"
         android:orientation="vertical"
         android:paddingTop="10dp">
  
@@ -71,7 +71,7 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="3dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
  
         <LinearLayout
             android:layout_width="match_parent"
@@ -91,7 +91,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_xiaojia_dialog_btn_left"
+                    android:background="@drawable/selector_my_dialog_btn_left"
                     android:text="否"
                     android:textColor="@color/black"
                     android:textSize="15sp"
@@ -101,7 +101,7 @@
             <View
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
-                android:background="@color/line" />
+                android:background="@color/my_dialog_line" />
  
             <LinearLayout
                 android:layout_width="0dp"
@@ -115,10 +115,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_xiaojia_dialog_btn_right"
+                    android:background="@drawable/selector_my_dialog_btn_right"
                     android:clickable="false"
                     android:text="否"
-                    android:textColor="@color/line"
+                    android:textColor="@color/my_dialog_line"
                     android:textSize="15sp"
                     android:textStyle="bold" />
             </LinearLayout>
@@ -58,7 +58,7 @@
             android:layout_height="1dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
  
         <TextView
             android:layout_width="wrap_content"
@@ -121,7 +121,7 @@
                     android:layout_height="1dp"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
-                    android:background="@color/line" />
+                    android:background="@color/my_dialog_line" />
             </LinearLayout>
  
  
@@ -173,7 +173,7 @@
                 android:layout_height="1dp"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
-                android:background="@color/line" />
+                android:background="@color/my_dialog_line" />
             <!--设备说明-->
             <RelativeLayout
                 android:id="@+id/rl_device_declare"
@@ -308,7 +308,7 @@
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-                        android:background="@color/line" />
+                        android:background="@color/my_dialog_line" />
  
                     <TextView
                         android:id="@+id/tv_delete_device"
@@ -42,7 +42,7 @@
                         android:layout_height="50dp"
                         android:clickable="false"
                         android:focusableInTouchMode="false"
-                        app:indicatorColor="@color/btn_green"
+                        app:indicatorColor="@color/my_dialog_btn_text_color"
                         app:indicatorName="BallSpinFadeLoaderIndicator" />
                 </LinearLayout>
                 <!-- 未扫描到的视图-->
@@ -53,7 +53,7 @@
                             android:layout_height="50dp"
                             android:clickable="false"
                             android:focusableInTouchMode="false"
-                            app:indicatorColor="@color/btn_green"
+                            app:indicatorColor="@color/my_dialog_btn_text_color"
                             app:indicatorName="BallSpinFadeLoaderIndicator" />
                     </LinearLayout>
                 </FrameLayout>
@@ -50,7 +50,7 @@
                     android:paddingLeft="5dp"
                     android:paddingRight="5dp"
                     android:text="管理员"
-                    android:textColor="@color/btn_green"
+                    android:textColor="@color/my_dialog_btn_text_color"
                     android:textSize="11sp" />
             </LinearLayout>
  
@@ -54,7 +54,7 @@
                         android:paddingLeft="5dp"
                         android:paddingRight="5dp"
                         android:text="管理员"
-                        android:textColor="@color/btn_green"
+                        android:textColor="@color/my_dialog_btn_text_color"
                         android:textSize="11sp" />
                 </LinearLayout>
  
@@ -143,6 +143,6 @@
             android:id="@+id/view_line"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
     </LinearLayout>
 </layout>
 \ No newline at end of file
@@ -63,6 +63,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
     </LinearLayout>
 </layout>
 \ No newline at end of file
@@ -40,7 +40,7 @@
             android:id="@+id/view_line"
             android:layout_width="match_parent"
             android:layout_height="0.1dp"
-            android:background="@color/line" />
+            android:background="@color/my_dialog_line" />
  
     </LinearLayout>
 </layout>
 \ No newline at end of file
 <resources xmlns:tools="http://schemas.android.com/tools">
  
-    <!--自定义Dialog背景全透明无边框theme-->
-    <style name="MyDialog" parent="android:style/Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:background">@android:color/transparent</item>
-    </style>
+
     <!--    自定义checkbox-->
     <style name="CustomCheckboxTheme" parent="@android:style/Widget.CompoundButton.CheckBox">
         <item name="android:button">@null</item>