1 修改分享页二维码样式

YangShuai
1 parent 29237381
Showing 26 changed files with 176 additions and 62 deletions
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/ChangeDeviceNameView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/ChangeWifiFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/InvitFriendView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SearchDevicefragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectIMFriendView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SetFriendsRoleView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/model/RoleInfo.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/bean/InvitFamilyBean.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/SetRoleAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SetFriendsRoleFragment.java
module_xiaojiaSoundBox/src/main/res/drawable/selector_btn_gray.xml
module_xiaojiaSoundBox/src/main/res/drawable/selector_btn_green.xml → module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_btn_green.xml
module_xiaojiaSoundBox/src/main/res/drawable/shape_btn_press.xml → module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_btn_press.xml
module_xiaojiaSoundBox/src/main/res/layout/activity_blue_tooth_step1.xml
module_xiaojiaSoundBox/src/main/res/layout/activity_blue_tooth_step2.xml
module_xiaojiaSoundBox/src/main/res/layout/activity_conn_bluetooth_success.xml
module_xiaojiaSoundBox/src/main/res/layout/activity_share_friend.xml
module_xiaojiaSoundBox/src/main/res/layout/fragment_firmware_update.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.0.15",
+            version: "0.0.16",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
 package com.cnlive.strike.xiaojiaspeaker.frame.view;
  
 import android.app.Activity;
-import android.content.Intent;
 import android.support.v4.content.ContextCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -9,8 +8,6 @@ import android.view.View;
  
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeDeviceNamePresenter;
-import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
-import com.cnlive.strike.xiaojiaspeaker.ui.activity.ChangeDeviceNameActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeDeviceNameFragment;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
@@ -80,7 +77,7 @@ public class ChangeDeviceNameView implements MvpView {
      */
     private void setBtnCantClick() {
         fragment.binding.btnNext.setClickable(false);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_btn_press));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_xiaojia_btn_press));
     }
  
     /**
@@ -88,6 +85,6 @@ public class ChangeDeviceNameView implements MvpView {
      */
     private void setBtnClick() {
         fragment.binding.btnNext.setClickable(true);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_green));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
     }
 }
 package com.cnlive.strike.xiaojiaspeaker.frame.view;
  
 import android.app.Activity;
-import android.bluetooth.BluetoothGatt;
 import android.graphics.Typeface;
 import android.net.wifi.ScanResult;
-import android.os.Handler;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
  
-import com.clj.fastble.BleManager;
-import com.clj.fastble.callback.BleGattCallback;
-import com.clj.fastble.callback.BleNotifyCallback;
-import com.clj.fastble.callback.BleWriteCallback;
-import com.clj.fastble.data.BleDevice;
-import com.clj.fastble.exception.BleException;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.R;
-import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
-import com.cnlive.strike.xiaojiaspeaker.constants.BlufiConstants;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeWifiFragmentPresenter;
-import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
-import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
-import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeWifiFragment;
-import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
 import com.cnlive.strike.xiaojiaspeaker.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 java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
  
@@ -183,7 +166,7 @@ public class ChangeWifiFragmentView implements MvpView {
         fragment.binding.llLoading.setVisibility(View.VISIBLE);
         //设置按钮不可点击
         fragment.binding.btnNext.setClickable(false);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_btn_press));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_xiaojia_btn_press));
  
     }
  
@@ -196,7 +179,7 @@ public class ChangeWifiFragmentView implements MvpView {
         fragment.binding.llLoading.setVisibility(View.GONE);
         //设置按钮可点击
         fragment.binding.btnNext.setClickable(true);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_green));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
     }
  
  
