增加接单语音播报，studio升级为3.1.0

IDCardLib/build.gradle

@@ -27,12 +27,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    testCompile 'junit:junit:4.12'
-    implementation files('libs/licensemanager-v1.1.jar')
-    implementation files('libs/livenessdetection-proguard-2.4.5.jar')
+    api 'com.android.support:appcompat-v7:27.1.1'
+    testImplementation 'junit:junit:4.12'
+    api files('libs/licensemanager-v1.1.jar')
+    api files('libs/livenessdetection-proguard-2.4.5.jar')
 }

app/build.gradle

@@ -86,20 +86,23 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
     //ARouter
     annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
 
     if (isMessageModule.toBoolean()) {
-        compile project(':messageCenter')
+        api project(':messageCenter')
     }
     if (isUserModule.toBoolean()) {
-        compile project(':userCenter')
+        api project(':userCenter')
     }
     if (isOrderModule.toBoolean()) {
-        compile project(':orderCenter')
+        api project(':orderCenter')
     }
+//    if (isManagerModule.toBoolean()) {
+//        api project(':managerCenter')
+//    }
 //    compile(name: 'orderCenter-debug', ext: 'aar')
 //    compile(name: 'userCenter-debug', ext: 'aar')
 //    compile(name: 'messageCenter-debug', ext: 'aar')

app/proguard-rules.pro

@@ -110,7 +110,6 @@
        public void openFileChooser(...);
 }
 
-
 #-------------------------------------------定制化区域----------------------------------------------
 #---------------------------------1.实体类---------------------------------
 -keep public class * extends com.dayu.base.ui.presenter.BasePresenter
@@ -190,6 +189,7 @@ public static java.lang.String TABLENAME;
 
 #环信
 -keep class com.hyphenate.** {*;}
+-keep class com.superrtc.** {*;}
 -dontwarn  com.hyphenate.**
 
 #高德地图
@@ -236,7 +236,10 @@ public static final int *;
 -keep class * implements com.alibaba.android.arouter.facade.template.IProvider
 -dontwarn com.alibaba.**
 
-
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+-ignorewarnings
 
 #---------------------------------3.与js互相调用的类------------------------
 

app/src/main/java/com/dayu/bigfish/utils/HxManager.java

