sdk up to 36 适配安卓16

.gitignore

@@ -32,4 +32,23 @@ google-services.json
 
 # Android Profiling
 *.hprof
+/YFDXJ/.gradle
+/YFDXJ/.gradle/*
+/YFDXJ/.idea
+/YFDXJ/.idea/*
+/YFDXJ/app/build
+/YFDXJ/app/build/*
+/YFDXJ/app/.gradle
+/YFDXJ/app/.gradle/*
+
+YFDXJ/.gradle
+YFDXJ/.gradle/*
+YFDXJ/.idea
+YFDXJ/.idea/*
+YFDXJ/app/build
+YFDXJ/app/build/*
+YFDXJ/app/.gradle
+YFDXJ/app/.gradle/*
+
+
 

YFDXJ/app/build.gradle

@@ -1,23 +1,26 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
     namespace 'com.bjzc.yfdxj'
-    compileSdk 34
+    compileSdk 36
     defaultConfig {
         applicationId "com.bjzc.yfdxj"
         minSdk 24
-        targetSdk 34
-        versionCode 19
-        versionName "1.1.8"
+        targetSdk 36
+        versionCode 20
+        versionName "1.1.9"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装
         resValue "string", "authorities", applicationId
         resourceConfigurations += ['zh', 'en', 'hdpi']
     }
+    buildFeatures {
+        viewBinding = true
+    }
     signingConfigs {
         release {
             keyAlias 'key0'
@@ -45,75 +48,81 @@ android {
             signingConfig signingConfigs.release // 打包签名信息
         }
     }
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ['libs']
-        }
-    }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
 
 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.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 libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    implementation libs.androidx.activity
+    implementation libs.androidx.constraintlayout
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 
 
-    //第三方库自动布局
-    implementation project(':autolayout')
     //网络请求模块
     implementation project(':nohttp')
+    //第三方库自动布局
+    implementation project(':autolayout')
     //第三方数据库封装，巡检，点检用到
     implementation project(':litepal')
     //图片展示模块
     implementation project(':matisse')
-    //图片展示模块
-    implementation project(':luban')
 
 
+    implementation libs.logging.interceptor
+    implementation libs.retrofit
+    implementation libs.com.squareup.retrofit2.converter.gson5
 
-    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 libs.smarttable
+    implementation libs.androidx.multidex
+    implementation libs.androidx.recyclerview
+    implementation libs.circleimageview
+    //implementation libs.picture.library
+    implementation libs.photoviewer
+    implementation libs.appupdate
+    implementation libs.crashreport
+    implementation libs.xui
+//    implementation files('libs/rinsunMT.jar')
+    implementation libs.eventbus
 
-    implementation 'com.github.huangyanbin:SmartTable:2.2.0'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.9'
-    implementation 'com.github.wanglu1209:PhotoViewer:0.50'
-    implementation 'io.github.azhon:appupdate:4.2.6'
-    implementation 'com.tencent.bugly:crashreport:3.2.1'
-    implementation 'com.github.xuexiangjys:XUI:1.1.4'
-    implementation files('libs/rinsunMT.jar')
-    implementation 'org.greenrobot:eventbus:3.0.0'
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    //第三方库图片异步加载
+    implementation libs.glide
+    implementation libs.annotation
+    implementation libs.androidx.lifecycle.livedata.ktx
+    implementation libs.androidx.lifecycle.viewmodel.ktx
+    annotationProcessor libs.compiler
 
+    //第三方库图片选择器
+    // PictureSelector basic (Necessary)
+    implementation libs.pictureselector
+    // image compress library (Not necessary)
+    implementation libs.compress
+    // uCrop library (Not necessary)
+    implementation libs.ucrop
+    // simple camerax library (Not necessary)
+    implementation libs.camerax
 
     //第三方工具类
-    implementation 'cn.hutool:hutool-all:5.8.5'
+    implementation libs.cn.hutool.all
     //mqtt
-    implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.4'
-    implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
-    implementation 'commons-codec:commons-codec:1.15'
+    implementation libs.paho.org.eclipse.paho.client.mqttv3
+    implementation libs.paho.org.eclipse.paho.android.service
+    implementation libs.bcpkix.jdk15on
+    implementation libs.commons.codec.commons.codec4
     //本地广播
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation libs.androidx.localbroadcastmanager.localbroadcastmanager
+    //二维码扫描
+    implementation libs.barcode.scanning
+
     configurations {
         all*.exclude group: 'com.google.code.gson'
     }

YFDXJ/app/src/androidTest/java/com/bjzc/yfdxj/ExampleInstrumentedTest.java

@@ -19,8 +19,8 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() throws Exception {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+        //Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.rehome.bhdxj", appContext.getPackageName());
+        //assertEquals("com.rehome.bhdxj", appContext.getPackageName());
     }
 }

YFDXJ/app/src/androidTest/java/com/rehome/yfdxj/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.rehome.yfdxj;
-
-import android.content.Context;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.rehome.bhdxj", appContext.getPackageName());
-    }
-}

YFDXJ/app/src/main/AndroidManifest.xml

@@ -4,28 +4,29 @@
 
     <uses-feature
         android:name="android.hardware.bluetooth_le"
-        android:required="true" />
-    <!--Android 12 中的新蓝牙权限开始-->
+        android:required="true" /> <!-- Android 12 中的新蓝牙权限开始 -->
     <!-- Request legacy Bluetooth permissions on older devices. -->
-    <uses-permission android:name="android.permission.BLUETOOTH"
+    <uses-permission
+        android:name="android.permission.BLUETOOTH"
         android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_ADMIN"
         android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <!--Android 12 中的新蓝牙权限结束-->
-
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- Android 12 中的新蓝牙权限结束 -->
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -53,6 +54,7 @@
     <uses-permission
         android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
         tools:ignore="ProtectedPermissions" />
+
     <uses-feature
         android:name="android.hardware.nfc"
         android:required="true" />
@@ -62,12 +64,11 @@
 
     <permission-group android:name="${applicationId}.andpermission" />
 
-
     <application
-        android:name="com.bjzc.yfdxj.MyApplication"
+        android:name=".MyApplication"
         android:allowBackup="false"
-        android:fullBackupContent="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -76,253 +77,234 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning"
-        tools:targetApi="s"
-        tools:replace="android:allowBackup">
+        tools:replace="android:allowBackup"
+        tools:targetApi="s">
 
 
         <activity
-            android:name="com.bjzc.yfdxj.activity.LoginActivity"
+            android:name=".activity.LoginActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-
         <activity
-            android:name="com.bjzc.yfdxj.activity.MainActivity"
+            android:name=".activity.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
+<!--        <activity-->
+<!--            android:name=".activity.CustomDialogActivity"-->
+<!--            android:theme="@android:style/Theme.Dialog" />-->
         <activity
-            android:name="com.bjzc.yfdxj.activity.CustomDialogActivity"
+            android:name=".activity.MemberCallbackDialogActivity"
             android:theme="@android:style/Theme.Dialog" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.MemberCallbackDialogActivity"
-            android:theme="@android:style/Theme.Dialog"/>
-        <activity
-            android:name="com.bjzc.yfdxj.activity.TabMainActivity"
+            android:name=".activity.TabMainActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustPan" />
-
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.MainSbxdjglActivity"
+            android:name=".activity.sbxdj.MainSbxdjglActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.SxcdjActivity"
+            android:name=".activity.sbxdj.SxcdjActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.SbxdjcjsbActivity"
+            android:name=".activity.sbxdj.SbxdjcjsbActivity"
             android:windowSoftInputMode="stateHidden" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.SdjgzActivity"
+            android:name=".activity.sbxdj.SdjgzActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.YulActivity"
+            android:name=".activity.sbxdj.YulActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.Yul_SBActivity"
+            android:name=".activity.sbxdj.Yul_SBActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.ChangeYulActivity"
+            android:name=".activity.sbxdj.ChangeYulActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.SdjSbListActivity"
+            android:name=".activity.sbxdj.SdjSbListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.DjgwListActivity"
+            android:name=".activity.sbxdj.DjgwListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XscbglActivity"
+            android:name=".activity.sbxj.XscbglActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.YxrlinfoActivity"
+            android:name=".activity.sbxj.YxrlinfoActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.regular.RegularActivity"
+            android:name=".activity.regular.RegularActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.qfgd.TjqxdActivity"
+            android:name=".activity.qfgd.TjqxdActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.qfgd.ComfirmSblistActivity"
+            android:name=".activity.qfgd.ComfirmSblistActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.qfgd.ZRbzBmListActivity"
+            android:name=".activity.qfgd.ZRbzBmListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.qfgd.DeviceTreeActivity"
+            android:name=".activity.qfgd.DeviceTreeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.qfgd.SubDeviceTreeActivity"
+            android:name=".activity.qfgd.SubDeviceTreeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
-
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XsBackLogActivity"
+            android:name=".activity.sbxj.XsBackLogActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XscbqyWorkActivity"
+            android:name=".activity.sbxj.XscbqyWorkActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XscbqyActivity"
+            android:name=".activity.sbxj.XscbqyActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XscbqyWorkXsActivity"
+            android:name=".activity.sbxj.XscbqyWorkXsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XsHistoryActivity"
+            android:name=".activity.sbxj.XsHistoryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.NFCInfoActivity"
+            android:name=".activity.sbxj.NFCInfoActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XjMainActivity"
+            android:name=".activity.sbxj.XjMainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.SxgzActivity"
+            android:name=".activity.sbxj.SxgzActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.regular.DqgzUpAndDownActivity"
+            android:name=".activity.regular.DqgzUpAndDownActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.regular.DqgzMainActivity"
+            android:name=".activity.regular.DqgzMainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.regular.DqgzActivity"
+            android:name=".activity.regular.DqgzActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.SxSbListActivity"
+            android:name=".activity.sbxj.SxSbListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XjSbListActivity"
+            android:name=".activity.sbxj.XjSbListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XjYulActivity"
+            android:name=".activity.sbxj.XjYulActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.CheckedListActivity"
+            android:name=".activity.sbxj.CheckedListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.NoCheckedListActivity"
+            android:name=".activity.sbxj.NoCheckedListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.CheckedStatusListActivity"
+            android:name=".activity.sbxj.CheckedStatusListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XJStatisticsActivity"
+            android:name=".activity.sbxj.XJStatisticsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.XJStatisticsMyUploadActivity"
+            android:name=".activity.sbxj.XJStatisticsMyUploadActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxj.SbxjcjsbActivity"
+            android:name=".activity.sbxj.SbxjcjsbActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustPan" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.TipsActivity"
+            android:name=".activity.sbxdj.TipsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.DjMainActivity"
+            android:name=".activity.sbxdj.DjMainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.sbxdj.SbSelectActivity"
+            android:name=".activity.sbxdj.SbSelectActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
+<!--        <activity-->
+<!--            android:name=".base.MipcaActivityCapture"-->
+<!--            android:configChanges="keyboardHidden|orientation|screenSize"-->
+<!--            android:screenOrientation="portrait" />-->
         <activity
-            android:name="com.bjzc.yfdxj.base.MipcaActivityCapture"
+            android:name=".activity.QrCodeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.yhpc.YhpcDataListActivity"
+            android:name=".activity.yhpc.YhpcDataListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.yhpc.YhzgDataListActivity"
+            android:name=".activity.yhpc.YhzgDataListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.QxgdActivity"
+            android:name=".activity.QxgdActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.NfcinfoActivity"
+            android:name=".activity.NfcinfoActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.bleUtil.BlueTestInfoActivity"
+            android:name=".bleUtil.BlueTestInfoActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.UserChangeActivity"
+            android:name=".activity.UserChangeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.CheckTemperatureActivity"
+            android:name=".activity.regular.DqgzCheckActivity"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustPan" />
         <activity
-            android:name="com.bjzc.yfdxj.activity.CheckVibrationActivity"
-            android:launchMode="singleInstance"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustPan" />
-        <activity
-            android:name="com.bjzc.yfdxj.activity.regular.CheckTemperatureDqgzActivity"
-            android:launchMode="singleInstance"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustPan" />
-        <activity
-            android:name="com.bjzc.yfdxj.activity.regular.CheckVibrationDqgzActivity"
-            android:launchMode="singleInstance"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustPan" />
-        <activity
-            android:name="com.bjzc.yfdxj.activity.regular.DqgzCheckActivity"
-            android:launchMode="singleInstance"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustPan" />
-        <activity
-            android:name="com.bjzc.yfdxj.activity.qfgd.QfOptionActivity"
+            android:name=".activity.qfgd.QfOptionActivity"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustPan" />
@@ -345,8 +327,8 @@
             android:value="1280" />
 
         <service
-            android:name="com.bjzc.yfdxj.service.PushService"
+            android:name=".service.PushService"
             android:exported="false" />
-
     </application>
+
 </manifest>

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

@@ -1,22 +0,0 @@
-package com.bjzc.yfdxj.Listener;
-
-/**
- * @author：luck
- * @date：2020-01-13 17:00
- * @describe：拖拽监听事件
- */
-public interface DragListener {
-    /**
-     * 是否将 item拖动到删除处，根据状态改变颜色
-     *
-     * @param isDelete
-     */
-    void deleteState(boolean isDelete);
-
-    /**
-     * 是否于拖拽状态
-     *
-     * @param start
-     */
-    void dragState(boolean isStart);
-}