杨帅 / XiaojiaSoundBox · Commits

Commit c0162320092794e2251f1736830c4099e90cdc29

Authored by YangShuai
1 parent 9a5617ed

迁移到androidx

Inline Side-by-side
Showing 100 changed files with 300 additions and 380 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 146 files are displayed.

.idea/.name 0 → 100644
  View file @c016232
  1 +XiaoJiaSpeaker
0 2 \ No newline at end of file
... ...
.idea/gradle.xml
  View file @c016232
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
  3 + <component name="GradleMigrationSettings" migrationVersion="1" />
3 4 <component name="GradleSettings">
4 5 <option name="linkedExternalProjectsSettings">
5 6 <GradleProjectSettings>
6   - <compositeConfiguration>
7   - <compositeBuild compositeDefinitionSource="SCRIPT" />
8   - </compositeConfiguration>
  7 + <option name="testRunner" value="PLATFORM" />
9 8 <option name="distributionType" value="DEFAULT_WRAPPED" />
10 9 <option name="externalProjectPath" value="$PROJECT_DIR$" />
  10 + <option name="modules">
  11 + <set>
  12 + <option value="$PROJECT_DIR$" />
  13 + <option value="$PROJECT_DIR$/app" />
  14 + <option value="$PROJECT_DIR$/module_xiaojiaSoundBox" />
  15 + </set>
  16 + </option>
11 17 <option name="resolveModulePerSourceSet" value="false" />
12   - <option name="testRunner" value="PLATFORM" />
13 18 </GradleProjectSettings>
14 19 </option>
15 20 </component>
... ...
.idea/jarRepositories.xml 0 → 100644
  View file @c016232
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="RemoteRepositoriesConfiguration">
  4 + <remote-repository>
  5 + <option name="id" value="central" />
  6 + <option name="name" value="Maven Central repository" />
  7 + <option name="url" value="https://repo1.maven.org/maven2" />
  8 + </remote-repository>
  9 + <remote-repository>
  10 + <option name="id" value="jboss.community" />
  11 + <option name="name" value="JBoss Community repository" />
  12 + <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
  13 + </remote-repository>
  14 + <remote-repository>
  15 + <option name="id" value="maven" />
  16 + <option name="name" value="maven" />
  17 + <option name="url" value="http://android.nexus.cnlive.com/repository/cnlive-mixed/" />
  18 + </remote-repository>
  19 + <remote-repository>
  20 + <option name="id" value="BintrayJCenter" />
  21 + <option name="name" value="BintrayJCenter" />
  22 + <option name="url" value="https://jcenter.bintray.com/" />
  23 + </remote-repository>
  24 + <remote-repository>
  25 + <option name="id" value="maven2" />
  26 + <option name="name" value="maven2" />
  27 + <option name="url" value="https://dl.bintray.com/granzon/cnlive" />
  28 + </remote-repository>
  29 + <remote-repository>
  30 + <option name="id" value="maven4" />
  31 + <option name="name" value="maven4" />
  32 + <option name="url" value="https://jitpack.io" />
  33 + </remote-repository>
  34 + <remote-repository>
  35 + <option name="id" value="maven3" />
  36 + <option name="name" value="maven3" />
  37 + <option name="url" value="https://dl.bintray.com/granzon/cnliveLibs" />
  38 + </remote-repository>
  39 + <remote-repository>
  40 + <option name="id" value="Google" />
  41 + <option name="name" value="Google" />
  42 + <option name="url" value="https://dl.google.com/dl/android/maven2/" />
  43 + </remote-repository>
  44 + </component>
  45 +</project>
0 46 \ No newline at end of file
... ...
app/build.gradle
  View file @c016232
