Merge branch 'master' of bj.gitlab.cnlive.com:yangshuai/XiaojiaSoundBox

韩亚云
2 parents d1e8ea25 840e11da
Showing 38 changed files with 44 additions and 36 deletions
build.gradle
config.gradle
module_xiaojiaSoundBox/build.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/constants/XiaoJiaConst.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/InvitFriendView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/AllDeviceActivity.java
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/check_normal.png → module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_xiaojia_normal.png
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_normal_no_enable.png → module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_xiaojia_normal_no_enable.png
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_press.png → module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_xiaojia_press.png
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/check_normal.png → module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_xiaojia_normal.png
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_normal_no_enable.png → module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_xiaojia_normal_no_enable.png
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_press.png → module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_xiaojia_press.png
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/touxiang.webp → module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/xiaojia_touxiang.webp
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_normal.png → module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_xiaojia_normal.png
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_normal_no_enable.png → module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_xiaojia_normal_no_enable.png
@@ -7,7 +7,7 @@ buildscript {
  
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
  
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -92,6 +92,7 @@ ext {
     greendao = '3.2.2'
 //    loading动画
     avi = "2.1.3"
-
+    //蓝牙
+    BleLib="2.3.4"
 }
  
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.0.1",
+            version: "0.0.9",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -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
  
@@ -81,5 +81,5 @@ dependencies {
     implementation 'com.daimajia.easing:library:2.0@aar'
     implementation 'com.daimajia.androidanimations:library:2.3@aar'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation files('libs/pinyin4j-2.5.0.jar')
+    api files('libs/pinyin4j-2.5.0.jar')
 }
@@ -4,7 +4,4 @@ public class XiaoJiaConst {
     public static final String QRCODE_TYPE="xiaoJiaSpeakerType";
     public static final String INVIT_QRCODE="1";//二维码邀请
     public static final String INVIT_FRIEND="2";//联系人邀请
-
-
-
 }
@@ -2,6 +2,7 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
  
 import android.app.Activity;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
@@ -121,7 +122,11 @@ public class InvitFriendView implements MvpView {
             if (null == service) {
                 return;
             }
-            Bitmap bitmap = service.createQRNoIconBitmap(encryptionContent, DensityUtil.dp2px(getContext(), 245));
+            Bitmap logo = BitmapFactory.decodeResource(getContext().getResources(), R.mipmap.ic_launcher);
+            if (null == logo) {
+                return;
+            }
+            Bitmap bitmap = service.createQrIconBitMap(encryptionContent, DensityUtil.dp2px(getContext(), 245), logo, 10);
 //            binding.ivQr.setBackgroundDrawable(bitmap);
             if (getContext() == null) {
                 return;
 package com.cnlive.strike.xiaojiaspeaker.ui.activity;
  
+import android.app.Activity;
+import android.content.Intent;
 import android.database.DatabaseUtils;
 import android.databinding.DataBindingUtil;
 import android.support.v4.content.ContextCompat;
@@ -31,6 +33,8 @@ public class AllDeviceActivity extends AppCompatActivity {
         getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, AllDeviceFragment.newInstance()).commitAllowingStateLoss();
  
     }
-
+    public static void startActivity(Activity activity) {
+        activity.startActivity(new Intent(activity, AllDeviceActivity.class));
+    }
  
 }
@@ -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());
     }
  
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_btn_gray" android:state_pressed="false" />
+    <item android:drawable="@drawable/shape_xiaojia_btn_gray" android:state_pressed="false" />
     <item android:drawable="@drawable/shape_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_btn_green" android:state_pressed="false" />
+    <item android:drawable="@drawable/shape_xiaojia_btn_green" android:state_pressed="false" />
     <item android:drawable="@drawable/shape_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/check_press" android:state_checked="true"/>
-    <item android:drawable="@drawable/check_normal" android:state_checked="false" android:state_enabled="true" />
-    <item android:drawable="@drawable/check_normal_no_enable" android:state_checked="false" android:state_enabled="false" />
-
-</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/check_press" android:state_checked="true"/>
-    <item android:drawable="@drawable/check_normal" android:state_checked="false"  />
+    <item android:drawable="@drawable/check_xiaojia_press" android:state_checked="true"/>
+    <item android:drawable="@drawable/check_xiaojia_normal" android:state_checked="false"  />
  
 </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/check_xiaojia_press" android:state_checked="true"/>
+    <item android:drawable="@drawable/check_xiaojia_normal" android:state_checked="false" android:state_enabled="true" />
+    <item android:drawable="@drawable/check_xiaojia_normal_no_enable" android:state_checked="false" android:state_enabled="false" />
+
+</selector>
 \ No newline at end of file
@@ -77,7 +77,7 @@
             android:layout_marginLeft="30dp"
             android:layout_marginTop="20dp"
             android:layout_marginRight="30dp"
-            android:background="@drawable/shape_btn_gray"
+            android:background="@drawable/shape_xiaojia_btn_gray"
             android:clickable="false"
             android:text="保存"
             android:textColor="@color/white"
@@ -115,7 +115,7 @@
                         <TextView
                             android:layout_width="15dp"
                             android:layout_height="15dp"
-                            android:background="@drawable/shape_green_circle"
+                            android:background="@drawable/shape_xiaojia_green_circle"
                             android:gravity="center"
                             android:text="1"
                             android:textColor="@color/white"
@@ -135,7 +135,7 @@
                         <TextView
                             android:layout_width="15dp"
                             android:layout_height="15dp"
-                            android:background="@drawable/shape_green_circle"
+                            android:background="@drawable/shape_xiaojia_green_circle"
                             android:gravity="center"
                             android:text="2"
                             android:textColor="@color/white"
@@ -155,7 +155,7 @@
                         <TextView
                             android:layout_width="15dp"
                             android:layout_height="15dp"
-                            android:background="@drawable/shape_green_circle"
+                            android:background="@drawable/shape_xiaojia_green_circle"
                             android:gravity="center"
                             android:text="3"
                             android:textColor="@color/white"
@@ -36,7 +36,7 @@
             android:layout_height="21dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="20dp"
-            android:background="@drawable/selector_checkbox"
+            style="@style/CustomCheckboxHasDefault"
             android:button="@null"
             android:clickable="false"
             android:focusable="false" />
@@ -15,6 +15,12 @@
         <item name="android:maxHeight">21dp</item>
         <item name="android:background">@drawable/selector_checkbox_no_default</item>
     </style>
+
+    <style name="CustomCheckboxHasDefault" parent="@android:style/Widget.CompoundButton.CheckBox">
+        <item name="android:button">@null</item>
+        <item name="android:maxHeight">21dp</item>
+        <item name="android:background">@drawable/selector_xiaojia_checkbox</item>
+    </style>
     <!--    switch-->
     <style name="SwitchButtonMD" tools:ignore="ResourceName">
         <item name="kswThumbDrawable">@drawable/ksw_md_thumb</item>