@@ -92,6 +92,7 @@ public class HxManager {
             @Override
             public void onMessageReceived(List<EMMessage> messages) {
                 //收到消息
+                boolean flag = false; //语音是否播报
                 for (EMMessage message : messages) {
                     String messagebody = message.getBody().toString();
                     String content = messagebody.substring(5, messagebody.length() - 1);
@@ -124,9 +125,10 @@ public class HxManager {
                         if (!(boolean) SPUtils.get(Constants.HX_STATE, true)) {
                             return;
                         }
-                        if (info.getCategory() == 1 && (info.getFunctionType() == 2)) {
+                        if (!flag && info.getCategory() == 1 && (info.getFunctionType() == 2)) {
                             MediaPlayer player = MediaPlayer.create(mContext, R.raw.new_order);
                             player.start();
+                            flag = true;
                         }
                         Intent intent = new Intent(mContext, MainActivity.class);
                         intent.putExtra(Constants.MESSAGE_INFO, info);
@@ -158,7 +160,7 @@ public class HxManager {
                         }
                         mCount++;
                         BadgeNumberManager.from(mContext).setBadgeNumber(mCount);
-                        BadgeNumberUtils.setBadgeNumberXiaoMi(notification, messages.size());
+                        BadgeNumberUtils.setBadgeNumberXiaoMi(notification, mCount);
                     }
                 }
             }
@@ -207,7 +209,7 @@ public class HxManager {
                 Observable.timer(1, TimeUnit.MILLISECONDS)
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(l -> {
-                            ToastUtils.showShortToast("您的账号在另一台设备中登录");
+                            ToastUtils.showShortToast(R.string.account_notice);
                             EMClient.getInstance().logout(true);
                             UserManager.getInstance().clearUserInfo();
                             AppManager.getInstance().finishAllActivity();

baseSDK/build.gradle

@@ -40,35 +40,35 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    api fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:design:27.1.1'
+    testImplementation 'junit:junit:4.12'
+    api 'com.android.support:design:27.1.1'
     //mutidex
-    compile 'com.android.support:multidex:1.0.3'
+    api 'com.android.support:multidex:1.0.3'
     //eventBus
-    compile 'org.greenrobot:eventbus:3.1.1'
+    api 'org.greenrobot:eventbus:3.1.1'
     //retrofit
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    api 'com.squareup.retrofit2:retrofit:2.4.0'
+    api 'com.squareup.retrofit2:converter-gson:2.4.0'
+    api 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
     //图片选择
-    compile 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5'
+    api 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5'
     //ARouter
-    compile "com.alibaba:arouter-api:$arouter_api_version"
+    api "com.alibaba:arouter-api:$arouter_api_version"
     //greendao数据库
-    compile 'org.greenrobot:greendao:3.2.0'
+    api 'org.greenrobot:greendao:3.2.0'
     //选择器
 //    compile 'com.contrarywind:Android-PickerView:3.2.7'
     //jsbridge
-    compile 'com.github.lzyzsd:jsbridge:1.0.4'
+    api 'com.github.lzyzsd:jsbridge:1.0.4'
     //zxing
-    compile 'com.google.zxing:core:3.3.2'
-    compile 'com.journeyapps:zxing-android-embedded:3.5.0'
+    api 'com.google.zxing:core:3.3.2'
+    api 'com.journeyapps:zxing-android-embedded:3.5.0'
 
-    compile project(':locationComponent')
-    compile project(':pickerview')
+    api project(':locationComponent')
+    api project(':pickerview')
 
 }

baseSDK/src/main/res/values/strings.xml

@@ -112,6 +112,7 @@
     <string name="enviroment_debug">测试环境%1$s</string>
     <string name="enviroment_uat">UAT环境%1$s</string>
     <string name="enviroment_demons">演示环境%1$s</string>
+    <string name="account_notice">您的账号在另一台设备中登录</string>
     <!--提现账户-->
     <string name="title_withdrawals">提现账户</string>
     <string name="alipay_account">支付宝账号</string>

build.gradle

@@ -7,13 +7,12 @@ buildscript {
     ext.target_sdk_version = 23
     ext.version_code = 15
     ext.verson_name = "1.9.2"
-    ext.gradle_version = '3.0.1'
+    ext.gradle_version = '3.1.4'
     ext.isReleaseMinify = true
     ext.isDebugMinify = true
     ext.arouter_api_version = '1.3.1'
     ext.arouter_compiler_version = '1.1.4'
 
-
     repositories {
         jcenter()
         google()

gradle.properties

@@ -5,6 +5,8 @@ isUserModule=true
 isMessageModule=true
 ##工单模块
 isOrderModule=true
+##店长模块
+isManagerModule=true
 ##maven依赖
 mavenMode=false
 BASE_URL=http://47.94.101.239:3112

locationComponent/build.gradle

@@ -25,9 +25,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    api fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation files('libs/Amap_2DMap_V5.2.0_20170627.jar')
+    api files('libs/Amap_2DMap_V5.2.0_20170627.jar')
 }

messageCenter/build.gradle

@@ -56,9 +56,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
     //ARouter
     annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
-    compile project(':provider')
+    api project(':provider')
 }

orderCenter/build.gradle

@@ -63,10 +63,10 @@ greendao {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
     //ARouter
     annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
-    compile project(':provider')
-    compile project(':IDCardLib')
+    api project(':provider')
+    api project(':IDCardLib')
 }

orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java

@@ -85,7 +85,6 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
         }
         if (TextUtils.isEmpty(mHour.get()) || TextUtils.isEmpty(mDay.get())) {
             mView.showToast(R.string.input_day_time);
-            return;
         } else {
             ProgressUtil.setCanDismiss(false);
             mView.showDialog();

pickerview/build.gradle

@@ -43,6 +43,6 @@ allprojects {
 //}
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(path: ':wheelview')
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api project(path: ':wheelview')
 }
\ No newline at end of file

provider/build.gradle

@@ -26,7 +26,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':baseSDK')
+    api project(':baseSDK')
 }

userCenter/build.gradle

@@ -56,10 +56,10 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 
     //ARouter
     annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
-    compile project(':provider')
-    compile project(':IDCardLib')
+    api project(':provider')
+    api project(':IDCardLib')
 }

wheelview/build.gradle

@@ -42,6 +42,6 @@ allprojects {
 //}
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    api fileTree(include: ['*.jar'], dir: 'libs')
 
 }
\ No newline at end of file