1 修改项目资源,去除与主项目冲突

YangShuai
1 parent 5771a8b6
Showing 100 changed files with 33 additions and 74 deletions
app/src/main/res/layout/dialog_select.xml
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectIMFriendView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SetFriendsRoleView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/UserManagerView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothHelpActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep1Activity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInfoActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInstructionActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceManagerActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/RemoteControlActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ShareFriendActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeDeviceNameFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeWifiFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceDetailFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceManagerFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/FirmwareUpdateFragment.java
@@ -9,7 +9,7 @@
         android:id="@+id/ll_child"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/free_dialog_bg"
+        android:background="@drawable/free_xiaojia_dialog_bg"
         android:orientation="vertical"
         android:paddingTop="10dp"
        >
@@ -51,7 +51,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_dialog_btn_left"
+                    android:background="@drawable/selector_xiaojia_dialog_btn_left"
                     android:text="否"
                     android:textColor="@color/black"
                     android:textSize="15sp"
@@ -75,7 +75,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:background="@drawable/selector_dialog_btn_right"
+                    android:background="@drawable/selector_xiaojia_dialog_btn_right"
                     android:text="否"
                     android:textColor="@color/black"
                     android:textSize="15sp"
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.1.0",
+            version: "0.1.1",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -329,7 +329,7 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
      */
     public void nextBtnCanNotClick() {
         fragment.binding.btnNext.setEnabled(false);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_gray));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_gray));
     }
  
     /**
@@ -2,14 +2,12 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
  
 import android.app.Activity;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
  
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.R;
-import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SetFriendsRolePresenter;
 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.SetRoleAdapter;
@@ -169,6 +167,6 @@ public class SetFriendsRoleView implements MvpView {
      */
     public void nextBtnCanNotClick() {
         fragment.binding.btnNext.setEnabled(false);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_gray));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_gray));
     }
 }
@@ -16,7 +16,6 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.UserManagerPresenter;
 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
