1 提出蓝牙依赖

YangShuai
1 parent d7fa3f40
Showing 8 changed files with 8 additions and 12 deletions
build.gradle
module_xiaojiaSoundBox/build.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/SelectIMFriendAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/SetRoleAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/UserＭanagerAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/EditRoleDialog.java
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/touxiang.webp → module_xiaojiaSoundBox/src/main/res/drawable-hdpi/xiaojia_touxiang.webp
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/touxiang.webp → module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/xiaojia_touxiang.webp
@@ -92,6 +92,7 @@ ext {
     greendao = '3.2.2'
 //    loading动画
     avi = "2.1.3"
-
+    //蓝牙
+    BleLib="2.3.4"
 }
@@ -56,7 +56,7 @@ dependencies {
     implementation "com.cnlive.libs:network:$rootProject.libNetwork"
     //    蓝牙相关
-    implementation 'com.clj.fastble:FastBleLib:2.3.4'
+    implementation "com.clj.fastble:FastBleLib:$rootProject.BleLib"
     //    https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/README-CN.md
@@ -103,7 +103,7 @@ public class SelectIMFriendAdapter extends RecyclerView.Adapter {
             case IMFriendHasLetterInfo.USER_INFO:
                 ItemListSelectImContactBinding binding = ((MyViewHolder) viewHolder).getBinding();
                 //设置联系人头像
-                GlideApp.with(context).load(imFriendInfoList.get(position).getUserIcon()).placeholder(R.drawable.touxiang).into(binding.ivIcon);
+                GlideApp.with(context).load(imFriendInfoList.get(position).getUserIcon()).placeholder(R.drawable.xiaojia_touxiang).into(binding.ivIcon);
                 //设置联系人名称
                 binding.tvName.setText(imFriendInfoList.get(position).getUserName());
                 //设置是否可以进行选择
@@ -78,7 +78,7 @@ public class SetRoleAdapter extends RecyclerView.Adapter {
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
         ItemListSetRoleBinding binding = ((MyViewHolder) viewHolder).getBinding();
         binding.tvName.setText(roleInfoList.get(position).getUserName());
-        GlideApp.with(context).load(roleInfoList.get(position).getUserIcon()).placeholder(R.drawable.touxiang).into(binding.ivIcon);
+        GlideApp.with(context).load(roleInfoList.get(position).getUserIcon()).placeholder(R.drawable.xiaojia_touxiang).into(binding.ivIcon);
         if (isShowItemUserInfo == View.VISIBLE) {
             binding.llUserInfo.setVisibility(View.VISIBLE);
         } else {
@@ -10,8 +10,6 @@ import android.view.ViewGroup;
 import com.cnlive.strike.application.GlideApp;
 import com.cnlive.strike.xiaojiaspeaker.R;
-import com.cnlive.strike.xiaojiaspeaker.databinding.ItemListMenuSoundBoxNameBinding;
-import com.cnlive.strike.xiaojiaspeaker.databinding.ItemListSetRoleBinding;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ItemListUserHostBinding;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ItemListUserMemberBinding;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
@@ -62,7 +60,7 @@ public class UserＭanagerAdapter extends RecyclerView.Adapter {
                 hostBinding.tvUserName.setText(familyRoleList.get(position).getUserMsg().getNickName());
                 hostBinding.tvUserRole.setText(familyRoleList.get(position).getRoleName());
                 //设置头像
-                GlideApp.with(context).load(familyRoleList.get(position).getUserMsg().getImage()).placeholder(R.drawable.touxiang).into(hostBinding.ivIcon);
+                GlideApp.with(context).load(familyRoleList.get(position).getUserMsg().getImage()).placeholder(R.drawable.xiaojia_touxiang).into(hostBinding.ivIcon);
                 if (!isAdmin) {
                     hostBinding.tvFlag.setVisibility(View.GONE);
                 } else {
@@ -74,7 +72,7 @@ public class UserＭanagerAdapter extends RecyclerView.Adapter {
                 memberBinding.tvUserName.setText(familyRoleList.get(position).getUserMsg().getNickName());
                 memberBinding.tvUserRole.setText(familyRoleList.get(position).getRoleName());
                 //设置头像
-                GlideApp.with(context).load(familyRoleList.get(position).getUserMsg().getImage()).placeholder(R.drawable.touxiang).into(memberBinding.ivIcon);
+                GlideApp.with(context).load(familyRoleList.get(position).getUserMsg().getImage()).placeholder(R.drawable.xiaojia_touxiang).into(memberBinding.ivIcon);
                 if (position == familyRoleList.size() - 1) {
                     memberBinding.viewLine.setVisibility(View.GONE);
                 } else {
@@ -4,7 +4,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -22,8 +21,6 @@ import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.SetRoleAdapter;
-import org.w3c.dom.Text;
-
 import java.util.List;
@@ -59,7 +56,7 @@ public class EditRoleDialog extends Dialog {
         setRoleAdapter.setIsShowItemUserInfo(View.GONE);
         rv_role.setLayoutManager(new LinearLayoutManager(getContext()));
         rv_role.setAdapter(setRoleAdapter);
-        GlideApp.with(context).load(bean.getUserMsg().getImage()).placeholder(R.drawable.touxiang).into(iv_icon);
+        GlideApp.with(context).load(bean.getUserMsg().getImage()).placeholder(R.drawable.xiaojia_touxiang).into(iv_icon);
         tv_user_name.setText(bean.getUserMsg().getNickName());
     }