1 判断设备是否绑定

YangShuai
1 parent b6a3c22d
Showing 9 changed files with 63 additions and 23 deletions
app/build.gradle
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
build.gradle
config.gradle
module_xiaojiaSoundBox/build.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/UserManagerView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/UserManagerActivity.java
module_xiaojiaSoundBox/src/main/res/layout/fragment_invit_friend.xml
@@ -14,6 +14,12 @@ android {
         versionName "1.0"
         testInstrumentationRunner "android.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
+        }
     }
     buildTypes {
         debug {
@@ -60,6 +66,8 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+
+
     buildToolsVersion = '29.0.2'
 }
  
@@ -80,4 +88,7 @@ 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 "com.alibaba:arouter-api:$rootProject.arouterApiVersion"
+    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.arouterCompilerVersion"
 }
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
  
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
@@ -45,6 +46,9 @@ public class MainActivity extends AppCompatActivity {
 //        startActivity(new Intent(MainActivity.this, SelectIMFriendActivity.class));
 //        startActivity(new Intent(MainActivity.this, InvitFriendActivity.class));
  
+//        ARouter.getInstance().build("/XiaoJiaSpeaker/UserManagerActivity")
+//                .withString("currentSelectFamilyId", "")
+//                .navigation(this);
  
         finish();
     }
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: "config.gradle"
+apply plugin: 'com.alibaba.arouter'
 buildscript {
     repositories {
         google()
@@ -8,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.1'
-
+        classpath "com.alibaba:arouter-register:1.0.2"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -95,5 +96,9 @@ ext {
     //蓝牙
     BleLib="2.3.4"
     eventBus = "3.1.1"
+
+    //阿里路由框架
+    arouterApiVersion = '1.4.0'
+    arouterCompilerVersion = '1.2.1'
 }
  
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.0.21",
+            version: "0.1.0",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -17,7 +17,14 @@ android {
  
         testInstrumentationRunner "android.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
+        }
     }
+
     dataBinding {
         enabled = true
     }
@@ -81,5 +88,8 @@ 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 "com.alibaba:arouter-api:$rootProject.arouterApiVersion"
+    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.arouterCompilerVersion"
     api files('libs/pinyin4j-2.5.0.jar')
 }
@@ -54,6 +54,9 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
  
     public void getIMData(XiaoJiaContactInfo xiaoJiaContactInfo) {
         ImOpenService service = (ImOpenService) ARouter.getInstance().build("/im/cnIMService").navigation(getContext());
+        if (null==service){
+            return;
+        }
         service.getFriendList(new ImOpenService.CNValueCallBack<List<FriendListData>>() {
             @Override
             public void onError(int var1, String var2) {
@@ -139,28 +139,30 @@ public class UserManagerView implements MvpView {
         adapter.setOnDeleteClickListener(new UserＭanagerAdapter.OnDeleteClickListener() {
             @Override
             public void deleteClick(int position, FamilyRoleBean.FamilyRoleListBean bean) {
-                    deleteDialog = new SelectDialog(getContext(), "移除后，该用户将不再具备管理\n音箱的权限，确定移除吗？", "取消", new SelectDialog.DialogInterface() {
-                        @Override
-                        public void onClick(SelectDialog dialog) {
-                            dialog.dismiss();
-                        }
-                    }, "确定", new SelectDialog.DialogInterface() {
-                        @Override
-                        public void onClick(SelectDialog dialog) {
-                            fragment.getPresenter().changeMemberRole(getContext(), bean.getSid() + "", bean.getFamily_id(), null, new UserManagerPresenter.OnResposeListener() {
-                                @Override
-                                public void onSuccess() {
-                                    dialog.dismiss();
-                                    familyRoleList.remove(position);
-                                    if (null != adapter) {
-                                        adapter.notifyDataSetChanged();
-                                    }
+                deleteDialog = new SelectDialog(getContext(), "移除后，该用户将不再具备管理\n音箱的权限，确定移除吗？", "取消", new SelectDialog.DialogInterface() {
+                    @Override
+                    public void onClick(SelectDialog dialog) {
+                        dialog.dismiss();
+                    }
+                }, "确定", new SelectDialog.DialogInterface() {
+                    @Override
+                    public void onClick(SelectDialog dialog) {
+                        fragment.getPresenter().changeMemberRole(getContext(), bean.getSid() + "", bean.getFamily_id(), null, new UserManagerPresenter.OnResposeListener() {
+                            @Override
+                            public void onSuccess() {
+                                dialog.dismiss();
+                                familyRoleList.remove(position);
+                                if (null != adapter) {
+                                    adapter.notifyDataSetChanged();
                                 }
-                            });
-                        }
-                    });
-                    deleteDialog.setRightBtnColor(R.color.btn_green);
-                    deleteDialog.setTipTextStyle(Typeface.DEFAULT);
+                                AlertUtil.showDeftToast(getContext(), "移除成功");
+
+                            }
+                        });
+                    }
+                });
+                deleteDialog.setRightBtnColor(R.color.btn_green);
+                deleteDialog.setTipTextStyle(Typeface.DEFAULT);
                 if (!deleteDialog.isShowing()) {
                     deleteDialog.show();
                 }
@@ -257,6 +259,7 @@ public class UserManagerView implements MvpView {
                                 if (null != adapter) {
                                     adapter.notifyDataSetChanged();
                                 }
+                                AlertUtil.showDeftToast(getContext(), "保存成功");
                             }
                         }
                     });
@@ -6,11 +6,13 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.TextUtils;
  
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.clj.fastble.data.BleDevice;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.UserManagerFragment;
  
+@Route(path = "/XiaoJiaSpeaker/UserManagerActivity")
 public class UserManagerActivity extends AppCompatActivity {
  
     @Override
@@ -50,6 +50,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
+                    android:gravity="center"
                     android:orientation="vertical">
  
                     <FrameLayout
@@ -94,6 +95,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
+                    android:gravity="center"
                     android:orientation="vertical">
  
                     <TextView