... ... @@ -73,21 +73,21 @@ android {
73 73  
74 74 dependencies {
75 75 implementation fileTree(dir: 'libs', include: ['*.jar'])
76   - implementation 'com.android.support.constraint:constraint-layout:1.1.3'
  76 + implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
77 77 testImplementation 'junit:junit:4.12'
78 78 implementation project(path: ':module_xiaojiaSoundBox')
79   - implementation "com.android.support:support-v4:$rootProject.supportV4"
80   - implementation "com.android.support:appcompat-v7:$rootProject.appcompatV7"
81   - implementation "com.android.support:design:$rootProject.design"
82   - implementation "com.android.support:support-v13:$rootProject.supportV13"
83   - implementation "com.android.support:recyclerview-v7:$rootProject.recyclerviewV7"
84   - implementation "com.cnlive:app_arch:$rootProject.appArch"
  79 + implementation 'androidx.legacy:legacy-support-v4:1.0.0'
  80 + implementation 'androidx.appcompat:appcompat:1.0.0'
  81 + implementation 'com.google.android.material:material:1.0.0'
  82 + implementation 'androidx.legacy:legacy-support-v13:1.0.0'
  83 + implementation 'androidx.recyclerview:recyclerview:1.0.0'
  84 + implementation "com.cnlive.libs:arch:$rootProject.appArch"
85 85 implementation "com.qmuiteam:qmui:$rootProject.qmui"
86 86 implementation "com.cnlive.libs:base:$rootProject.libBase"
87 87 androidTestImplementation 'junit:junit:4.12'
88 88 implementation 'com.daimajia.easing:library:2.0@aar'
89 89 implementation 'com.daimajia.androidanimations:library:2.3@aar'
90   - implementation 'com.android.support.constraint:constraint-layout:1.1.3'
  90 + implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
91 91  
92 92 implementation "com.alibaba:arouter-api:$rootProject.arouterApiVersion"
93 93 annotationProcessor "com.alibaba:arouter-compiler:$rootProject.arouterCompilerVersion"
... ...
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker;
2 2  
3 3  
4   -import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
  4 +import androidx.databinding.DataBindingUtil;
6 5 import android.os.Bundle;
7   -import android.os.Handler;
8   -import android.support.design.widget.Snackbar;
9   -import android.support.v7.app.AppCompatActivity;
10   -import android.view.LayoutInflater;
11   -import android.view.View;
12 6  
13   -import com.alibaba.android.arouter.launcher.ARouter;
  7 +import androidx.appcompat.app.AppCompatActivity;
  8 +
14 9 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
15 10 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivitySpeakerMainBinding;
16 11 import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
17   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
18   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.BluetoothConnActivity;
19   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
20   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnFailActivity;
21   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceInstructionActivity;
22   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceManagerActivity;
23   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.FirmwareUpdateActivity;
24   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.InvitFriendActivity;
25   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.SearchDeviceActivity;
26   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.SelectIMFriendActivity;
27   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.SelectWifiActivity;
28   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.SpeakerMainActivity;
29 12  
30 13 public class MainActivity extends AppCompatActivity {
31 14 private static final String TAG = "MainActivity";
... ...
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/ToolBarTestActivity.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker;
2 2  
3   -import android.databinding.DataBindingUtil;
  3 +import androidx.databinding.DataBindingUtil;
4 4 import android.os.Build;
5   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.appcompat.app.AppCompatActivity;
6 6 import android.os.Bundle;
7   -import android.view.View;
8   -import android.view.animation.AnimationUtils;
9 7  
10 8 import com.cnlive.strike.speaker.R;
11 9 import com.cnlive.strike.speaker.databinding.ActivityToolBarTest1Binding;
12   -import com.cnlive.strike.speaker.databinding.ActivityToolBarTestBinding;
13   -import com.daimajia.androidanimations.library.Techniques;
14   -import com.daimajia.androidanimations.library.YoYo;
15 10  
16 11 public class ToolBarTestActivity extends AppCompatActivity {
17 12 private ActivityToolBarTest1Binding binding;
... ...
app/src/main/res/layout/activity_main.xml
  View file @c016232
... ... @@ -7,7 +7,7 @@
7 7 android:layout_height="match_parent"
8 8 >
9 9  
10   - <android.support.v7.widget.RecyclerView
  10 + <androidx.recyclerview.widget.RecyclerView
11 11 android:id="@+id/recycler"
12 12 android:layout_width="match_parent"
13 13 android:layout_height="match_parent" />
... ...
app/src/main/res/layout/activity_tool_bar_test.xml
  View file @c016232
... ... @@ -334,7 +334,7 @@
334 334 </FrameLayout>
335 335 <!-- -->
336 336  
337   - <android.support.v4.widget.NestedScrollView
  337 + <androidx.core.widget.NestedScrollView
338 338 android:id="@+id/scrollView"
339 339 android:layout_width="match_parent"
340 340 android:layout_height="match_parent"
... ... @@ -429,6 +429,6 @@
429 429 android:layout_margin="20dp"
430 430 android:text="sajgfdkl;sdkgl;'sdjhgf;losdkmjgl;" />
431 431 </LinearLayout>
432   - </android.support.v4.widget.NestedScrollView>
  432 + </androidx.core.widget.NestedScrollView>
433 433 </LinearLayout>
434 434 </layout>
435 435 \ No newline at end of file
... ...
app/src/main/res/layout/activity_tool_bar_test1.xml
  View file @c016232
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <layout>
3 3  
4   - <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4 + <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
5 5 xmlns:app="http://schemas.android.com/apk/res-auto"
6 6 xmlns:tools="http://schemas.android.com/tools"
7 7 android:layout_width="match_parent"
... ... @@ -10,7 +10,7 @@
10 10 tools:context="com.cnlive.strike.xiaojiaspeaker.ToolBarTestActivity"
11 11 tools:ignore="MissingDefaultResource">
12 12  
13   - <android.support.design.widget.AppBarLayout
  13 + <com.google.android.material.appbar.AppBarLayout
14 14 android:id="@+id/appbar"
15 15 android:layout_width="match_parent"
16 16 android:layout_height="150dp"
... ... @@ -18,7 +18,7 @@
18 18 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
19 19  
20 20 <!---->
21   - <android.support.design.widget.CollapsingToolbarLayout
  21 + <com.google.android.material.appbar.CollapsingToolbarLayout
22 22 android:id="@+id/ctb"
23 23 android:layout_width="match_parent"
24 24 android:layout_height="wrap_content"
... ... @@ -183,12 +183,12 @@
183 183 <!-- -->
184 184 </LinearLayout>
185 185  
186   - </android.support.design.widget.CollapsingToolbarLayout>
  186 + </com.google.android.material.appbar.CollapsingToolbarLayout>
187 187 <!-- -->
188 188 <!-- -->
189   - </android.support.design.widget.AppBarLayout>
  189 + </com.google.android.material.appbar.AppBarLayout>
190 190  
191   - <android.support.v4.widget.NestedScrollView
  191 + <androidx.core.widget.NestedScrollView
192 192 android:layout_width="match_parent"
193 193 android:layout_height="match_parent"
194 194 app:layout_behavior="@string/appbar_scrolling_view_behavior">
... ... @@ -282,6 +282,6 @@
282 282 android:layout_margin="20dp"
283 283 android:text="sajgfdkl;sdkgl;'sdjhgf;losdkmjgl;" />
284 284 </LinearLayout>
285   - </android.support.v4.widget.NestedScrollView>
286   - </android.support.design.widget.CoordinatorLayout>
  285 + </androidx.core.widget.NestedScrollView>
  286 + </androidx.coordinatorlayout.widget.CoordinatorLayout>
287 287 </layout>
288 288 \ No newline at end of file
... ...
build.gradle
  View file @c016232
... ... @@ -63,11 +63,11 @@ ext {
63 63 recyclerviewV7 = '28.0.0'
64 64 cardviewV7 = '28.0.0'
65 65  
66   - appArch = '1.0.6'
  66 + appArch = '1.3.6.2-androidx-beta1'
67 67 //qmui
68 68 qmui = '1.1.5'
69 69  
70   - libBase = '1.8.0'
  70 + libBase = '1.9.1.8-androidx-beta3'
71 71 libNetwork = '1.1.5'
72 72 libLargeImage = '1.0.1'
73 73 libEmoj = '1.9.8'
... ... @@ -75,9 +75,9 @@ ext {
75 75 libAnalytics = '1.1.0'
76 76  
77 77 //glide
78   - glide = '4.5.0'
79   - glideTransformations = '3.0.1'
80   - compiler = '4.5.0'
  78 + glide = '4.11.0'
  79 + glideTransformations = '4.1.0'
  80 + compiler = '4.11.0'
81 81  
82 82 magicindicator = '1.6.0'
83 83  
... ...
config.gradle
  View file @c016232
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.3.33",
  24 + version: "0.3.33-androidx-beta1",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
gradle.properties
  View file @c016232
... ... @@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx1536m
14 14 # AndroidX package structure to make it clearer which packages are bundled with the
15 15 # Android operating system, and which are packaged with your app's APK
16 16 # https://developer.android.com/topic/libraries/support-library/androidx-rn
17   -android.useAndroidX=false
  17 +android.useAndroidX=true
18 18 # Automatically convert third-party libraries to use AndroidX
19   -android.enableJetifier=false
  19 +android.enableJetifier=true
20 20  
... ...
module_xiaojiaSoundBox/build.gradle
  View file @c016232
... ... @@ -52,12 +52,12 @@ android {
52 52  
53 53 dependencies {
54 54 implementation fileTree(include: ['*.jar'], dir: 'libs')
55   - implementation "com.android.support:support-v4:$rootProject.supportV4"
56   - implementation "com.android.support:appcompat-v7:$rootProject.appcompatV7"
57   - implementation "com.android.support:design:$rootProject.design"
58   - implementation "com.android.support:support-v13:$rootProject.supportV13"
59   - implementation "com.android.support:recyclerview-v7:$rootProject.recyclerviewV7"
60   - implementation "com.cnlive:app_arch:$rootProject.appArch"
  55 + implementation 'androidx.legacy:legacy-support-v4:1.0.0'
  56 + implementation 'androidx.appcompat:appcompat:1.0.0'
  57 + implementation 'com.google.android.material:material:1.0.0'
  58 + implementation 'androidx.legacy:legacy-support-v13:1.0.0'
  59 + implementation 'androidx.recyclerview:recyclerview:1.0.0'
  60 + implementation "com.cnlive.libs:arch:$rootProject.appArch"
61 61 implementation "com.qmuiteam:qmui:$rootProject.qmui"
62 62 implementation "com.cnlive.libs:base:$rootProject.libBase"
63 63 implementation "com.cnlive.libs:network:$rootProject.libNetwork"
... ... @@ -89,7 +89,7 @@ dependencies {
89 89 implementation "com.daimajia.easing:library:$rootProject.viewAnimationsEasing"
90 90 implementation "com.daimajia.androidanimations:library:$rootProject.viewAnimationsAndroid"
91 91  
92   - implementation 'com.android.support.constraint:constraint-layout:1.1.3'
  92 + implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
93 93  
94 94 implementation "com.alibaba:arouter-api:$rootProject.arouterApiVersion"
95 95 annotationProcessor "com.alibaba:arouter-compiler:$rootProject.arouterCompilerVersion"
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/AllDeviceFragmentView.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.frame.view;
2 2  
3 3 import android.app.Activity;
4   -import android.graphics.Color;
5   -import android.support.v7.widget.LinearLayoutManager;
  4 +
  5 +import androidx.recyclerview.widget.LinearLayoutManager;
6 6 import android.util.Log;
7 7 import android.view.View;
8 8  
... ... @@ -14,8 +14,6 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceDetailActivity;
14 14 import com.cnlive.strike.xiaojiaspeaker.ui.activity.RemoteControlActivity;
15 15 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.AllDeviceAdapter;
16 16 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.AllDeviceFragment;
17   -import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenu;
18   -import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
19 17 import com.hannesdorfmann.mosby3.mvp.MvpView;
20 18 import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
21 19  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/ChangeDeviceNameView.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.frame.view;
2 2  
3 3 import android.app.Activity;
4   -import android.support.v4.content.ContextCompat;
  4 +import androidx.core.content.ContextCompat;
5 5 import android.text.Editable;
6 6 import android.text.TextWatcher;
7 7 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/ChangeWifiFragmentView.java
  View file @c016232
... ... @@ -3,8 +3,8 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
3 3 import android.app.Activity;
4 4 import android.graphics.Typeface;
5 5 import android.net.wifi.ScanResult;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.widget.LinearLayoutManager;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.recyclerview.widget.LinearLayoutManager;
8 8 import android.text.TextUtils;
9 9 import android.util.Log;
10 10 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/DeviceManagerFragmentView.java
  View file @c016232
... ... @@ -7,39 +7,29 @@ import android.content.pm.PackageManager;
7 7 import android.graphics.Typeface;
8 8 import android.net.Uri;
9 9 import android.provider.Settings;
10   -import android.support.annotation.NonNull;
11   -import android.support.v4.app.ActivityCompat;
12   -import android.support.v4.content.ContextCompat;
13   -import android.support.v7.widget.DefaultItemAnimator;
14   -import android.support.v7.widget.LinearLayoutManager;
  10 +import androidx.annotation.NonNull;
  11 +import androidx.core.app.ActivityCompat;
  12 +import androidx.core.content.ContextCompat;
  13 +
15 14 import android.text.TextUtils;
16 15 import android.util.Log;
17 16 import android.view.View;
18 17  
19   -import com.clj.fastble.BleManager;
20 18 import com.cnlive.libs.base.util.AlertUtil;
21 19 import com.cnlive.strike.xiaojiaspeaker.R;
22   -import com.cnlive.strike.xiaojiaspeaker.model.DeviceManagerMenu;
23 20 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
24 21 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
25 22 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep2Activity;
26 23 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ChangeDeviceNameActivity;
27 24 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ChangeWifiActivity;
28 25 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceInfoActivity;
29   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceManagerActivity;
30 26 import com.cnlive.strike.xiaojiaspeaker.ui.activity.FirmwareUpdateActivity;
31   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.SearchDeviceActivity;
32   -import com.cnlive.strike.xiaojiaspeaker.ui.adapter.DeviceManagerMenuAdapter;
33 27 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.DeviceManagerFragment;
34 28 import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
35 29 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
36 30 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
37   -import com.cnlive.strike.xiaojiaspeaker.util.utilcode.CheckUtil;
38 31 import com.hannesdorfmann.mosby3.mvp.MvpView;
39 32  
40   -import java.util.ArrayList;
41   -import java.util.List;
42   -
43 33 public class DeviceManagerFragmentView implements MvpView {
44 34 private DeviceManagerFragment fragment;
45 35 // private DeviceManagerMenuAdapter adapter;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/InvitFriendView.java
  View file @c016232
... ... @@ -3,8 +3,8 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
3 3 import android.app.Activity;
4 4 import android.graphics.Bitmap;
5 5 import android.graphics.BitmapFactory;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.widget.LinearLayoutManager;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.recyclerview.widget.LinearLayoutManager;
8 8 import android.text.TextUtils;
9 9 import android.view.View;
10 10  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SearchDevicefragmentView.java
  View file @c016232
... ... @@ -3,11 +3,10 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
3 3 import android.app.Activity;
4 4 import android.bluetooth.BluetoothAdapter;
5 5 import android.content.Intent;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.widget.DefaultItemAnimator;
8   -import android.support.v7.widget.LinearLayoutManager;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.recyclerview.widget.DefaultItemAnimator;
  8 +import androidx.recyclerview.widget.LinearLayoutManager;
9 9 import android.text.TextUtils;
10   -import android.util.Log;
11 10 import android.view.View;
12 11  
13 12 import com.clj.fastble.BleManager;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectIMFriendView.java
  View file @c016232
... ... @@ -2,8 +2,8 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Context;
5   -import android.support.v4.content.ContextCompat;
6   -import android.support.v7.widget.LinearLayoutManager;
  5 +import androidx.core.content.ContextCompat;
  6 +import androidx.recyclerview.widget.LinearLayoutManager;
7 7 import android.text.Editable;
8 8 import android.text.TextUtils;
9 9 import android.text.TextWatcher;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
  View file @c016232
... ... @@ -5,8 +5,8 @@ import android.bluetooth.BluetoothGatt;
5 5 import android.graphics.Typeface;
6 6 import android.net.wifi.ScanResult;
7 7 import android.os.Handler;
8   -import android.support.v4.content.ContextCompat;
9   -import android.support.v7.widget.LinearLayoutManager;
  8 +import androidx.core.content.ContextCompat;
  9 +import androidx.recyclerview.widget.LinearLayoutManager;
10 10 import android.text.TextUtils;
11 11 import android.util.Log;
12 12 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SetFriendsRoleView.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.frame.view;
2 2  
3 3 import android.app.Activity;
4   -import android.support.v4.content.ContextCompat;
5   -import android.support.v7.widget.LinearLayoutManager;
  4 +import androidx.core.content.ContextCompat;
  5 +import androidx.recyclerview.widget.LinearLayoutManager;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8 8  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/UserManagerView.java
  View file @c016232
... ... @@ -3,8 +3,8 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
3 3 import android.app.Activity;
4 4 import android.graphics.Color;
5 5 import android.graphics.Typeface;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.widget.LinearLayoutManager;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.recyclerview.widget.LinearLayoutManager;
8 8 import android.text.TextUtils;
9 9 import android.view.View;
10 10 import android.widget.Button;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/model/LetterComparator.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.model;
2 2  
3   -import android.support.annotation.IntRange;
4   -import android.support.annotation.NonNull;
  3 +import androidx.annotation.IntRange;
  4 +import androidx.annotation.NonNull;
5 5  
6 6  
7 7 import java.util.Comparator;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/AllDeviceActivity.java
  View file @c016232
... ... @@ -2,25 +2,19 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.database.DatabaseUtils;
6   -import android.databinding.DataBindingUtil;
7   -import android.support.v4.content.ContextCompat;
8   -import android.support.v7.app.AppCompatActivity;
  5 +
  6 +import androidx.databinding.DataBindingUtil;
  7 +import androidx.core.content.ContextCompat;
  8 +import androidx.appcompat.app.AppCompatActivity;
9 9 import android.os.Bundle;
10 10 import android.text.TextUtils;
11   -import android.view.View;
12 11  
13 12 import com.alibaba.android.arouter.facade.annotation.Route;
14 13 import com.cnlive.libs.base.util.AlertUtil;
15   -import com.cnlive.libs.base.util.StatusBarUtil;
16   -import com.cnlive.libs.base.util.StatusBarUtil2;
17 14 import com.cnlive.strike.xiaojiaspeaker.R;
18 15 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
19 16 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityAllDeviceBinding;
20 17 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.AllDeviceFragment;
21   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.InvitFriendFragment;
22   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SearchDevicefragment;
23   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
24 18  
25 19 /**
26 20 * 所有设备
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothHelpActivity.java
  View file @c016232
... ... @@ -2,9 +2,9 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.appcompat.app.AppCompatActivity;
8 8 import android.os.Bundle;
9 9 import android.view.View;
10 10  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep1Activity.java
  View file @c016232
... ... @@ -2,9 +2,9 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.appcompat.app.AppCompatActivity;
8 8 import android.os.Bundle;
9 9 import android.view.View;
10 10  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
  View file @c016232
... ... @@ -8,13 +8,13 @@ import android.content.Context;
8 8 import android.content.Intent;
9 9 import android.content.IntentFilter;
10 10 import android.content.pm.PackageManager;
11   -import android.databinding.DataBindingUtil;
  11 +import androidx.databinding.DataBindingUtil;
12 12 import android.net.Uri;
13 13 import android.provider.Settings;
14   -import android.support.annotation.NonNull;
15   -import android.support.v4.app.ActivityCompat;
16   -import android.support.v4.content.ContextCompat;
17   -import android.support.v7.app.AppCompatActivity;
  14 +import androidx.annotation.NonNull;
  15 +import androidx.core.app.ActivityCompat;
  16 +import androidx.core.content.ContextCompat;
  17 +import androidx.appcompat.app.AppCompatActivity;
18 18 import android.os.Bundle;
19 19 import android.util.Log;
20 20 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BluetoothConnActivity.java
  View file @c016232
... ... @@ -2,46 +2,31 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.bluetooth.BluetoothAdapter;
4 4 import android.bluetooth.BluetoothDevice;
5   -import android.bluetooth.BluetoothGatt;
6 5 import android.content.BroadcastReceiver;
7 6 import android.content.Context;
8 7 import android.content.Intent;
9 8 import android.content.IntentFilter;
10   -import android.databinding.DataBindingUtil;
  9 +import androidx.databinding.DataBindingUtil;
11 10 import android.os.Bundle;
12   -import android.os.Message;
13   -import android.support.v7.app.AppCompatActivity;
14   -import android.support.v7.widget.DefaultItemAnimator;
15   -import android.support.v7.widget.LinearLayoutManager;
  11 +
  12 +import androidx.appcompat.app.AppCompatActivity;
  13 +import androidx.recyclerview.widget.LinearLayoutManager;
16 14 import android.text.TextUtils;
17 15 import android.util.Log;
18 16 import android.view.View;
19   -import android.widget.Button;
20 17  
21 18 import com.clj.fastble.BleManager;
22   -import com.clj.fastble.callback.BleGattCallback;
23   -import com.clj.fastble.callback.BleNotifyCallback;
24   -import com.clj.fastble.callback.BleScanCallback;
25   -import com.clj.fastble.callback.BleWriteCallback;
26   -import com.clj.fastble.data.BleDevice;
27   -import com.clj.fastble.exception.BleException;
28   -import com.clj.fastble.scan.BleScanRuleConfig;
29 19 import com.cnlive.libs.base.util.AlertUtil;
30 20 import com.cnlive.strike.xiaojiaspeaker.R;
31   -import com.cnlive.strike.xiaojiaspeaker.constants.BlufiConstants;
32 21 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityBluetoothMainBinding;
33 22 import com.cnlive.strike.xiaojiaspeaker.model.BlueToothMsgEvent;
34   -import com.cnlive.strike.xiaojiaspeaker.model.BluetoothDeviceInfo;
35   -import com.cnlive.strike.xiaojiaspeaker.ui.adapter.BluetoothDeviceAdapter;
36 23 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.BluetoothListViewAdapterTest;
37   -import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
38 24 import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
39 25  
40 26 import org.greenrobot.eventbus.EventBus;
41 27 import org.greenrobot.eventbus.Subscribe;
42 28 import org.greenrobot.eventbus.ThreadMode;
43 29  
44   -import java.io.UnsupportedEncodingException;
45 30 import java.lang.reflect.Field;
46 31 import java.lang.reflect.Method;
47 32 import java.util.ArrayList;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ChangeDeviceNameActivity.java
  View file @c016232
... ... @@ -2,24 +2,15 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.appcompat.app.AppCompatActivity;
8 8 import android.os.Bundle;
9   -import android.text.Editable;
10 9 import android.text.TextUtils;
11   -import android.text.TextWatcher;
12   -import android.view.View;
13 10  
14   -import com.cnlive.libs.base.util.StatusBarUtil;
15   -import com.cnlive.libs.base.util.StatusBarUtil2;
16 11 import com.cnlive.strike.xiaojiaspeaker.R;
17 12 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityChangeDeviceNameBinding;
18   -import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
19 13 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeDeviceNameFragment;
20   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.DeviceManagerFragment;
21   -
22   -import java.io.Serializable;
23 14  
24 15 /**
25 16 * 更改音箱名称
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ChangeWifiActivity.java
  View file @c016232
... ... @@ -8,17 +8,15 @@ import android.net.Uri;
8 8 import android.os.Bundle;
9 9 import android.os.Handler;
10 10 import android.provider.Settings;
11   -import android.support.annotation.NonNull;
12   -import android.support.v4.app.ActivityCompat;
13   -import android.support.v7.app.AppCompatActivity;
  11 +import androidx.annotation.NonNull;
  12 +import androidx.core.app.ActivityCompat;
  13 +import androidx.appcompat.app.AppCompatActivity;
14 14 import android.text.TextUtils;
15 15 import android.util.Log;
16 16  
17   -import com.clj.fastble.data.BleDevice;
18 17 import com.cnlive.strike.xiaojiaspeaker.R;
19 18 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
20 19 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeWifiFragment;
21   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
22 20 import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
23 21 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
24 22 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
  View file @c016232
... ... @@ -2,9 +2,9 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.appcompat.app.AppCompatActivity;
8 8 import android.os.Bundle;
9 9 import android.text.TextUtils;
10 10 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnFailActivity.java
  View file @c016232
... ... @@ -2,10 +2,10 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
  5 +import androidx.databinding.DataBindingUtil;
6 6 import android.net.Uri;
7   -import android.support.v4.content.ContextCompat;
8   -import android.support.v7.app.AppCompatActivity;
  7 +import androidx.core.content.ContextCompat;
  8 +import androidx.appcompat.app.AppCompatActivity;
9 9 import android.os.Bundle;
10 10 import android.text.TextUtils;
11 11 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceDetailActivity.java
  View file @c016232
... ... @@ -2,25 +2,15 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.appcompat.app.AppCompatActivity;
8 8 import android.os.Bundle;
9   -import android.text.TextUtils;
10   -import android.view.View;
11 9  
12   -import com.cnlive.libs.base.util.StatusBarUtil;
13   -import com.cnlive.libs.base.util.StatusBarUtil2;
14 10 import com.cnlive.strike.xiaojiaspeaker.R;
15 11 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityDeviceDetailBinding;
16   -import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
17 12 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
18 13 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.DeviceDetailFragment;
19   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.DeviceManagerFragment;
20   -import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
21   -
22   -import org.greenrobot.eventbus.Subscribe;
23   -import org.greenrobot.eventbus.ThreadMode;
24 14  
25 15 import java.io.Serializable;
26 16  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInfoActivity.java
  View file @c016232
... ... @@ -2,9 +2,9 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.appcompat.app.AppCompatActivity;
8 8 import android.os.Bundle;
9 9 import android.view.View;
10 10  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceInstructionActivity.java
  View file @c016232
... ... @@ -2,9 +2,9 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.appcompat.app.AppCompatActivity;
8 8 import android.os.Bundle;
9 9 import android.view.View;
10 10  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/DeviceManagerActivity.java
  View file @c016232
... ... @@ -2,21 +2,16 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.annotation.NonNull;
7   -import android.support.v4.content.ContextCompat;
8   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.annotation.NonNull;
  7 +import androidx.core.content.ContextCompat;
  8 +import androidx.appcompat.app.AppCompatActivity;
9 9 import android.os.Bundle;
10   -import android.text.TextUtils;
11   -import android.view.View;
12 10  
13   -import com.cnlive.libs.base.util.StatusBarUtil;
14   -import com.cnlive.libs.base.util.StatusBarUtil2;
15 11 import com.cnlive.strike.xiaojiaspeaker.R;
16 12 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityDeviceManagerBinding;
17 13 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
18 14 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.DeviceManagerFragment;
19   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
20 15  
21 16 /**
22 17 * 设备管理
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/FirmwareUpdateActivity.java
  View file @c016232
... ... @@ -2,13 +2,11 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.appcompat.app.AppCompatActivity;
6 6 import android.os.Bundle;
7 7  
8 8 import com.cnlive.strike.xiaojiaspeaker.R;
9   -import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentFirmwareUpdateBinding;
10 9 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
11   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.DeviceManagerFragment;
12 10 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.FirmwareUpdateFragment;
13 11  
14 12 /**
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/InvitFriendActivity.java
  View file @c016232
... ... @@ -2,12 +2,11 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.appcompat.app.AppCompatActivity;
6 6 import android.os.Bundle;
7 7 import android.text.TextUtils;
8 8  
9 9 import com.cnlive.strike.xiaojiaspeaker.R;
10   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.AllDeviceFragment;
11 10 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.InvitFriendFragment;
12 11  
13 12 /**
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/RemoteControlActivity.java
  View file @c016232
... ... @@ -3,14 +3,13 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
3 3 import android.app.Activity;
4 4 import android.content.Context;
5 5 import android.content.Intent;
6   -import android.databinding.DataBindingUtil;
7   -import android.support.v4.content.ContextCompat;
8   -import android.support.v7.app.AppCompatActivity;
  6 +import androidx.databinding.DataBindingUtil;
  7 +import androidx.core.content.ContextCompat;
  8 +import androidx.appcompat.app.AppCompatActivity;
9 9 import android.os.Bundle;
10 10 import android.util.Log;
11 11 import android.view.View;
12 12  
13   -import com.cnlive.libs.base.logic.Event;
14 13 import com.cnlive.libs.base.logic.Logic;
15 14 import com.cnlive.libs.base.logic.callback.DataCallback;
16 15 import com.cnlive.libs.base.logic.callback.FailureCallback;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SearchDeviceActivity.java
  View file @c016232
... ... @@ -2,7 +2,7 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.appcompat.app.AppCompatActivity;
6 6 import android.os.Bundle;
7 7  
8 8 import com.cnlive.strike.xiaojiaspeaker.R;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SelectIMFriendActivity.java
  View file @c016232
... ... @@ -2,12 +2,11 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.appcompat.app.AppCompatActivity;
6 6 import android.os.Bundle;
7 7 import android.text.TextUtils;
8 8  
9 9 import com.cnlive.strike.xiaojiaspeaker.R;
10   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SearchDevicefragment;
11 10 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectIMFriendFragment;
12 11  
13 12 public class SelectIMFriendActivity extends AppCompatActivity {
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SelectWifiActivity.java
  View file @c016232
... ... @@ -2,27 +2,20 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.Manifest;
4 4 import android.app.Activity;
5   -import android.content.BroadcastReceiver;
6   -import android.content.Context;
7 5 import android.content.Intent;
8   -import android.content.IntentFilter;
9 6 import android.content.pm.PackageManager;
10   -import android.net.NetworkInfo;
11 7 import android.net.Uri;
12   -import android.net.wifi.WifiManager;
13 8 import android.os.Handler;
14 9 import android.provider.Settings;
15   -import android.support.annotation.NonNull;
16   -import android.support.v4.app.ActivityCompat;
17   -import android.support.v7.app.AppCompatActivity;
  10 +import androidx.annotation.NonNull;
  11 +import androidx.core.app.ActivityCompat;
  12 +import androidx.appcompat.app.AppCompatActivity;
18 13 import android.os.Bundle;
19 14 import android.util.Log;
20 15  
21   -import com.clj.fastble.BleManager;
22 16 import com.clj.fastble.data.BleDevice;
23 17 import com.cnlive.libs.base.util.AlertUtil;
24 18 import com.cnlive.strike.xiaojiaspeaker.R;
25   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SearchDevicefragment;
26 19 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
27 20 import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
28 21 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SetFriendsRoleActivity.java
  View file @c016232
... ... @@ -2,13 +2,12 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.appcompat.app.AppCompatActivity;
6 6 import android.os.Bundle;
7 7 import android.text.TextUtils;
8 8  
9 9 import com.cnlive.libs.base.util.AlertUtil;
10 10 import com.cnlive.strike.xiaojiaspeaker.R;
11   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
12 11 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SetFriendsRoleFragment;
13 12  
14 13 /**
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ShareFriendActivity.java
  View file @c016232
... ... @@ -6,8 +6,8 @@ import android.content.Intent;
6 6 import android.content.SharedPreferences;
7 7 import android.graphics.Bitmap;
8 8 import android.graphics.BitmapFactory;
9   -import android.support.v4.content.ContextCompat;
10   -import android.support.v7.app.AppCompatActivity;
  9 +import androidx.core.content.ContextCompat;
  10 +import androidx.appcompat.app.AppCompatActivity;
11 11 import android.os.Bundle;
12 12 import android.util.Base64;
13 13 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/SpeakerMainActivity.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3  
4   -import android.bluetooth.BluetoothDevice;
5 4 import android.content.BroadcastReceiver;
6 5 import android.content.Context;
7 6 import android.content.Intent;
8 7 import android.content.IntentFilter;
9   -import android.databinding.DataBindingUtil;
10   -import android.graphics.Color;
  8 +import androidx.databinding.DataBindingUtil;
  9 +
11 10 import android.net.NetworkInfo;
12 11 import android.net.wifi.ScanResult;
13 12 import android.net.wifi.WifiManager;
14 13 import android.os.Bundle;
15   -import android.os.SystemClock;
16   -import android.support.v7.app.AppCompatActivity;
17   -import android.support.v7.widget.LinearLayoutManager;
  14 +
  15 +import androidx.appcompat.app.AppCompatActivity;
  16 +
18 17 import android.text.TextUtils;
19 18 import android.util.Log;
20 19  
... ... @@ -22,24 +21,17 @@ import com.cnlive.libs.base.util.AlertUtil;
22 21 import com.cnlive.strike.xiaojiaspeaker.R;
23 22 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivitySpeakerMainBinding;
24 23 import com.cnlive.strike.xiaojiaspeaker.listener.WifiChangeListener;
25   -import com.cnlive.strike.xiaojiaspeaker.model.BlueToothMsgEvent;
26 24 import com.cnlive.strike.xiaojiaspeaker.model.WifiConnModel;
27 25 import com.cnlive.strike.xiaojiaspeaker.model.WifiMsgEvent;
28 26 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
29   -import com.cnlive.strike.xiaojiaspeaker.ui.widget.WifiPwdDialog;
30 27 import com.cnlive.strike.xiaojiaspeaker.util.WifiCheckUtil;
31 28 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
32   -import com.cnlive.strike.xiaojiaspeaker.util.utilcode.util.BarUtils;
33 29 import com.cnlive.strike.xiaojiaspeaker.util.utilcode.util.NetworkUtils;
34 30  
35 31 import org.greenrobot.eventbus.EventBus;
36 32 import org.greenrobot.eventbus.Subscribe;
37 33 import org.greenrobot.eventbus.ThreadMode;
38 34  
39   -import java.io.IOException;
40   -import java.io.OutputStream;
41   -import java.io.PrintStream;
42   -import java.net.Socket;
43 35 import java.util.ArrayList;
44 36 import java.util.List;
45 37  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/UserManagerActivity.java
  View file @c016232
... ... @@ -2,14 +2,12 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Intent;
5   -import android.support.v7.app.AppCompatActivity;
  5 +import androidx.appcompat.app.AppCompatActivity;
6 6 import android.os.Bundle;
7 7 import android.text.TextUtils;
8 8  
9 9 import com.alibaba.android.arouter.facade.annotation.Route;
10   -import com.clj.fastble.data.BleDevice;
11 10 import com.cnlive.strike.xiaojiaspeaker.R;
12   -import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
13 11 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.UserManagerFragment;
14 12  
15 13 @Route(path = "/XiaoJiaSpeaker/UserManagerActivity")
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/AllDeviceAdapter.java
  View file @c016232
... ... @@ -2,11 +2,11 @@ package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Context;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.annotation.NonNull;
7   -import android.support.v4.content.ContextCompat;
8   -import android.support.v7.widget.RecyclerView;
9   -import android.util.Log;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.annotation.NonNull;
  7 +import androidx.core.content.ContextCompat;
  8 +import androidx.recyclerview.widget.RecyclerView;
  9 +
10 10 import android.view.LayoutInflater;
11 11 import android.view.View;
12 12 import android.view.ViewGroup;
... ... @@ -14,7 +14,6 @@ import android.view.ViewGroup;
14 14 import com.cnlive.strike.application.GlideApp;
15 15 import com.cnlive.strike.xiaojiaspeaker.R;
16 16 import com.cnlive.strike.xiaojiaspeaker.databinding.ListItemAllDeviceBinding;
17   -import com.cnlive.strike.xiaojiaspeaker.model.AllDeviceInfo;
18 17 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
19 18  
20 19 import java.lang.reflect.Method;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/AllRoleDetailAdapter.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3 3 import android.content.Context;
4   -import android.databinding.DataBindingUtil;
5   -import android.support.annotation.NonNull;
6   -import android.support.v7.widget.RecyclerView;
7   -import android.text.TextUtils;
8   -import android.util.Log;
  4 +import androidx.databinding.DataBindingUtil;
  5 +import androidx.annotation.NonNull;
  6 +import androidx.recyclerview.widget.RecyclerView;
  7 +
9 8 import android.view.LayoutInflater;
10 9 import android.view.View;
11 10 import android.view.ViewGroup;
... ... @@ -15,10 +14,7 @@ import com.cnlive.strike.xiaojiaspeaker.R;
15 14 import com.cnlive.strike.xiaojiaspeaker.databinding.ItemListSetRoleCheckBoxBinding;
16 15 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
17 16 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
18   -import com.cnlive.strike.xiaojiaspeaker.util.utilcode.util.GsonUtils;
19 17  
20   -import java.util.ArrayList;
21   -import java.util.HashMap;
22 18 import java.util.List;
23 19 import java.util.Map;
24 20  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/BluetoothDeviceAdapter.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3   -import android.bluetooth.BluetoothClass;
4 3 import android.bluetooth.BluetoothDevice;
5 4 import android.content.Context;
6   -import android.databinding.DataBindingUtil;
7   -import android.support.v4.content.ContextCompat;
8   -import android.support.v7.widget.RecyclerView;
9   -import android.text.TextUtils;
10   -import android.util.Log;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.recyclerview.widget.RecyclerView;
  8 +
11 9 import android.view.LayoutInflater;
12 10 import android.view.View;
13 11 import android.view.ViewGroup;
14   -import android.widget.CompoundButton;
15 12  
16 13  
17 14 import com.clj.fastble.data.BleDevice;
18 15 import com.cnlive.strike.application.GlideApp;
19 16 import com.cnlive.strike.xiaojiaspeaker.R;
20 17 import com.cnlive.strike.xiaojiaspeaker.databinding.ListItemBluetoothDeviceBinding;
21   -import com.cnlive.strike.xiaojiaspeaker.model.BluetoothDeviceInfo;
22 18  
23 19 import java.util.HashMap;
24 20 import java.util.List;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/BluetoothListViewAdapterTest.java
  View file @c016232
... ... @@ -2,16 +2,15 @@ package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3 3 import android.bluetooth.BluetoothDevice;
4 4 import android.content.Context;
5   -import android.databinding.DataBindingUtil;
6   -import android.support.annotation.NonNull;
7   -import android.support.v7.widget.RecyclerView;
  5 +import androidx.databinding.DataBindingUtil;
  6 +import androidx.annotation.NonNull;
  7 +import androidx.recyclerview.widget.RecyclerView;
8 8 import android.view.LayoutInflater;
9 9 import android.view.View;
10 10 import android.view.ViewGroup;
11 11  
12 12 import com.cnlive.strike.xiaojiaspeaker.R;
13 13 import com.cnlive.strike.xiaojiaspeaker.databinding.ListItemBluetoothDeviceBinding;
14   -import com.cnlive.strike.xiaojiaspeaker.databinding.ListItemWifi1Binding;
15 14  
16 15 import java.util.List;
17 16  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/DeviceManagerMenuAdapter.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3 3 import android.content.Context;
4   -import android.databinding.DataBindingUtil;
5   -import android.support.annotation.NonNull;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.widget.RecyclerView;
  4 +import androidx.databinding.DataBindingUtil;
  5 +import androidx.annotation.NonNull;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.recyclerview.widget.RecyclerView;
8 8 import android.view.LayoutInflater;
9 9 import android.view.View;
10 10 import android.view.ViewGroup;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/SelectIMFriendAdapter.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3 3 import android.content.Context;
4   -import android.databinding.DataBindingUtil;
5   -import android.support.annotation.NonNull;
6   -import android.support.v7.widget.RecyclerView;
  4 +import androidx.databinding.DataBindingUtil;
  5 +import androidx.annotation.NonNull;
  6 +import androidx.recyclerview.widget.RecyclerView;
7 7 import android.text.TextUtils;
8 8 import android.view.LayoutInflater;
9 9 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/SetRoleAdapter.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3 3 import android.content.Context;
4   -import android.databinding.DataBindingUtil;
5   -import android.support.annotation.NonNull;
6   -import android.support.v7.widget.GridLayoutManager;
7   -import android.support.v7.widget.RecyclerView;
  4 +import androidx.databinding.DataBindingUtil;
  5 +import androidx.annotation.NonNull;
  6 +import androidx.recyclerview.widget.GridLayoutManager;
  7 +import androidx.recyclerview.widget.RecyclerView;
8 8 import android.text.TextUtils;
9 9 import android.view.LayoutInflater;
10 10 import android.view.View;
... ... @@ -14,7 +14,6 @@ import com.cnlive.strike.application.GlideApp;
14 14 import com.cnlive.strike.xiaojiaspeaker.R;
15 15 import com.cnlive.strike.xiaojiaspeaker.databinding.ItemListSetRoleBinding;
16 16 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
17   -import com.cnlive.strike.xiaojiaspeaker.netWork.bean.InvitFamilyBean;
18 17 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.InvitFamilyBean1;
19 18 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
20 19 import com.cnlive.strike.xiaojiaspeaker.util.GsonUtil;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/UserＭanagerAdapter.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3 3 import android.content.Context;
4   -import android.databinding.DataBindingUtil;
5   -import android.support.annotation.NonNull;
6   -import android.support.v7.widget.RecyclerView;
  4 +import androidx.databinding.DataBindingUtil;
  5 +import androidx.annotation.NonNull;
  6 +import androidx.recyclerview.widget.RecyclerView;
7 7 import android.view.LayoutInflater;
8 8 import android.view.View;
9 9 import android.view.ViewGroup;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/WifiRecycleAdapter.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.adapter;
2 2  
3 3 import android.content.Context;
4   -import android.databinding.DataBindingUtil;
5   -import android.net.NetworkInfo;
  4 +import androidx.databinding.DataBindingUtil;
  5 +
6 6 import android.net.wifi.ScanResult;
7   -import android.net.wifi.WifiInfo;
8   -import android.support.v7.widget.RecyclerView;
9   -import android.text.TextUtils;
10   -import android.util.Log;
  7 +
  8 +import androidx.recyclerview.widget.RecyclerView;
  9 +
11 10 import android.view.LayoutInflater;
12 11 import android.view.View;
13 12 import android.view.ViewGroup;
... ... @@ -15,7 +14,6 @@ import android.view.ViewGroup;
15 14  
16 15 import com.cnlive.strike.xiaojiaspeaker.R;
17 16 import com.cnlive.strike.xiaojiaspeaker.databinding.ListItemWifi1Binding;
18   -import com.cnlive.strike.xiaojiaspeaker.model.WifiConnModel;
19 17 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
20 18  
21 19 import java.util.List;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.Nullable;
5   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.Nullable;
  5 +import androidx.core.content.ContextCompat;
6 6 import android.view.View;
7 7  
8 8 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
... ... @@ -16,7 +16,6 @@ import com.cnlive.strike.xiaojiaspeaker.frame.presenter.AllDeviceFragmentPresent
16 16 import com.cnlive.strike.xiaojiaspeaker.frame.view.AllDeviceFragmentView;
17 17 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
18 18 import com.cnlive.strike.xiaojiaspeaker.ui.activity.BlueToothStep1Activity;
19   -import com.cnlive.strike.xiaojiaspeaker.ui.activity.RemoteControlActivity;
20 19 import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
21 20 import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
22 21  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeDeviceNameFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.Nullable;
5   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.Nullable;
  5 +import androidx.core.content.ContextCompat;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8 8  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/ChangeWifiFragment.java
  View file @c016232
... ... @@ -7,8 +7,8 @@ import android.content.IntentFilter;
7 7 import android.net.NetworkInfo;
8 8 import android.net.wifi.WifiManager;
9 9 import android.os.Bundle;
10   -import android.support.annotation.Nullable;
11   -import android.support.v4.content.ContextCompat;
  10 +import androidx.annotation.Nullable;
  11 +import androidx.core.content.ContextCompat;
12 12 import android.text.TextUtils;
13 13 import android.util.Log;
14 14 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceDetailFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.Nullable;
5   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.Nullable;
  5 +import androidx.core.content.ContextCompat;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8 8  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/DeviceManagerFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.NonNull;
5   -import android.support.annotation.Nullable;
6   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.NonNull;
  5 +import androidx.annotation.Nullable;
  6 +import androidx.core.content.ContextCompat;
7 7 import android.text.TextUtils;
8 8 import android.view.View;
9 9  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/FirmwareUpdateFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.Nullable;
5   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.Nullable;
  5 +import androidx.core.content.ContextCompat;
6 6 import android.view.View;
7 7  
8 8 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/InvitFriendFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.Nullable;
5   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.Nullable;
  5 +import androidx.core.content.ContextCompat;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8 8  
... ... @@ -14,11 +14,6 @@ import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
14 14 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentInvitFriendBinding;
15 15 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.InvitFriendPresenter;
16 16 import com.cnlive.strike.xiaojiaspeaker.frame.view.InvitFriendView;
17   -import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
18   -import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
19   -
20   -import org.greenrobot.eventbus.Subscribe;
21   -import org.greenrobot.eventbus.ThreadMode;
22 17  
23 18 /**
24 19 * 二维码邀请加入
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SearchDevicefragment.java
  View file @c016232
... ... @@ -2,8 +2,8 @@ package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4 4 import android.os.Handler;
5   -import android.support.annotation.Nullable;
6   -import android.support.v4.content.ContextCompat;
  5 +import androidx.annotation.Nullable;
  6 +import androidx.core.content.ContextCompat;
7 7 import android.view.View;
8 8  
9 9 import com.clj.fastble.BleManager;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.Nullable;
5   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.Nullable;
  5 +import androidx.core.content.ContextCompat;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8 8  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectWifiFragment.java
  View file @c016232
... ... @@ -7,8 +7,8 @@ import android.content.IntentFilter;
7 7 import android.net.NetworkInfo;
8 8 import android.net.wifi.WifiManager;
9 9 import android.os.Bundle;
10   -import android.support.annotation.Nullable;
11   -import android.support.v4.content.ContextCompat;
  10 +import androidx.annotation.Nullable;
  11 +import androidx.core.content.ContextCompat;
12 12 import android.util.Log;
13 13 import android.view.View;
14 14  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SetFriendsRoleFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.Nullable;
5   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.Nullable;
  5 +import androidx.core.content.ContextCompat;
6 6 import android.view.View;
7 7  
8 8 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/UserManagerFragment.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
2 2  
3 3 import android.os.Bundle;
4   -import android.support.annotation.Nullable;
5   -import android.support.v4.content.ContextCompat;
  4 +import androidx.annotation.Nullable;
  5 +import androidx.core.content.ContextCompat;
6 6 import android.text.TextUtils;
7 7 import android.view.View;
8 8  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/EditRoleDialog.java
  View file @c016232
... ... @@ -3,9 +3,9 @@ package com.cnlive.strike.xiaojiaspeaker.ui.widget;
3 3 import android.app.Dialog;
4 4 import android.content.Context;
5 5 import android.os.Bundle;
6   -import android.support.annotation.NonNull;
7   -import android.support.v7.widget.LinearLayoutManager;
8   -import android.support.v7.widget.RecyclerView;
  6 +import androidx.annotation.NonNull;
  7 +import androidx.recyclerview.widget.LinearLayoutManager;
  8 +import androidx.recyclerview.widget.RecyclerView;
9 9 import android.view.LayoutInflater;
10 10 import android.view.View;
11 11 import android.view.ViewGroup;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/SelectDialog.java
  View file @c016232
... ... @@ -4,8 +4,8 @@ import android.app.Dialog;
4 4 import android.content.Context;
5 5 import android.graphics.Typeface;
6 6 import android.os.Bundle;
7   -import android.support.annotation.NonNull;
8   -import android.support.v4.content.ContextCompat;
  7 +import androidx.annotation.NonNull;
  8 +import androidx.core.content.ContextCompat;
9 9 import android.view.LayoutInflater;
10 10 import android.view.View;
11 11 import android.view.ViewGroup;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/TipDialog.java
  View file @c016232
... ... @@ -4,7 +4,7 @@ import android.app.Dialog;
4 4 import android.content.Context;
5 5 import android.graphics.Typeface;
6 6 import android.os.Bundle;
7   -import android.support.annotation.NonNull;
  7 +import androidx.annotation.NonNull;
8 8 import android.view.LayoutInflater;
9 9 import android.view.View;
10 10 import android.view.ViewGroup;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/WifiPwdDialog.java
  View file @c016232
... ... @@ -3,8 +3,8 @@ package com.cnlive.strike.xiaojiaspeaker.ui.widget;
3 3 import android.app.Dialog;
4 4 import android.content.Context;
5 5 import android.os.Bundle;
6   -import android.support.annotation.NonNull;
7   -import android.support.v4.content.ContextCompat;
  6 +import androidx.annotation.NonNull;
  7 +import androidx.core.content.ContextCompat;
8 8 import android.text.Editable;
9 9 import android.text.InputType;
10 10 import android.text.TextUtils;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/popmenu/ArrowDrawable.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu;
2 2  
3   -import android.content.Context;
4 3 import android.graphics.Canvas;
5 4 import android.graphics.Color;
6 5 import android.graphics.ColorFilter;
7 6 import android.graphics.Paint;
8 7 import android.graphics.Path;
9 8 import android.graphics.PixelFormat;
10   -import android.graphics.PorterDuff;
11   -import android.graphics.PorterDuffXfermode;
12 9 import android.graphics.Rect;
13   -import android.graphics.Xfermode;
14 10 import android.graphics.drawable.ColorDrawable;
15   -import android.support.annotation.ColorInt;
16   -import android.support.v4.content.ContextCompat;
  11 +import androidx.annotation.ColorInt;
  12 +import androidx.core.content.ContextCompat;
17 13 import android.view.Gravity;
18 14  
19 15 /**
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/popmenu/PopMenu.java
  View file @c016232
... ... @@ -10,14 +10,12 @@ import android.graphics.RectF;
10 10 import android.graphics.drawable.BitmapDrawable;
11 11 import android.graphics.drawable.GradientDrawable;
12 12 import android.os.Build;
13   -import android.support.annotation.ColorInt;
14   -import android.support.annotation.DimenRes;
15   -import android.support.annotation.NonNull;
16   -import android.support.design.widget.BottomSheetDialog;
17   -import android.support.v7.widget.LinearLayoutManager;
18   -import android.support.v7.widget.RecyclerView;
  13 +import androidx.annotation.ColorInt;
  14 +import androidx.annotation.DimenRes;
  15 +import androidx.annotation.NonNull;
  16 +import androidx.recyclerview.widget.LinearLayoutManager;
  17 +import androidx.recyclerview.widget.RecyclerView;
19 18 import android.util.DisplayMetrics;
20   -import android.util.Log;
21 19 import android.view.Gravity;
22 20 import android.view.View;
23 21 import android.view.ViewGroup;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/popmenu/PopMenuAdapter.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu;
2 2  
3 3 import android.content.Context;
4   -import android.databinding.DataBindingUtil;
5   -import android.support.annotation.NonNull;
6   -import android.support.v4.content.ContextCompat;
7   -import android.support.v7.widget.RecyclerView;
  4 +import androidx.databinding.DataBindingUtil;
  5 +import androidx.annotation.NonNull;
  6 +import androidx.core.content.ContextCompat;
  7 +import androidx.recyclerview.widget.RecyclerView;
8 8 import android.text.TextUtils;
9 9 import android.view.LayoutInflater;
10 10 import android.view.View;
... ... @@ -13,7 +13,6 @@ import android.view.ViewGroup;
13 13 import com.cnlive.strike.application.GlideApp;
14 14 import com.cnlive.strike.xiaojiaspeaker.R;
15 15 import com.cnlive.strike.xiaojiaspeaker.databinding.PopItemMenuBinding;
16   -import com.cnlive.strike.xiaojiaspeaker.ui.widget.popmenu.PopMenuInfo;
17 16  
18 17 import java.util.List;
19 18  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/switchbutton/SwitchButton.java
  View file @c016232
... ... @@ -15,7 +15,7 @@ import android.graphics.drawable.Drawable;
15 15 import android.graphics.drawable.StateListDrawable;
16 16 import android.os.Parcel;
17 17 import android.os.Parcelable;
18   -import android.support.v4.content.ContextCompat;
  18 +import androidx.core.content.ContextCompat;
19 19 import android.text.Layout;
20 20 import android.text.StaticLayout;
21 21 import android.text.TextPaint;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/EventBusUtil.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util;
2 2  
3 3 import android.app.Activity;
4   -import android.support.v4.app.Fragment;
  4 +import androidx.fragment.app.Fragment;
5 5  
6 6 import org.greenrobot.eventbus.EventBus;
7 7  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/lib_permisshelper/PermissionsUtils.java
  View file @c016232
... ... @@ -8,9 +8,9 @@ import android.content.pm.PackageManager;
8 8 import android.graphics.Color;
9 9 import android.net.Uri;
10 10 import android.os.Build;
11   -import android.support.annotation.NonNull;
12   -import android.support.v4.app.ActivityCompat;
13   -import android.support.v4.app.Fragment;
  11 +import androidx.annotation.NonNull;
  12 +import androidx.core.app.ActivityCompat;
  13 +import androidx.fragment.app.Fragment;
14 14 import android.text.Spannable;
15 15 import android.text.SpannableStringBuilder;
16 16 import android.text.style.ForegroundColorSpan;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/subutil/util/DangerousUtils.java
  View file @c016232
... ... @@ -5,7 +5,7 @@ import android.content.Context;
5 5 import android.content.Intent;
6 6 import android.os.Build;
7 7 import android.os.PowerManager;
8   -import android.support.annotation.RequiresPermission;
  8 +import androidx.annotation.RequiresPermission;
9 9 import android.telephony.SmsManager;
10 10 import android.telephony.TelephonyManager;
11 11 import android.text.TextUtils;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/subutil/util/LocationUtils.java
  View file @c016232
... ... @@ -11,7 +11,7 @@ import android.location.LocationManager;
11 11 import android.location.LocationProvider;
12 12 import android.os.Bundle;
13 13 import android.provider.Settings;
14   -import android.support.annotation.RequiresPermission;
  14 +import androidx.annotation.RequiresPermission;
15 15 import android.util.Log;
16 16  
17 17  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/subutil/util/PinyinUtils.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.subutil.util;
2 2  
3   -import android.support.v4.util.SimpleArrayMap;
  3 +import androidx.collection.SimpleArrayMap;
4 4  
5 5 /**
6 6 * <pre>
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/subutil/util/http/ExecutorFactory.java
  View file @c016232
... ... @@ -2,7 +2,7 @@ package com.cnlive.strike.xiaojiaspeaker.util.subutil.util.http;
2 2  
3 3 import android.os.Handler;
4 4 import android.os.Looper;
5   -import android.support.annotation.NonNull;
  5 +import androidx.annotation.NonNull;
6 6  
7 7 import java.util.concurrent.Executor;
8 8 import java.util.concurrent.LinkedBlockingQueue;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/subutil/util/http/HttpUtils.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.subutil.util.http;
2 2  
3 3 import android.accounts.NetworkErrorException;
4   -import android.support.annotation.NonNull;
  4 +import androidx.annotation.NonNull;
5 5  
6 6 import java.io.BufferedOutputStream;
7 7 import java.io.ByteArrayOutputStream;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/subutil/util/http/Request.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.subutil.util.http;
2 2  
3   -import android.support.annotation.NonNull;
  3 +import androidx.annotation.NonNull;
4 4  
5 5 import java.io.BufferedInputStream;
6 6 import java.io.ByteArrayInputStream;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/subutil/util/http/SSLConfig.java
  View file @c016232
... ... @@ -2,7 +2,7 @@ package com.cnlive.strike.xiaojiaspeaker.util.subutil.util.http;
2 2  
3 3 import android.annotation.SuppressLint;
4 4 import android.os.Build;
5   -import android.support.annotation.NonNull;
  5 +import androidx.annotation.NonNull;
6 6  
7 7 import java.io.IOException;
8 8 import java.net.InetAddress;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/constant/MemoryConstants.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.utilcode.constant;
2 2  
3   -import android.support.annotation.IntDef;
  3 +import androidx.annotation.IntDef;
4 4  
5 5 import java.lang.annotation.Retention;
6 6 import java.lang.annotation.RetentionPolicy;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/constant/PermissionConstants.java
  View file @c016232
... ... @@ -4,7 +4,7 @@ import android.Manifest;
4 4 import android.Manifest.permission;
5 5 import android.annotation.SuppressLint;
6 6 import android.os.Build;
7   -import android.support.annotation.StringDef;
  7 +import androidx.annotation.StringDef;
8 8  
9 9 import java.lang.annotation.Retention;
10 10 import java.lang.annotation.RetentionPolicy;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/constant/TimeConstants.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.utilcode.constant;
2 2  
3   -import android.support.annotation.IntDef;
  3 +import androidx.annotation.IntDef;
4 4  
5 5 import java.lang.annotation.Retention;
6 6 import java.lang.annotation.RetentionPolicy;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/ActivityUtils.java
  View file @c016232
... ... @@ -10,12 +10,12 @@ import android.content.pm.ResolveInfo;
10 10 import android.graphics.drawable.Drawable;
11 11 import android.os.Build;
12 12 import android.os.Bundle;
13   -import android.support.annotation.AnimRes;
14   -import android.support.annotation.NonNull;
15   -import android.support.annotation.Nullable;
16   -import android.support.v4.app.ActivityOptionsCompat;
17   -import android.support.v4.app.Fragment;
18   -import android.support.v4.util.Pair;
  13 +import androidx.annotation.AnimRes;
  14 +import androidx.annotation.NonNull;
  15 +import androidx.annotation.Nullable;
  16 +import androidx.core.app.ActivityOptionsCompat;
  17 +import androidx.fragment.app.Fragment;
  18 +import androidx.core.util.Pair;
19 19 import android.text.TextUtils;
20 20 import android.util.Log;
21 21 import android.view.View;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/ApiUtils.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.utilcode.util;
2 2  
3   -import android.support.annotation.NonNull;
  3 +import androidx.annotation.NonNull;
4 4 import android.util.Log;
5 5  
6 6 import java.lang.annotation.ElementType;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/AppUtils.java
  View file @c016232
... ... @@ -18,8 +18,8 @@ import android.graphics.drawable.Drawable;
18 18 import android.net.Uri;
19 19 import android.os.Build;
20 20 import android.provider.Settings;
21   -import android.support.annotation.NonNull;
22   -import android.support.v4.content.FileProvider;
  21 +import androidx.annotation.NonNull;
  22 +import androidx.core.content.FileProvider;
23 23 import android.util.Log;
24 24  
25 25 import java.io.File;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/BarUtils.java
  View file @c016232
... ... @@ -8,11 +8,11 @@ import android.content.res.Resources;
8 8 import android.graphics.Color;
9 9 import android.graphics.Point;
10 10 import android.os.Build;
11   -import android.support.annotation.ColorInt;
12   -import android.support.annotation.NonNull;
13   -import android.support.annotation.RequiresApi;
14   -import android.support.annotation.RequiresPermission;
15   -import android.support.v4.widget.DrawerLayout;
  11 +import androidx.annotation.ColorInt;
  12 +import androidx.annotation.NonNull;
  13 +import androidx.annotation.RequiresApi;
  14 +import androidx.annotation.RequiresPermission;
  15 +import androidx.drawerlayout.widget.DrawerLayout;
16 16 import android.util.Log;
17 17 import android.util.TypedValue;
18 18 import android.view.Display;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/BrightnessUtils.java
  View file @c016232
... ... @@ -2,8 +2,8 @@ package com.cnlive.strike.xiaojiaspeaker.util.utilcode.util;
2 2  
3 3 import android.content.ContentResolver;
4 4 import android.provider.Settings;
5   -import android.support.annotation.IntRange;
6   -import android.support.annotation.NonNull;
  5 +import androidx.annotation.IntRange;
  6 +import androidx.annotation.NonNull;
7 7 import android.view.Window;
8 8 import android.view.WindowManager;
9 9  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/CacheDiskStaticUtils.java
  View file @c016232
... ... @@ -3,7 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.util.utilcode.util;
3 3 import android.graphics.Bitmap;
4 4 import android.graphics.drawable.Drawable;
5 5 import android.os.Parcelable;
6   -import android.support.annotation.NonNull;
  6 +import androidx.annotation.NonNull;
7 7  
8 8 import org.json.JSONArray;
9 9 import org.json.JSONObject;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/CacheDiskUtils.java
  View file @c016232
... ... @@ -8,7 +8,7 @@ import android.graphics.drawable.BitmapDrawable;
8 8 import android.graphics.drawable.Drawable;
9 9 import android.os.Parcel;
10 10 import android.os.Parcelable;
11   -import android.support.annotation.NonNull;
  11 +import androidx.annotation.NonNull;
12 12 import android.util.Log;
13 13  
14 14  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/CacheDoubleStaticUtils.java
  View file @c016232
... ... @@ -3,7 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.util.utilcode.util;
3 3 import android.graphics.Bitmap;
4 4 import android.graphics.drawable.Drawable;
5 5 import android.os.Parcelable;
6   -import android.support.annotation.NonNull;
  6 +import androidx.annotation.NonNull;
7 7  
8 8 import org.json.JSONArray;
9 9 import org.json.JSONObject;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/CacheDoubleUtils.java
  View file @c016232
... ... @@ -3,7 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.util.utilcode.util;
3 3 import android.graphics.Bitmap;
4 4 import android.graphics.drawable.Drawable;
5 5 import android.os.Parcelable;
6   -import android.support.annotation.NonNull;
  6 +import androidx.annotation.NonNull;
7 7  
8 8  
9 9 import com.cnlive.strike.xiaojiaspeaker.util.utilcode.constant.CacheConstants;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/CacheMemoryStaticUtils.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.utilcode.util;
2 2  
3   -import android.support.annotation.NonNull;
  3 +import androidx.annotation.NonNull;
4 4  
5 5 /**
6 6 * <pre>
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/CacheMemoryUtils.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.utilcode.util;
2 2  
3   -import android.support.annotation.NonNull;
4   -import android.support.v4.util.LruCache;
  3 +import androidx.annotation.NonNull;
  4 +import androidx.collection.LruCache;
5 5  
6 6  
7 7 import com.cnlive.strike.xiaojiaspeaker.util.utilcode.constant.CacheConstants;
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/ClickUtils.java
  View file @c016232
1 1 package com.cnlive.strike.xiaojiaspeaker.util.utilcode.util;
2 2  
3   -import android.support.annotation.IntRange;
4   -import android.support.annotation.NonNull;
  3 +import androidx.annotation.IntRange;
  4 +import androidx.annotation.NonNull;
5 5 import android.view.MotionEvent;
6 6 import android.view.View;
7 7  
... ...