更换APP图标

YFDXJ/app/build.gradle

@@ -1,4 +1,7 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
 
 android {
     namespace 'com.bjzc.yfdxj'
@@ -15,9 +18,6 @@ android {
         resValue "string", "authorities", applicationId
         resourceConfigurations += ['zh', 'en', 'hdpi']
     }
-    buildFeatures {
-        buildConfig = true
-    }
     signingConfigs {
         release {
             keyAlias 'key0'
@@ -32,7 +32,6 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            buildConfigField "boolean", "LOG_ERROR", "true"
         }
         release {
             lintOptions {
@@ -43,7 +42,6 @@ android {
             zipAlignEnabled true // 对齐zip
             debuggable false // 是否debug
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            buildConfigField "boolean", "LOG_ERROR", "false"
             signingConfig signingConfigs.release // 打包签名信息
         }
     }
@@ -62,14 +60,35 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'com.zhy:autolayout:1.4.5'
-    implementation 'com.yolanda.nohttp:nohttp:1.0.5'
+
+//    implementation 'com.zhy:autolayout:1.4.5'
+//    implementation 'com.yolanda.nohttp:nohttp:1.0.5'
+//    implementation 'com.zhihu.android:matisse:0.5.3-beta3'
+//    implementation 'org.litepal.android:core:1.5.1'
+//    //图片压缩
+//    implementation 'top.zibin:Luban:1.1.8'
+//    implementation 'id.zelory:compressor:1.0.3'
+
+
+    //第三方库自动布局
+    implementation project(':autolayout')
+    //网络请求模块
+    implementation project(':nohttp')
+    //第三方数据库封装，巡检，点检用到
+    implementation project(':litepal')
+    //图片展示模块
+    implementation project(':matisse')
+    //图片展示模块
+    implementation project(':luban')
+
+
+
+    implementation 'com.google.android.material:material:1.2.1'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'org.litepal.android:core:1.5.1'
+
     implementation 'com.github.huangyanbin:SmartTable:2.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'de.hdodenhof:circleimageview:3.1.0'
@@ -81,10 +100,8 @@ dependencies {
     implementation files('libs/rinsunMT.jar')
     implementation 'org.greenrobot:eventbus:3.0.0'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    implementation 'com.zhihu.android:matisse:0.5.3-beta3'
-    //图片压缩
-    implementation 'top.zibin:Luban:1.1.8'
-    implementation 'id.zelory:compressor:1.0.3'
+
+
     //第三方工具类
     implementation 'cn.hutool:hutool-all:5.8.5'
     //mqtt

YFDXJ/app/src/main/AndroidManifest.xml

@@ -68,10 +68,10 @@
         android:allowBackup="false"
         android:fullBackupContent="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
-        android:icon="@mipmap/logo1"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/logo1"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:screenOrientation="portrait"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"

YFDXJ/app/src/main/java/com/bjzc/yfdxj/Listener/GlideEngine.java

@@ -155,7 +155,7 @@ public class GlideEngine implements ImageEngine {
                 .override(180, 180)
                 .centerCrop()
                 .sizeMultiplier(0.5f)
-                .apply(new RequestOptions().placeholder(R.drawable.picture_image_placeholder))
+                .apply(new RequestOptions().placeholder(com.luck.picture.lib.R.drawable.picture_image_placeholder))
                 .into(new BitmapImageViewTarget(imageView) {
                     @Override
                     protected void setResource(Bitmap resource) {
@@ -198,7 +198,7 @@ public class GlideEngine implements ImageEngine {
                 .load(url)
                 .override(200, 200)
                 .centerCrop()
-                .apply(new RequestOptions().placeholder(R.drawable.picture_image_placeholder))
+                .apply(new RequestOptions().placeholder(com.luck.picture.lib.R.drawable.picture_image_placeholder))
                 .into(imageView);
     }
 

YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/CheckVibrationActivity.java

@@ -199,48 +199,81 @@ public class CheckVibrationActivity extends BaseActivity3 {
         rgLevel.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                switch (i){
-                    case R.id.rb1:
+                if(i==R.id.rb1){
                     level = 0;
                     if(isEdit){
                         demo();//测量
                     }
-                        break;
-                    case R.id.rb2:
+                }
+                if(i==R.id.rb2){
                     level = 1;
                     if(isEdit){
                         demo();//测量
                     }
-                        break;
                 }
+//                switch (i){
+//                    case R.id.rb1:
+//                        level = 0;
+//                        if(isEdit){
+//                            demo();//测量
+//                        }
+//                        break;
+//                    case R.id.rb2:
+//                        level = 1;
+//                        if(isEdit){
+//                            demo();//测量
+//                        }
+//                        break;
+//                }
             }
         });
         rgType.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                switch (i){
-                    case R.id.rb3:
+                if(i==R.id.rb3){
                     checkVibrationType = MTnativeInterface.CMD_VIBD_R;
                     etRealTitle.setText("实际值(mm):");
                     if(isEdit){
                         demo();//测量
                     }
-                        break;
-                    case R.id.rb4:
+                }
+                if(i==R.id.rb4){
                     checkVibrationType = MTnativeInterface.CMD_VIBV_R;
                     etRealTitle.setText("实际值(mm/s):");
                     if(isEdit){
                         demo();//测量
                     }
-                        break;
-                    case R.id.rb5:
+                }
+                if(i==R.id.rb5){
                     checkVibrationType = MTnativeInterface.CMD_VIBA_R;
                     etRealTitle.setText("实际值(mm/(s^2)):");
                     if(isEdit){
                         demo();//测量
                     }
-                        break;
                 }
+//                switch (i){
+//                    case R.id.rb3:
+//                        checkVibrationType = MTnativeInterface.CMD_VIBD_R;
+//                        etRealTitle.setText("实际值(mm):");
+//                        if(isEdit){
+//                            demo();//测量
+//                        }
+//                        break;
+//                    case R.id.rb4:
+//                        checkVibrationType = MTnativeInterface.CMD_VIBV_R;
+//                        etRealTitle.setText("实际值(mm/s):");
+//                        if(isEdit){
+//                            demo();//测量
+//                        }
+//                        break;
+//                    case R.id.rb5:
+//                        checkVibrationType = MTnativeInterface.CMD_VIBA_R;
+//                        etRealTitle.setText("实际值(mm/(s^2)):");
+//                        if(isEdit){
+//                            demo();//测量
+//                        }
+//                        break;
+//                }
             }
         });
         noticeValue.setOnLongClickListener(new View.OnLongClickListener() {

YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java

@@ -19,7 +19,7 @@ import android.widget.TextView;
 import com.azhon.appupdate.listener.OnButtonClickListener;
 import com.azhon.appupdate.listener.OnDownloadListener;
 import com.azhon.appupdate.manager.DownloadManager;
-import com.bjzc.yfdxj.BuildConfig;
+
 import com.bjzc.yfdxj.base.BaseCallBackNoProgress;
 import com.bjzc.yfdxj.R;
 import com.bjzc.yfdxj.base.BaseActivity;
@@ -181,7 +181,7 @@ public class LoginActivity extends BaseActivity {
             }
         }
 
-        if (BuildConfig.LOG_ERROR) {
+        if (isApkInDebug(context)) {
             etUse.setText("161619");
             etPwd.setText("lgy12345");
 

YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java

@@ -48,6 +48,7 @@ import com.bjzc.yfdxj.utils.FlashUtil;
 import com.bjzc.yfdxj.utils.GsonUtils;
 import com.bjzc.yfdxj.utils.HttpUtils;
 import com.bjzc.yfdxj.utils.MqttSSLPublishServer;
+import com.bjzc.yfdxj.utils.NetworkUtil;
 import com.bjzc.yfdxj.utils.OAToolbar;
 import com.bjzc.yfdxj.utils.RSAAndroid;
 import com.bjzc.yfdxj.utils.SPUtils;
@@ -163,10 +164,12 @@ public class MainActivity extends BaseActivity3 {
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);//设置透明状态栏
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);//设置透明导航栏
         StatusBarUtil.transparencyBar(MainActivity.this);//设置透明状态栏
-        //当选择外网时才会开启一键招回
+        //当选择外网时,并且网络连接不是wifi才会开启一键招回
         if(Contans.IP.equals(Contans.network_type_extranet)){
+            if(!NetworkUtil.isWifiNetWorkStatus(context)){
                 initMqtt();
             }
+        }
         btnLogout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -581,7 +584,9 @@ public class MainActivity extends BaseActivity3 {
     @Override
     protected void onResume() {
         super.onResume();
+
         if(Contans.IP.equals(Contans.network_type_extranet)){
+            if(!NetworkUtil.isWifiNetWorkStatus(context)){
                 if(mqttPublishServer==null){
                     mqttPublishServer = new MqttSSLPublishServer(this);
                 }
@@ -600,6 +605,7 @@ public class MainActivity extends BaseActivity3 {
                 }
             }
         }
+    }
 
     @Override
     public void onDestroy() {

YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/regular/CheckVibrationDqgzActivity.java

@@ -189,39 +189,69 @@ public class CheckVibrationDqgzActivity extends BaseActivity3 {
         rgLevel.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                switch (i) {
-                    case R.id.rb1:
+                if(i==R.id.rb1){
                     level = 0;
                     demo();//测量
-                        break;
-                    case R.id.rb2:
+                }
+                if(i==R.id.rb2){
                     level = 1;
                     demo();//测量
-                        break;
                 }
+//                switch (i) {
+//                    case R.id.rb1:
+//                        level = 0;
+//                        demo();//测量
+//                        break;
+//                    case R.id.rb2:
+//                        level = 1;
+//                        demo();//测量
+//                        break;
+//                }
             }
         });
         rgType.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                switch (i) {
-                    case R.id.rb3:
+                if(i==R.id.rb3){
                     checkVibrationType = MTnativeInterface.CMD_VIBD_R;
                     etRealTitle.setText("实际值(mm):");
+                    if(isEdit){
                         demo();//测量
-                        break;
-                    case R.id.rb4:
+                    }
+                }
+                if(i==R.id.rb4){
                     checkVibrationType = MTnativeInterface.CMD_VIBV_R;
                     etRealTitle.setText("实际值(mm/s):");
+                    if(isEdit){
                         demo();//测量
-                        break;
-                    case R.id.rb5:
+                    }
+                }
+                if(i==R.id.rb5){
                     checkVibrationType = MTnativeInterface.CMD_VIBA_R;
                     etRealTitle.setText("实际值(mm/(s^2)):");
+                    if(isEdit){
                         demo();//测量
-                        break;
                     }
                 }
+
+//                switch (i) {
+//                    case R.id.rb3:
+//                        checkVibrationType = MTnativeInterface.CMD_VIBD_R;
+//                        etRealTitle.setText("实际值(mm):");
+//                        demo();//测量
+//                        break;
+//                    case R.id.rb4:
+//                        checkVibrationType = MTnativeInterface.CMD_VIBV_R;
+//                        etRealTitle.setText("实际值(mm/s):");
+//                        demo();//测量
+//                        break;
+//                    case R.id.rb5:
+//                        checkVibrationType = MTnativeInterface.CMD_VIBA_R;
+//                        etRealTitle.setText("实际值(mm/(s^2)):");
+//                        demo();//测量
+//                        break;
+//                }
+            }
         });
         noticeValue.setOnLongClickListener(new View.OnLongClickListener() {
             @Override