-import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.InvitFriendActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.SelectIMFriendActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.UserＭanagerAdapter;
@@ -25,7 +24,6 @@ import com.cnlive.strike.xiaojiaspeaker.ui.widget.EditRoleDialog;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
-import com.cnlive.strike.xiaojiaspeaker.util.GsonUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 import java.util.ArrayList;
@@ -330,11 +328,11 @@ public class UserManagerView implements MvpView {
         popMenuInfoList = new ArrayList<>();
         PopMenuInfo popMenuInfo = new PopMenuInfo();
         popMenuInfo.setTitle("邀请网家家好友");
-        popMenuInfo.setImgDrawable(R.drawable.icon_friend);
+        popMenuInfo.setImgDrawable(R.drawable.icon_xiaojia_friend);
         popMenuInfoList.add(popMenuInfo);
         popMenuInfo = new PopMenuInfo();
         popMenuInfo.setTitle("生成二维码邀请");
-        popMenuInfo.setImgDrawable(R.drawable.icon_qrcode);
+        popMenuInfo.setImgDrawable(R.drawable.icon_xiaojia_qrcode);
         popMenuInfoList.add(popMenuInfo);
  
         if (null == mPopMenu) {
@@ -29,7 +29,7 @@ public class BlueToothHelpActivity extends AppCompatActivity {
         if (null != binding) {
             binding.topbar.setTitle("帮助").setTextColor(ContextCompat.getColor(this, R.color.color_282828));
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     finish();
@@ -11,12 +11,10 @@ import android.view.View;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.xiaojiaspeaker.R;
-import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityBlueToothStep1Binding;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
  
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
  
@@ -53,7 +51,7 @@ public class BlueToothStep1Activity extends AppCompatActivity {
         StatusBarUtil2.setColor(this, ContextCompat.getColor(this, R.color.white), 0);
         if (null != binding) {
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     finish();
@@ -18,8 +18,6 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
  
 import com.clj.fastble.BleManager;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -103,7 +101,7 @@ public class BlueToothStep2Activity extends AppCompatActivity {
         StatusBarUtil2.setColor(this, ContextCompat.getColor(this, R.color.white), 0);
         if (null != binding) {
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     finish();
@@ -106,7 +106,7 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
         if (null != binding) {
             binding.topbar.setTitle("连接成功");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     finish();
@@ -45,7 +45,7 @@ public class DeviceInfoActivity extends AppCompatActivity {
         if (null != binding) {
             binding.topbar.setTitle("设备信息");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     finish();
@@ -34,7 +34,7 @@ public class DeviceInstructionActivity extends AppCompatActivity {
         if (null != binding) {
             binding.topbar.setTitle("设备说明");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     finish();
@@ -80,7 +80,7 @@ public class DeviceManagerActivity extends AppCompatActivity {
 //        if (null != binding) {
 //            binding.topbar.setTitle("设备管理");
 //            //设置返回按钮
-//            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+//            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
 //                @Override
 //                public void onClick(View view) {
 //                    finish();
@@ -9,7 +9,6 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.CompoundButton;
  
 import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
@@ -24,7 +23,6 @@ import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityRemoteControlBinding
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.APIBaseInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RemoteControlBean;
-import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.result.SubscriptionRequest;
 import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
  
@@ -69,7 +67,7 @@ public class RemoteControlActivity extends AppCompatActivity {
         if (null != binding) {
             binding.topbar.setTitle("远程控制管理");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     finish();
@@ -17,7 +17,6 @@ import android.widget.TextView;
  
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.libs.base.arouter.QrService;
-import com.cnlive.libs.base.util.SimpleDES;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.application.GlideApp;
@@ -28,8 +27,6 @@ import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
 import com.qmuiteam.qmui.util.QMUIDrawableHelper;
 import com.qmuiteam.qmui.widget.QMUITopBar;
  
-import org.json.JSONObject;
-
 import java.io.ByteArrayOutputStream;
  
  public class ShareFriendActivity extends AppCompatActivity {
@@ -72,7 +69,7 @@ import java.io.ByteArrayOutputStream;
  
         topBar.setTitle("");
         //设置返回按钮
-        topBar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+        topBar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 finish();
 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
  
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
@@ -18,18 +17,12 @@ import com.cnlive.strike.xiaojiaspeaker.frame.view.AllDeviceFragmentView;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.RemoteControlActivity;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
-import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
 import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
  
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
  
-import java.util.ArrayList;
-import java.util.List;
-
 public class AllDeviceFragment extends MvpBindingFragment<AllDeviceFragmentView, AllDeviceFragmentPresenter, Object, FragmentAllDeviceBinding> {
     private UIPopup qmuiPopup;
     private QMUIAlphaImageButton addButton;
@@ -87,7 +80,7 @@ public class AllDeviceFragment extends MvpBindingFragment&lt;AllDeviceFragmentView,
         if (null != binding) {
             binding.topbar.setTitle("所有设备");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     getActivity().finish();
@@ -96,7 +89,7 @@ public class AllDeviceFragment extends MvpBindingFragment&lt;AllDeviceFragmentView,
  
  
             //添加设备按钮
-            addButton = binding.topbar.addRightImageButton(R.drawable.icon_item_add, R.id.right_add);
+            addButton = binding.topbar.addRightImageButton(R.drawable.icon_xiaojia_item_add, R.id.right_add);
             addButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
@@ -13,7 +13,6 @@ import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentChangeDeviceNameBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeDeviceNamePresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.ChangeDeviceNameView;
-import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
  
 public class ChangeDeviceNameFragment extends MvpBindingFragment<ChangeDeviceNameView, ChangeDeviceNamePresenter, Object, FragmentChangeDeviceNameBinding> {
     public static ChangeDeviceNameFragment newInstance(String deviceId) {
@@ -55,7 +54,7 @@ public class ChangeDeviceNameFragment extends MvpBindingFragment&lt;ChangeDeviceNam
         if (null != binding) {
             binding.topbar.setTitle("更改音箱名称");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     getActivity().finish();
@@ -13,22 +13,14 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
  
-import com.clj.fastble.data.BleDevice;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectWifiBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeWifiFragmentPresenter;
-import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.ChangeWifiFragmentView;
-import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
-import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
-import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
  
 public class ChangeWifiFragment extends MvpBindingFragment<ChangeWifiFragmentView, ChangeWifiFragmentPresenter, Object, FragmentSelectWifiBinding> {
     private String TAG = "SelectWifiFragment";
@@ -76,7 +68,7 @@ public class ChangeWifiFragment extends MvpBindingFragment&lt;ChangeWifiFragmentVie
         if (null != binding) {
             binding.topbar.setTitle("切换WIFI网络").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     if (null != getActivity()) {
@@ -55,7 +55,7 @@ public class DeviceDetailFragment extends MvpBindingFragment&lt;DeviceDetailView, D
         if (null != binding) {
             binding.topbar.setTitle(deviceName);
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     getActivity().finish();
@@ -11,7 +11,6 @@ import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.xiaojiaspeaker.R;
-import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentDeviceManagerBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.DeviceManagerFragmentPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.DeviceManagerFragmentView;
@@ -94,7 +93,7 @@ public class DeviceManagerFragment extends MvpBindingFragment&lt;DeviceManagerFragm
         if (null != binding) {
             binding.topbar.setTitle("设备管理");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     getActivity().finish();
@@ -58,7 +58,7 @@ public class FirmwareUpdateFragment extends MvpBindingFragment&lt;FirmwareUpdateFra
         if (null != binding) {
             binding.topbar.setTitle("固件升级");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     getActivity().finish();
@@ -54,7 +54,7 @@ public class InvitFriendFragment extends MvpBindingFragment&lt;InvitFriendView, Inv
         if (null != binding) {
             binding.topbar.setTitle("二维码邀请加入");
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     getActivity().finish();
 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
  
 import android.os.Bundle;
-import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
@@ -17,7 +16,6 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SearchDevicefragmentPres
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SearchDevicefragmentView;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
-import com.hannesdorfmann.mosby3.mvp.MvpFragment;
  
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -59,7 +57,7 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
         if (null != binding) {
             binding.topbar.setTitle("选择配对设备").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     if (null != getActivity()) {
@@ -6,9 +6,6 @@ import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
  
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.cnlive.libs.base.arouter.im.FriendListData;
-import com.cnlive.libs.base.arouter.im.ImOpenService;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
@@ -22,8 +19,6 @@ import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
  
-import java.util.List;
-
 public class SelectIMFriendFragment extends MvpBindingFragment<SelectIMFriendView, SelectIMFriendPresenter, Object, FragmentSelectImFriendBinding> {
  
     public static SelectIMFriendFragment newInstance(String currentSelectFamilyId) {
@@ -76,7 +71,7 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
         if (null != binding) {
             binding.topbar.setTitle("选择好友").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     if (null != getActivity()) {
@@ -21,14 +21,11 @@ import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectWifiBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
-import com.cnlive.strike.xiaojiaspeaker.netWork.bean.ConfigDeviceNetParam;
 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
  
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
  
-import java.io.Serializable;
-
 public class SelectWifiFragment extends MvpBindingFragment<SelectWifiFragmentView, SelectWifiFragmentPresenter, Object, FragmentSelectWifiBinding> {
     private String TAG = "SelectWifiFragment";
  
@@ -75,7 +72,7 @@ public class SelectWifiFragment extends MvpBindingFragment&lt;SelectWifiFragmentVie
         if (null != binding) {
             binding.topbar.setTitle("请选择WIFI网络").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     if (null != getActivity()) {
@@ -67,7 +67,7 @@ public class SetFriendsRoleFragment extends MvpBindingFragment&lt;SetFriendsRoleVie
         if (null != binding) {
             binding.topbar.setTitle("设置角色").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     if (null != getActivity()) {
@@ -5,7 +5,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
-import android.widget.Button;
  
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -78,7 +77,7 @@ public class UserManagerFragment extends MvpBindingFragment&lt;UserManagerView, Use
         if (null != binding) {
             binding.topbar.setTitle("使用者管理").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
             //设置返回按钮
-            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+            binding.topbar.addLeftImageButton(R.drawable.icon_xiaojia_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     if (null != getActivity()) {
@@ -103,7 +103,7 @@ public class WifiPwdDialog extends Dialog {
                 } else {
                     btn_ok.setClickable(true);
                     btn_ok.setTextColor(ContextCompat.getColor(context, rightColor));
-                    btn_ok.setBackground(context.getResources().getDrawable(R.drawable.selector_dialog_btn_right));
+                    btn_ok.setBackground(context.getResources().getDrawable(R.drawable.selector_xiaojia_dialog_btn_right));
                 }
             }
  
@@ -120,7 +120,7 @@ public class WifiPwdDialog extends Dialog {
                 if ("0".equals(iv_pwd.getTag().toString())) {
                     //显示明文
                     iv_pwd.setTag("1");
-                    iv_pwd.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_see_pwd));
+                    iv_pwd.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_xiaojia_see_pwd));
                     //选择状态 显示明文--设置为可见的密码
 //                    et_pwd.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
                     et_pwd.setInputType(InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD | InputType.TYPE_CLASS_TEXT);
@@ -132,7 +132,7 @@ public class WifiPwdDialog extends Dialog {
                 //显示加密
                 else {
                     iv_pwd.setTag("0");
-                    iv_pwd.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_no_see_pwd));
+                    iv_pwd.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_xiaojia_no_see_pwd));
                     //选择状态 设置为不可见的密码
                     et_pwd.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_CLASS_TEXT);
                     //移动光标位置