@@ -126,6 +126,7 @@ public class InvitFriendView implements MvpView {
             String qrContent = jsonObject.toString();
             encryptionContent = SimpleDES.ebotongEncrypto(qrContent, "cnliveIm");
             encryptionContent = encryptionContent.replaceAll("\\\n", "");
+            encryptionContent = "http://apiwjj.cnlive.com/download/index.html" + "?isWjjQr=" + encryptionContent;
             QrService service = (QrService) ARouter.getInstance().navigation(QrService.class);
             if (null == service) {
                 return;
@@ -2,35 +2,25 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
  
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothGatt;
 import android.content.Intent;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
  
 import com.clj.fastble.BleManager;
-import com.clj.fastble.callback.BleGattCallback;
-import com.clj.fastble.callback.BleNotifyCallback;
 import com.clj.fastble.callback.BleScanCallback;
-import com.clj.fastble.callback.BleWriteCallback;
 import com.clj.fastble.data.BleDevice;
-import com.clj.fastble.exception.BleException;
 import com.cnlive.strike.xiaojiaspeaker.R;
-import com.cnlive.strike.xiaojiaspeaker.constants.BlufiConstants;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothHelpActivity;
-import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep2Activity;
 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.strike.xiaojiaspeaker.util.BlueToothUtil;
 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
  
@@ -234,7 +224,7 @@ public class SearchDevicefragmentView implements MvpView {
         }
         if (fragment.binding.btnBondDevice.isClickable()) {
             fragment.binding.btnBondDevice.setClickable(false);
-            fragment.binding.btnBondDevice.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_btn_press));
+            fragment.binding.btnBondDevice.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_xiaojia_btn_press));
         }
     }
  
@@ -247,7 +237,7 @@ public class SearchDevicefragmentView implements MvpView {
         }
         if (!fragment.binding.btnBondDevice.isClickable()) {
             fragment.binding.btnBondDevice.setClickable(true);
-            fragment.binding.btnBondDevice.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_green));
+            fragment.binding.btnBondDevice.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
         }
     }
 }
@@ -24,7 +24,6 @@ import com.cnlive.strike.xiaojiaspeaker.netWork.bean.XiaoJiaContactInfo;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.SetFriendsRoleActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.SelectIMFriendAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectIMFriendFragment;
-import com.cnlive.strike.xiaojiaspeaker.util.utilcode.util.GsonUtils;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 import java.util.ArrayList;
@@ -310,7 +309,7 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
      */
     public void nextBtnCanClick() {
         fragment.binding.btnNext.setEnabled(true);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_green));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
  
     }
  
@@ -180,7 +180,7 @@ public class SelectWifiFragmentView implements MvpView {
         fragment.binding.llLoading.setVisibility(View.VISIBLE);
         //设置按钮不可点击
         fragment.binding.btnNext.setClickable(false);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_btn_press));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_xiaojia_btn_press));
  
     }
  
@@ -193,7 +193,7 @@ public class SelectWifiFragmentView implements MvpView {
         fragment.binding.llLoading.setVisibility(View.GONE);
         //设置按钮可点击
         fragment.binding.btnNext.setClickable(true);
-        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_green));
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
     }
  
     private void connectDevice(BleDevice bleDevice, final String wifiSSID, final String wifiPwd) {
 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.view.View;
@@ -19,6 +20,11 @@ public class SetFriendsRoleView implements MvpView {
     private SetFriendsRoleFragment fragment;
     private List<RoleInfo> roleInfoList;
     private SetRoleAdapter adapter;
+   private String currentSelFamilyId;
+
+    public void setCurrentSelFamilyId(String currentSelFamilyId) {
+        this.currentSelFamilyId = currentSelFamilyId;
+    }
  
     public SetFriendsRoleView(SetFriendsRoleFragment fragment) {
         this.fragment = fragment;
@@ -29,6 +35,7 @@ public class SetFriendsRoleView implements MvpView {
     }
  
     public void initView(RoleNetBean roleNetBean) {
+        nextBtnCanNotClick();
         roleInfoList = new ArrayList<>();
         //整理数据
         //获取选中的联系人
@@ -56,6 +63,25 @@ public class SetFriendsRoleView implements MvpView {
         adapter = new SetRoleAdapter(getContext(), roleInfoList);
         fragment.binding.rvFriendsRole.setLayoutManager(new LinearLayoutManager(getContext()));
         fragment.binding.rvFriendsRole.setAdapter(adapter);
+        //设置点击
+        adapter.setOnSelectListener(new SetRoleAdapter.OnSelectListener() {
+            @Override
+            public void onSelect(int roleId) {
+
+            }
+
+            @Override
+            public void onCancel() {
+
+            }
+        });
+        //关闭提示
+        fragment.binding.llCloseTip.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                fragment.binding.flTipView.setVisibility(View.GONE);
+            }
+        });
     }
  
  
@@ -101,4 +127,21 @@ public class SetFriendsRoleView implements MvpView {
         }
         fragment.binding.emptyLayout.show(false, titleText, detailText, getContext().getString(R.string.retry), R.drawable.wufalianjie, listener);
     }
+
+    /**
+     * 下一步按钮可以点击
+     */
+    public void nextBtnCanClick() {
+        fragment.binding.btnNext.setEnabled(true);
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
+
+    }
+
+    /**
+     * 下一步按钮可以点击
+     */
+    public void nextBtnCanNotClick() {
+        fragment.binding.btnNext.setEnabled(false);
+        fragment.binding.btnNext.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_btn_gray));
+    }
 }
@@ -13,6 +13,15 @@ public class RoleInfo {
     private String userName;
     private List<RoleNetBean.RoleListBean> roleList;
     private String selectId;
+    private String familyId;
+
+    public String getFamilyId() {
+        return familyId;
+    }
+
+    public void setFamilyId(String familyId) {
+        this.familyId = familyId;
+    }
  
     public String getSelectId() {
         return selectId;
+package com.cnlive.strike.xiaojiaspeaker.netWork.bean;
+
+/**
+ * 邀请家人上传的数据
+ */
+public class InvitFamilyBean {
+
+    /**
+     * familyId : 1111
+     * sid : 105102771
+     * roleId : 1
+     */
+
+    private String familyId;
+    private int sid;
+    private int roleId;
+
+    public String getFamilyId() {
+        return familyId;
+    }
+
+    public void setFamilyId(String familyId) {
+        this.familyId = familyId;
+    }
+
+    public int getSid() {
+        return sid;
+    }
+
+    public void setSid(int sid) {
+        this.sid = sid;
+    }
+
+    public int getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(int roleId) {
+        this.roleId = roleId;
+    }
+}
@@ -5,6 +5,7 @@ import android.databinding.DataBindingUtil;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +14,7 @@ import com.cnlive.strike.application.GlideApp;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ItemListSetRoleBinding;
 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.InvitFamilyBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
  
 import java.util.ArrayList;
@@ -30,6 +32,7 @@ public class SetRoleAdapter extends RecyclerView.Adapter {
     private int isShowItemUserInfo = View.VISIBLE;
     private OnSelectListener onSelectListener;
     private OnDialogRoleClickListener onDialogRoleClickListener;
+    private String currentSelectFamilyId;
  
     public void setOnDialogRoleClickListener(OnDialogRoleClickListener onDialogRoleClickListener) {
         this.onDialogRoleClickListener = onDialogRoleClickListener;
@@ -43,6 +46,35 @@ public class SetRoleAdapter extends RecyclerView.Adapter {
         this.isShowItemUserInfo = isShowItemUserInfo;
     }
  
+    /**
+     * 判断是否所有用户都设置了角色
+     *
+     * @return
+     */
+    public boolean isPeopleAllSetRole() {
+        boolean result = true;
+        for (int i = 0; i < roleInfoList.size(); i++) {
+            if (TextUtils.isEmpty(roleInfoList.get(i).getSelectId())) {
+                result = false;
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 获取最后设置的结果
+     */
+    public String getRoleSetResult() {
+        String result = "";
+        List<InvitFamilyBean> invitFamilyBeanList = new ArrayList<>();
+        for (int i = 0; i < roleInfoList.size(); i++) {
+            InvitFamilyBean bean = new InvitFamilyBean();
+            bean.setFamilyId(roleInfoList.get(i).getUid());
+        }
+        return result;
+    }
+
     public void setGridCount(int count) {
         this.gridCount = count;
     }
@@ -72,6 +104,20 @@ public class SetRoleAdapter extends RecyclerView.Adapter {
         }
     }
  
+    public SetRoleAdapter(Context context, List<RoleInfo> roleInfoList, String currentSelectFamilyId) {
+        this.context = context;
+        this.roleInfoList = roleInfoList;
+        this.currentSelectFamilyId = currentSelectFamilyId;
+        this.allowSelectMap = new HashMap<>();
+        initNotAllowRoleId = new ArrayList<>();
+        for (int i = 0; i < roleInfoList.get(0).getRoleList().size(); i++) {
+            allowSelectMap.put(roleInfoList.get(0).getRoleList().get(i).getId() + "", roleInfoList.get(0).getRoleList().get(i).isAllowUse());
+            if (!roleInfoList.get(0).getRoleList().get(i).isAllowUse()) {
+                initNotAllowRoleId.add(roleInfoList.get(0).getRoleList().get(i).getId());
+            }
+        }
+    }
+
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
@@ -117,14 +163,14 @@ public class SetRoleAdapter extends RecyclerView.Adapter {
         adapter.setOnDialogRoleClickListener(new AllRoleDetailAdapter.OnDialogRoleClickListener() {
             @Override
             public void onCancel() {
-                if (null!=onDialogRoleClickListener){
+                if (null != onDialogRoleClickListener) {
                     onDialogRoleClickListener.onCancel();
                 }
             }
  
             @Override
             public void onSelect(RoleNetBean.RoleListBean bean) {
-                if (null!=onDialogRoleClickListener){
+                if (null != onDialogRoleClickListener) {
                     onDialogRoleClickListener.onSelect(bean);
                 }
             }
@@ -20,10 +20,11 @@ import com.cnlive.strike.xiaojiaspeaker.frame.view.SetFriendsRoleView;
 public class SetFriendsRoleFragment extends MvpBindingFragment<SetFriendsRoleView, SetFriendsRolePresenter, Object, FragmentSetFriendRoleBinding> {
     private String selectUid;
  
-    public static SetFriendsRoleFragment newInstance(String selectUid) {
+    public static SetFriendsRoleFragment newInstance(String selectUid,String currentSelFamilyId) {
         SetFriendsRoleFragment fragment = new SetFriendsRoleFragment();
         Bundle bundle = new Bundle();
         bundle.putString("selectUid", selectUid);
+        bundle.putString("currentSelFamilyId", currentSelFamilyId);
         fragment.setArguments(bundle);
         return fragment;
     }
@@ -46,6 +47,8 @@ public class SetFriendsRoleFragment extends MvpBindingFragment&lt;SetFriendsRoleVie
         initTopBar();
         if (null != getArguments()) {
             selectUid = getArguments().getString("selectUid");
+            String currentSelFamilyId=getArguments().getString("currentSelFamilyId");
+
             getPresenter().getSetRoleList(getActivity(), selectUid, XiaoJIaCommInfo.getFamilyId(getActivity()));
         } else {
             getActivity().finish();
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/shape_xiaojia_btn_gray" android:state_pressed="false" />
-    <item android:drawable="@drawable/shape_btn_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_xiaojia_btn_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="@drawable/shape_xiaojia_btn_green" android:state_pressed="false" />
-    <item android:drawable="@drawable/shape_btn_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_xiaojia_btn_press" android:state_pressed="true" />
  
 </selector>
 \ No newline at end of file
@@ -73,7 +73,7 @@
                     android:layout_centerHorizontal="true"
                     android:layout_marginLeft="20dp"
                     android:layout_marginRight="20dp"
-                    android:background="@drawable/selector_btn_green"
+                    android:background="@drawable/selector_xiaojia_btn_green"
                     android:text="下一步"
                     android:textColor="@color/white"
                     android:textSize="16sp"
@@ -87,7 +87,7 @@
                     android:layout_centerHorizontal="true"
                     android:layout_marginLeft="20dp"
                     android:layout_marginRight="20dp"
-                    android:background="@drawable/selector_btn_green"
+                    android:background="@drawable/selector_xiaojia_btn_green"
                     android:text="已听到“进入配网模式”"
                     android:textColor="@color/white"
                     android:textSize="16sp"
@@ -55,7 +55,7 @@
                     android:layout_alignParentBottom="true"
                     android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
-                    android:background="@drawable/selector_btn_green"
+                    android:background="@drawable/selector_xiaojia_btn_green"
                     android:text="邀请使用者"
                     android:textColor="@color/white"
                     android:textSize="16sp"
@@ -141,7 +141,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
-                    android:text="注册/登录  >"
+                    android:text="扫码绑定"
                     android:textColor="@color/color_282828"
                     android:textSize="12sp"
                     android:textStyle="bold" />
@@ -176,7 +176,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="15dp"
-        android:background="@drawable/selector_btn_green"
+        android:background="@drawable/selector_xiaojia_btn_green"
         android:paddingLeft="15dp"
         android:paddingTop="5dp"
         android:paddingRight="15dp"
@@ -85,7 +85,7 @@
                     android:id="@+id/btn_check_update"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
-                    android:background="@drawable/selector_btn_green"
+                    android:background="@drawable/selector_xiaojia_btn_green"
                     android:gravity="center"
                     android:text="检查更新"
                     android:textColor="@color/white"
@@ -181,7 +181,7 @@
                         android:layout_marginLeft="20dp"
                         android:layout_marginTop="30dp"
                         android:layout_marginRight="20dp"
-                        android:background="@drawable/selector_btn_green"
+                        android:background="@drawable/selector_xiaojia_btn_green"
                         android:text="保存并分享给家人"
                         android:textColor="@color/white"
                         android:textSize="16sp"
@@ -67,7 +67,7 @@
                         android:layout_width="90dp"
                         android:layout_height="35dp"
                         android:layout_marginTop="30dp"
-                        android:background="@drawable/selector_btn_green"
+                        android:background="@drawable/selector_xiaojia_btn_green"
                         android:text="@string/btn_retry"
                         android:textColor="@color/white"
                         android:textSize="16sp"
@@ -113,7 +113,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:layout_margin="20dp"
-                android:background="@drawable/selector_btn_green"
+                android:background="@drawable/selector_xiaojia_btn_green"
                 android:text="@string/btn_next_step"
                 android:textColor="@color/white"
                 android:textSize="16sp"
@@ -91,8 +91,8 @@
                     android:layout_marginLeft="30dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="30dp"
-                    android:layout_marginBottom="10dp"
-                    android:background="@drawable/selector_btn_green"
+                    android:layout_marginBottom="20dp"
+                    android:background="@drawable/selector_xiaojia_btn_green"
                     android:text="下一步"
                     android:textColor="@color/white"
                     android:textSize="17sp"
@@ -74,7 +74,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:layout_margin="20dp"
-                android:background="@drawable/selector_btn_green"
+                android:background="@drawable/selector_xiaojia_btn_green"
                 android:text="@string/btn_next_step"
                 android:textColor="@color/white"
                 android:textSize="16sp"
@@ -22,6 +22,7 @@
                 android:orientation="vertical">
  
                 <FrameLayout
+                    android:id="@+id/fl_tip_view"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
                     android:background="@color/color_F7B054">
@@ -35,6 +36,7 @@
                         android:textSize="15sp" />
  
                     <LinearLayout
+                        android:id="@+id/ll_close_tip"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_gravity="right"
@@ -67,8 +69,8 @@
                     android:layout_marginLeft="30dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="30dp"
-                    android:layout_marginBottom="30dp"
-                    android:background="@drawable/selector_btn_green"
+                    android:layout_marginBottom="20dp"
+                    android:background="@drawable/selector_xiaojia_btn_green"
                     android:text="一键邀请"
                     android:textColor="@color/white"
                     android:textSize="17sp"
@@ -73,7 +73,7 @@
                         android:layout_marginLeft="40dp"
                         android:layout_marginTop="10dp"
                         android:layout_marginRight="40dp"
-                        android:background="@drawable/selector_btn_green"
+                        android:background="@drawable/selector_xiaojia_btn_green"
                         android:text="邀请网家家好友"
                         android:textColor="@color/white"
                         android:textSize="16sp"
@@ -89,7 +89,7 @@
                         android:layout_marginTop="20dp"
                         android:layout_marginRight="40dp"
                         android:layout_marginBottom="30dp"
-                        android:background="@drawable/selector_btn_green"
+                        android:background="@drawable/selector_xiaojia_btn_green"
                         android:text="生成二维码邀请"
                         android:textColor="@color/white"
                         android:textSize="16sp"