1.被禁按客运需求

HttpCoreLibrary/src/main/java/com/rc/httpcore/HttpConfig.kt

@@ -9,10 +9,12 @@ class HttpConfig {
 //        var API_BASE_URL = "http://192.168.251.2/labSystem/"
 //        var API_BASE_URL = "http://192.168.1.8:8080/"
         var API_BASE_URL = "http://172.16.0.65/api/"
-        var API_BASE_IMG_URL = "http://172.16.0.65/api/"
+        //var API_BASE_IMG_URL = "http://172.16.0.65/api/"
 
+        //var API_BASE_URL = "http://192.168.166.11/api/"
+        var API_BASE_IMG_URL = "http://192.168.166.11/api/"
 
-        var FILE_BROWSER_BASE_URL = "http://192.168.251.2:8012/"
+        var FILE_BROWSER_BASE_URL = "http://192.168.166.11/api/"
 
         const val HTTP_STRATEGY_Retrofit = 1
 

HttpCoreLibrary/src/main/java/com/rc/httpcore/config/ConfigFactory.kt

@@ -9,18 +9,20 @@ class ConfigFactory {
             .baseUrl("http://180.76.134.43:30002/")
             .fileBrowserBaseUrl("http://180.76.134.43:31007/")
             .httpStrategy(HttpConfig.HTTP_STRATEGY_Retrofit)
-            .mqttServerUri("tcp://180.76.134.43:18830")
+            .mqttServerUri("tcp://192.168.166.11:1883")
             .mqttUName("dlc")
             .mqttUPwd("123456")
             .build()
 
         val buildReleaseConfig = ConfigParam.Builder()
 //            .baseUrl("https://lab.sxitdlc.com/labSystem/")
-            .baseUrl("http://172.16.0.65/api/")
+            .baseUrl("http://192.168.166.11/api/")
+            //.baseUrl("http://172.16.0.65/api/")
 //            .fileBrowserBaseUrl("http://180.76.134.43:31007/")
-            .fileBrowserBaseUrl("http://172.16.0.65/api/")
+            //.fileBrowserBaseUrl("http://172.16.0.65/api/")
+            .fileBrowserBaseUrl("http://192.168.166.11/api/")
             .httpStrategy(HttpConfig.HTTP_STRATEGY_Retrofit)
-            .mqttServerUri("tcp://180.76.134.43:1883")
+            .mqttServerUri("tcp://192.168.166.11:1883")
             .mqttUName("mqtt")
             .mqttUPwd("mqtt@zd1883")
             .build()

app/build.gradle

@@ -79,7 +79,8 @@ dependencies {
     implementation libs.androidx.localbroadcastmanager
     implementation libs.androidx.activity
 
-    implementation libs.rxpermissions
+    //implementation libs.rxpermissions
+    implementation(name: 'rxpermissions-v0.11', ext: 'aar')
     implementation libs.androidx.swiperefreshlayout
 
     implementation libs.recycler.adapter.helper4

app/src/main/java/com/dlc/exam/dummy/DummyData.kt

@@ -22,7 +22,7 @@ object DummyData {
         data = EnvEntity.Data().apply {
             baseUrl = "https://lab.sxitdlc.com/labSystem/"
             fileBrowserBaseUrl = "http://180.76.134.43:31007/"
-            mqttUrl = "tcp://180.76.134.43:1883"
+            mqttUrl = "tcp://192.168.166.11:1883"
             mqttName = "mqtt"
             mqttPwd = "mqtt@zd1883"
         }

app/src/main/java/com/dlc/exam/ui/MainActivity.kt

@@ -10,12 +10,15 @@ import androidx.viewbinding.ViewBinding
 import com.dlc.exam.BuildConfig
 import com.dlc.exam.ExamApp
 import com.dlc.exam.common.CommonUtils
+import com.dlc.exam.common.ExamType
 import com.dlc.exam.databinding.ActivityMainBinding
 import com.dlc.exam.iflytek.VoiceItsManager
 import com.dlc.exam.mqtt.MqttService
 import com.dlc.exam.mqtt.event.UpdateEvent
 import com.dlc.exam.ui.certificate.CertificateManagementActivity
 import com.dlc.exam.ui.common.BaseCountDownActivity
+import com.dlc.exam.ui.exam.ExamActivity
+import com.dlc.exam.ui.exam.MockExamActivity
 import com.dlc.exam.ui.exam.SafetyExamHomeActivity
 import com.dlc.exam.ui.learn.SafetyLearnActivity
 import com.dlc.exam.ui.login.LoginActivity
@@ -120,15 +123,33 @@ class MainActivity : BaseCountDownActivity<ActivityMainBinding>(), TitleBar.Titl
         }
 
         // 安全考试
-        viewBinding.safetyExam.setOnClickListener { dispatchMenuClicked(SafetyExamHomeActivity::class.java) }
+        //viewBinding.safetyExam.setOnClickListener { dispatchMenuClicked(SafetyExamHomeActivity::class.java) }
+
+        //安全考试
+        viewBinding.safetyExam.setOnClickListener {
+            if (isLogin()) {
+                val intent = Intent(this, ExamActivity::class.java)
+                intent.putExtra("exam_type", ExamType.SAFETY.type)
+                startActivity(intent)
+            }
+        }
 
         // 证书管理
+//        viewBinding.certificateManagement.setOnClickListener {
+//            dispatchMenuClicked(
+//                CertificateManagementActivity::class.java
+//            )
+//        }
+
+        //修改成模拟考试了
         viewBinding.certificateManagement.setOnClickListener {
             dispatchMenuClicked(
-                CertificateManagementActivity::class.java
+                MockExamActivity::class.java
             )
         }
 
+
+
         // 安全学习
         viewBinding.safetyLearn.setOnClickListener { dispatchMenuClicked(SafetyLearnActivity::class.java) }
 

app/src/main/java/com/dlc/exam/ui/StartActivity.java

@@ -42,20 +42,20 @@ public class StartActivity extends RcBaseActivity<ActivityStartBinding> {
         super.initViews(savedInstanceState);
         binding.versionName.setText(AppUtils.getAppVersionName());
 
-        binding.firm.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                new PasswordDialog(StartActivity.this, new Function0<Unit>() {
-                    @Override
-                    public Unit invoke() {
-                        ActivityUtils.startActivity(SettingsActivity.class);
-                        finish();
-                        return null;
-                    }
-                }).show();
-                return true;
-            }
-        });
+//        binding.firm.setOnLongClickListener(new View.OnLongClickListener() {
+//            @Override
+//            public boolean onLongClick(View v) {
+//                new PasswordDialog(StartActivity.this, new Function0<Unit>() {
+//                    @Override
+//                    public Unit invoke() {
+//                        ActivityUtils.startActivity(SettingsActivity.class);
+//                        finish();
+//                        return null;
+//                    }
+//                }).show();
+//                return true;
+//            }
+//        });
 
         requestPermission();
     }

app/src/main/java/com/dlc/exam/ui/exam/SafetyExamHomeActivity.kt

@@ -35,29 +35,29 @@ class SafetyExamHomeActivity : BaseCountDownActivity<ActivitySafetyExamHomeBindi
             startActivity(intent)
         }
         // 负面清单考试
-        viewBinding.negativeExam.setOnClickListener {
-            callQueryUserInfoApi { status ->
-                if (ExamType.NEGATIVE.type == status) {
-                    val intent = Intent(this, ExamActivity::class.java)
-                    intent.putExtra("exam_type", ExamType.NEGATIVE.type)
-                    startActivity(intent)
-                } else {
-                    showToast("当前登录人员不在负面清单中。")
-                }
-            }
-        }
-        // 黑名单考试
-        viewBinding.blackListExam.setOnClickListener {
-            callQueryUserInfoApi { status ->
-                if (ExamType.BLACK_LIST.type == status) {
-                    val intent = Intent(this, ExamActivity::class.java)
-                    intent.putExtra("exam_type", ExamType.BLACK_LIST.type)
-                    startActivity(intent)
-                } else {
-                    showToast("当前登录人员不在黑名单中。")
-                }
-            }
-        }
+//        viewBinding.negativeExam.setOnClickListener {
+//            callQueryUserInfoApi { status ->
+//                if (ExamType.NEGATIVE.type == status) {
+//                    val intent = Intent(this, ExamActivity::class.java)
+//                    intent.putExtra("exam_type", ExamType.NEGATIVE.type)
+//                    startActivity(intent)
+//                } else {
+//                    showToast("当前登录人员不在负面清单中。")
+//                }
+//            }
+//        }
+//        // 黑名单考试
+//        viewBinding.blackListExam.setOnClickListener {
+//            callQueryUserInfoApi { status ->
+//                if (ExamType.BLACK_LIST.type == status) {
+//                    val intent = Intent(this, ExamActivity::class.java)
+//                    intent.putExtra("exam_type", ExamType.BLACK_LIST.type)
+//                    startActivity(intent)
+//                } else {
+//                    showToast("当前登录人员不在黑名单中。")
+//                }
+//            }
+//        }
         // 模拟考试
         viewBinding.mockTest.setOnClickListener {
             startActivity(Intent(this, MockExamActivity::class.java))

app/src/main/java/com/dlc/exam/ui/learn/LearnRecordActivity.kt

@@ -60,23 +60,23 @@ class LearnRecordActivity :
             loadData(true)
         }
         // 安全准入考试
-        viewBinding.safetyExam.setOnClickListener { view ->
-            mExamTypeList.forEach { it.isChecked = it == view }
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData(true)
-        }
-        // 负面清单考试
-        viewBinding.negativeExam.setOnClickListener { view ->
-            mExamTypeList.forEach { it.isChecked = it == view }
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData(true)
-        }
-        // 黑名单考试
-        viewBinding.blackListExam.setOnClickListener { view ->
-            mExamTypeList.forEach { it.isChecked = it == view }
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData(true)
-        }
+//        viewBinding.safetyExam.setOnClickListener { view ->
+//            mExamTypeList.forEach { it.isChecked = it == view }
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData(true)
+//        }
+//        // 负面清单考试
+//        viewBinding.negativeExam.setOnClickListener { view ->
+//            mExamTypeList.forEach { it.isChecked = it == view }
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData(true)
+//        }
+//        // 黑名单考试
+//        viewBinding.blackListExam.setOnClickListener { view ->
+//            mExamTypeList.forEach { it.isChecked = it == view }
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData(true)
+//        }
     }
 
     override fun initViews(savedInstanceState: Bundle?) {
@@ -86,9 +86,9 @@ class LearnRecordActivity :
 
         mExamTypeList.clear()
         mExamTypeList.add(viewBinding.allType)
-        mExamTypeList.add(viewBinding.safetyExam)
-        mExamTypeList.add(viewBinding.blackListExam)
-        mExamTypeList.add(viewBinding.negativeExam)
+//        mExamTypeList.add(viewBinding.safetyExam)
+//        mExamTypeList.add(viewBinding.blackListExam)
+//        mExamTypeList.add(viewBinding.negativeExam)
 
         viewBinding.search.setOnClickListener {
             mTreeView.deselectAll()
@@ -136,7 +136,7 @@ class LearnRecordActivity :
         mTreeView.setDefaultAnimation(true)
         mTreeView.setDefaultContainerStyle(R.style.TreeNodeStyleCustom)
         mTreeView.isSelectionModeEnabled = true
-        viewBinding.courseType.addView(mTreeView.view)
+//        viewBinding.courseType.addView(mTreeView.view)
         mTreeView.setUseAutoToggle(false)
     }
 
@@ -184,10 +184,10 @@ class LearnRecordActivity :
     private fun encodeScopeType(): String {
         // 1. 安全准入考试，2. 负面清单考试，3. 黑名单考试
         return when {
-            viewBinding.safetyExam.isChecked -> "1"
-            viewBinding.negativeExam.isChecked -> "2"
-            viewBinding.blackListExam.isChecked -> "3"
-            else -> ""
+   //         viewBinding.safetyExam.isChecked -> "1"
+//            viewBinding.negativeExam.isChecked -> "2"
+//            viewBinding.blackListExam.isChecked -> "3"
+            else -> "1"
         }
     }
 

app/src/main/java/com/dlc/exam/ui/learn/SafetyLearnActivity.kt

@@ -57,29 +57,29 @@ class SafetyLearnActivity :
     override fun initListener() {
         super.initListener()
         // 全部适用类型
-        viewBinding.allType.setOnClickListener { view ->
-            mExamTypeList.forEach { it.isChecked = it == view }
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData(true)
-        }
+//        viewBinding.allType.setOnClickListener { view ->
+//            mExamTypeList.forEach { it.isChecked = it == view }
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData(true)
+//        }
         // 安全准入考试
-        viewBinding.safetyExam.setOnClickListener { view ->
-            mExamTypeList.forEach { it.isChecked = it == view }
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData(true)
-        }
-        // 负面清单考试
-        viewBinding.negativeExam.setOnClickListener { view ->
-            mExamTypeList.forEach { it.isChecked = it == view }
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData(true)
-        }
-        // 黑名单考试
-        viewBinding.blackListExam.setOnClickListener { view ->
-            mExamTypeList.forEach { it.isChecked = it == view }
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData(true)
-        }
+//        viewBinding.safetyExam.setOnClickListener { view ->
+//            mExamTypeList.forEach { it.isChecked = it == view }
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData(true)
+//        }
+//        // 负面清单考试
+//        viewBinding.negativeExam.setOnClickListener { view ->
+//            mExamTypeList.forEach { it.isChecked = it == view }
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData(true)
+//        }
+//        // 黑名单考试
+//        viewBinding.blackListExam.setOnClickListener { view ->
+//            mExamTypeList.forEach { it.isChecked = it == view }
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData(true)
+//        }
     }
 
     override fun initViews(savedInstanceState: Bundle?) {
@@ -88,10 +88,10 @@ class SafetyLearnActivity :
         viewBinding.titleBar.setUsername(ExamApp.sLearnLoginVo?.userName)
 
         mExamTypeList.clear()
-        mExamTypeList.add(viewBinding.allType)
-        mExamTypeList.add(viewBinding.safetyExam)
-        mExamTypeList.add(viewBinding.blackListExam)
-        mExamTypeList.add(viewBinding.negativeExam)
+//        mExamTypeList.add(viewBinding.allType)
+//        mExamTypeList.add(viewBinding.safetyExam)
+//        mExamTypeList.add(viewBinding.blackListExam)
+//        mExamTypeList.add(viewBinding.negativeExam)
 
         // 学习记录
         viewBinding.learnRecord.setOnClickListener {
@@ -128,8 +128,8 @@ class SafetyLearnActivity :
 
     private fun handleDefaultScopeType() {
         when (intent.getStringExtra("exam_type")) {
-            ExamType.NEGATIVE.type -> defaultCheckedView(viewBinding.negativeExam)
-            ExamType.BLACK_LIST.type -> defaultCheckedView(viewBinding.blackListExam)
+//            ExamType.NEGATIVE.type -> defaultCheckedView(viewBinding.negativeExam)
+//            ExamType.BLACK_LIST.type -> defaultCheckedView(viewBinding.blackListExam)
         }
     }
 
@@ -173,7 +173,7 @@ class SafetyLearnActivity :
         mTreeView.setDefaultAnimation(true)
         mTreeView.setDefaultContainerStyle(R.style.TreeNodeStyleCustom)
         mTreeView.isSelectionModeEnabled = true
-        viewBinding.courseType.addView(mTreeView.view)
+//        viewBinding.courseType.addView(mTreeView.view)
         mTreeView.setUseAutoToggle(false)
     }
 
@@ -221,10 +221,10 @@ class SafetyLearnActivity :
     private fun encodeScopeType(): String {
         // 1. 安全准入考试，2. 负面清单考试，3. 黑名单考试
         return when {
-            viewBinding.safetyExam.isChecked -> "1"
-            viewBinding.negativeExam.isChecked -> "2"
-            viewBinding.blackListExam.isChecked -> "3"
-            else -> ""
+  //          viewBinding.safetyExam.isChecked -> "1"
+//            viewBinding.negativeExam.isChecked -> "2"
+//            viewBinding.blackListExam.isChecked -> "3"
+            else -> "1"
         }
     }
 

app/src/main/java/com/dlc/exam/ui/score/QueryScoreActivity.kt

@@ -59,15 +59,15 @@ class QueryScoreActivity :
             loadData()
         }
         // 负面清单考试
-        viewBinding.negativeExam.setOnClickListener {
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData()
-        }
-        // 黑名单考试
-        viewBinding.blackListExam.setOnClickListener {
-            mCurrentPage = ListPageView.FIRST_PAGE
-            loadData()
-        }
+//        viewBinding.negativeExam.setOnClickListener {
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData()
+//        }
+//        // 黑名单考试
+//        viewBinding.blackListExam.setOnClickListener {
+//            mCurrentPage = ListPageView.FIRST_PAGE
+//            loadData()
+//        }
     }
 
     override fun queryData(): Disposable? {
@@ -95,10 +95,10 @@ class QueryScoreActivity :
             viewBinding.mockTest.isChecked -> ExamType.MOCK_TEST.type
             // 安全准入考试
             viewBinding.safetyExam.isChecked -> ExamType.SAFETY.type
-            // 负面清单考试
-            viewBinding.negativeExam.isChecked -> ExamType.NEGATIVE.type
-            // 黑名单考试
-            viewBinding.blackListExam.isChecked -> ExamType.BLACK_LIST.type
+//            // 负面清单考试
+//            viewBinding.negativeExam.isChecked -> ExamType.NEGATIVE.type
+//            // 黑名单考试
+//            viewBinding.blackListExam.isChecked -> ExamType.BLACK_LIST.type
             else -> null
         }
     }

app/src/main/res/layout/activity_learn_record.xml

@@ -117,79 +117,79 @@
                 app:layout_constraintTop_toBottomOf="@id/searchInput"
                 tools:ignore="SmallSp" />
 
-            <CheckBox
-                android:id="@+id/safetyExam"
-                android:layout_width="0dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="10dp"
-                android:background="@drawable/selector_arc_12"
-                android:button="@null"
-                android:checked="false"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp"
-                android:text="安全准入考试"
-                android:textColor="@color/textcolor_selector"
-                android:textSize="9sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/middle_guide_line"
-                app:layout_constraintTop_toTopOf="@id/allType"
-                tools:ignore="SmallSp" />
-
-            <CheckBox
-                android:id="@+id/negativeExam"
-                android:layout_width="0dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="4dp"
-                android:background="@drawable/selector_arc_12"
-                android:button="@null"
-                android:checked="false"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp"
-                android:text="负面清单考试"
-                android:textColor="@color/textcolor_selector"
-                android:textSize="9sp"
-                app:layout_constraintEnd_toStartOf="@id/middle_guide_line"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/allType"
-                tools:ignore="SmallSp" />
-
-            <CheckBox
-                android:id="@+id/blackListExam"
-                android:layout_width="0dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="10dp"
-                android:background="@drawable/selector_arc_12"
-                android:button="@null"
-                android:checked="false"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp"
-                android:text="黑名单考试"
-                android:textColor="@color/textcolor_selector"
-                android:textSize="9sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/middle_guide_line"
-                app:layout_constraintTop_toTopOf="@id/negativeExam"
-                tools:ignore="SmallSp" />
-
-            <RelativeLayout
-                android:id="@+id/courseType"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="15dp"
-                android:layout_marginTop="14dp"
-                android:layout_marginEnd="15dp"
-                android:layout_marginBottom="14dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/negativeExam" />
+<!--            <CheckBox-->
+<!--                android:id="@+id/safetyExam"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="24dp"-->
+<!--                android:layout_marginStart="4dp"-->
+<!--                android:layout_marginEnd="10dp"-->
+<!--                android:background="@drawable/selector_arc_12"-->
+<!--                android:button="@null"-->
+<!--                android:checked="false"-->
+<!--                android:gravity="center"-->
+<!--                android:paddingStart="6dp"-->
+<!--                android:paddingEnd="6dp"-->
+<!--                android:text="安全考试"-->
+<!--                android:textColor="@color/textcolor_selector"-->
+<!--                android:textSize="9sp"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toEndOf="@id/middle_guide_line"-->
+<!--                app:layout_constraintTop_toTopOf="@id/allType"-->
+<!--                tools:ignore="SmallSp" />-->
+
+<!--            <CheckBox-->
+<!--                android:id="@+id/negativeExam"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="24dp"-->
+<!--                android:layout_marginStart="10dp"-->
+<!--                android:layout_marginTop="10dp"-->
+<!--                android:layout_marginEnd="4dp"-->
+<!--                android:background="@drawable/selector_arc_12"-->
+<!--                android:button="@null"-->
+<!--                android:checked="false"-->
+<!--                android:gravity="center"-->
+<!--                android:paddingStart="6dp"-->
+<!--                android:paddingEnd="6dp"-->
+<!--                android:text="负面清单考试"-->
+<!--                android:textColor="@color/textcolor_selector"-->
+<!--                android:textSize="9sp"-->
+<!--                app:layout_constraintEnd_toStartOf="@id/middle_guide_line"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toBottomOf="@id/allType"-->
+<!--                tools:ignore="SmallSp" />-->
+
+<!--            <CheckBox-->
+<!--                android:id="@+id/blackListExam"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="24dp"-->
+<!--                android:layout_marginStart="4dp"-->
+<!--                android:layout_marginEnd="10dp"-->
+<!--                android:background="@drawable/selector_arc_12"-->
+<!--                android:button="@null"-->
+<!--                android:checked="false"-->
+<!--                android:gravity="center"-->
+<!--                android:paddingStart="6dp"-->
+<!--                android:paddingEnd="6dp"-->
+<!--                android:text="黑名单考试"-->
+<!--                android:textColor="@color/textcolor_selector"-->
+<!--                android:textSize="9sp"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toEndOf="@id/middle_guide_line"-->
+<!--                app:layout_constraintTop_toTopOf="@id/negativeExam"-->
+<!--                tools:ignore="SmallSp" />-->
+
+<!--            <RelativeLayout-->
+<!--                android:id="@+id/courseType"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="0dp"-->
+<!--                android:layout_marginStart="15dp"-->
+<!--                android:layout_marginTop="14dp"-->
+<!--                android:layout_marginEnd="15dp"-->
+<!--                android:layout_marginBottom="14dp"-->
+<!--                app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toBottomOf="@id/negativeExam" />-->
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/activity_main.xml

@@ -34,7 +34,7 @@
         android:layout_height="365dp"
         android:layout_marginTop="17dp"
         android:contentDescription="@null"
-        android:src="@mipmap/img_bg_zsgl"
+        android:src="@mipmap/img_bg_zsgl_new"
         app:layout_constraintEnd_toStartOf="@id/safetyExam"
         app:layout_constraintTop_toTopOf="@id/safetyExam" />
 

app/src/main/res/layout/activity_query_score.xml

@@ -67,30 +67,30 @@
                 android:background="@drawable/bg_radio"
                 android:button="@null"
                 android:gravity="center"
-                android:text="安全准入考试"
+                android:text="安全考试"
                 android:textColor="@color/textcolor_radio" />
 
-            <RadioButton
-                android:id="@+id/negativeExam"
-                android:layout_width="130dp"
-                android:layout_height="34dp"
-                android:layout_marginStart="9dp"
-                android:background="@drawable/bg_radio"
-                android:button="@null"
-                android:gravity="center"
-                android:text="负面清单考试"
-                android:textColor="@color/textcolor_radio" />
-
-            <RadioButton
-                android:id="@+id/blackListExam"
-                android:layout_width="130dp"
-                android:layout_height="34dp"
-                android:layout_marginStart="9dp"
-                android:background="@drawable/bg_radio"
-                android:button="@null"
-                android:gravity="center"
-                android:text="黑名单考试"
-                android:textColor="@color/textcolor_radio" />
+<!--            <RadioButton-->
+<!--                android:id="@+id/negativeExam"-->
+<!--                android:layout_width="130dp"-->
+<!--                android:layout_height="34dp"-->
+<!--                android:layout_marginStart="9dp"-->
+<!--                android:background="@drawable/bg_radio"-->
+<!--                android:button="@null"-->
+<!--                android:gravity="center"-->
+<!--                android:text="负面清单考试"-->
+<!--                android:textColor="@color/textcolor_radio" />-->
+
+<!--            <RadioButton-->
+<!--                android:id="@+id/blackListExam"-->
+<!--                android:layout_width="130dp"-->
+<!--                android:layout_height="34dp"-->
+<!--                android:layout_marginStart="9dp"-->
+<!--                android:background="@drawable/bg_radio"-->
+<!--                android:button="@null"-->
+<!--                android:gravity="center"-->
+<!--                android:text="黑名单考试"-->
+<!--                android:textColor="@color/textcolor_radio" />-->
 
         </RadioGroup>
 

app/src/main/res/layout/activity_safety_learn.xml

@@ -96,87 +96,87 @@
                 android:orientation="vertical"
                 app:layout_constraintGuide_percent="0.5" />
 
-            <CheckBox
-                android:id="@+id/allType"
-                android:layout_width="0dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="17dp"
-                android:layout_marginEnd="4dp"
-                android:background="@drawable/selector_arc_12"
-                android:button="@null"
-                android:checked="true"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp"
-                android:text="全部适用类型"
-                android:textColor="@color/textcolor_selector"
-                android:textSize="9sp"
-                app:layout_constraintEnd_toStartOf="@id/middle_guide_line"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/searchInput"
-                tools:ignore="SmallSp" />
-
-            <CheckBox
-                android:id="@+id/safetyExam"
-                android:layout_width="0dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="10dp"
-                android:background="@drawable/selector_arc_12"
-                android:button="@null"
-                android:checked="false"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp"
-                android:text="安全准入考试"
-                android:textColor="@color/textcolor_selector"
-                android:textSize="9sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/middle_guide_line"
-                app:layout_constraintTop_toTopOf="@id/allType"
-                tools:ignore="SmallSp" />
-
-            <CheckBox
-                android:id="@+id/negativeExam"
-                android:layout_width="0dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="4dp"
-                android:background="@drawable/selector_arc_12"
-                android:button="@null"
-                android:checked="false"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp"
-                android:text="负面清单考试"
-                android:textColor="@color/textcolor_selector"
-                android:textSize="9sp"
-                app:layout_constraintEnd_toStartOf="@id/middle_guide_line"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/allType"
-                tools:ignore="SmallSp" />
-
-            <CheckBox
-                android:id="@+id/blackListExam"
-                android:layout_width="0dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="10dp"
-                android:background="@drawable/selector_arc_12"
-                android:button="@null"
-                android:checked="false"
-                android:gravity="center"
-                android:paddingStart="6dp"
-                android:paddingEnd="6dp"
-                android:text="黑名单考试"
-                android:textColor="@color/textcolor_selector"
-                android:textSize="9dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/middle_guide_line"
-                app:layout_constraintTop_toTopOf="@id/negativeExam"
-                tools:ignore="SmallSp" />
+<!--            <CheckBox-->
+<!--                android:id="@+id/allType"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="24dp"-->
+<!--                android:layout_marginStart="10dp"-->
+<!--                android:layout_marginTop="17dp"-->
+<!--                android:layout_marginEnd="4dp"-->
+<!--                android:background="@drawable/selector_arc_12"-->
+<!--                android:button="@null"-->
+<!--                android:checked="true"-->
+<!--                android:gravity="center"-->
+<!--                android:paddingStart="6dp"-->
+<!--                android:paddingEnd="6dp"-->
+<!--                android:text="全部适用类型"-->
+<!--                android:textColor="@color/textcolor_selector"-->
+<!--                android:textSize="9sp"-->
+<!--                app:layout_constraintEnd_toStartOf="@id/middle_guide_line"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toBottomOf="@id/searchInput"-->
+<!--                tools:ignore="SmallSp" />-->
+
+<!--            <CheckBox-->
+<!--                android:id="@+id/safetyExam"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="24dp"-->
+<!--                android:layout_marginStart="4dp"-->
+<!--                android:layout_marginEnd="10dp"-->
+<!--                android:background="@drawable/selector_arc_12"-->
+<!--                android:button="@null"-->
+<!--                android:checked="false"-->
+<!--                android:gravity="center"-->
+<!--                android:paddingStart="6dp"-->
+<!--                android:paddingEnd="6dp"-->
+<!--                android:text="安全考试"-->
+<!--                android:textColor="@color/textcolor_selector"-->
+<!--                android:textSize="9sp"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toEndOf="@id/middle_guide_line"-->
+<!--                app:layout_constraintTop_toTopOf="@id/allType"-->
+<!--                tools:ignore="SmallSp" />-->
+
+<!--            <CheckBox-->
+<!--                android:id="@+id/negativeExam"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="24dp"-->
+<!--                android:layout_marginStart="10dp"-->
+<!--                android:layout_marginTop="10dp"-->
+<!--                android:layout_marginEnd="4dp"-->
+<!--                android:background="@drawable/selector_arc_12"-->
+<!--                android:button="@null"-->
+<!--                android:checked="false"-->
+<!--                android:gravity="center"-->
+<!--                android:paddingStart="6dp"-->
+<!--                android:paddingEnd="6dp"-->
+<!--                android:text="负面清单考试"-->
+<!--                android:textColor="@color/textcolor_selector"-->
+<!--                android:textSize="9sp"-->
+<!--                app:layout_constraintEnd_toStartOf="@id/middle_guide_line"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toBottomOf="@id/allType"-->
+<!--                tools:ignore="SmallSp" />-->
+
+<!--            <CheckBox-->
+<!--                android:id="@+id/blackListExam"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="24dp"-->
+<!--                android:layout_marginStart="4dp"-->
+<!--                android:layout_marginEnd="10dp"-->
+<!--                android:background="@drawable/selector_arc_12"-->
+<!--                android:button="@null"-->
+<!--                android:checked="false"-->
+<!--                android:gravity="center"-->
+<!--                android:paddingStart="6dp"-->
+<!--                android:paddingEnd="6dp"-->
+<!--                android:text="黑名单考试"-->
+<!--                android:textColor="@color/textcolor_selector"-->
+<!--                android:textSize="9dp"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toEndOf="@id/middle_guide_line"-->
+<!--                app:layout_constraintTop_toTopOf="@id/negativeExam"-->
+<!--                tools:ignore="SmallSp" />-->
 
             <TextView
                 android:id="@+id/learnRecord"
@@ -196,18 +196,18 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
-            <RelativeLayout
-                android:id="@+id/courseType"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="15dp"
-                android:layout_marginTop="14dp"
-                android:layout_marginEnd="15dp"
-                android:layout_marginBottom="14dp"
-                app:layout_constraintBottom_toTopOf="@id/learnRecord"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/negativeExam" />
+<!--            <RelativeLayout-->
+<!--                android:id="@+id/courseType"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="0dp"-->
+<!--                android:layout_marginStart="15dp"-->
+<!--                android:layout_marginTop="14dp"-->
+<!--                android:layout_marginEnd="15dp"-->
+<!--                android:layout_marginBottom="14dp"-->
+<!--                app:layout_constraintBottom_toTopOf="@id/learnRecord"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toBottomOf="@id/negativeExam" />-->
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/activity_start.xml

@@ -5,18 +5,18 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/img_bg"
+    android:background="@mipmap/img_bg_new_kj"
     tools:context=".ui.StartActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:drawableTop="@mipmap/icon_log_wto"
-        android:drawablePadding="50dp"
-        android:text="欢迎使用实验室安全学习与考试系统"
-        android:textColor="@color/white"
-        android:textSize="28sp" />
+<!--    <TextView-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_centerInParent="true"-->
+<!--        android:drawableTop="@mipmap/logo_aky_new"-->
+<!--        android:drawablePadding="65dp"-->
+<!--        android:text="欢迎使用实验室安全学习与考试系统"-->
+<!--        android:textColor="@color/white"-->
+<!--        android:textSize="35sp" />-->
 
     <TextView
         android:id="@+id/versionName"
@@ -24,14 +24,14 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true" />
 
-    <TextView
-        android:id="@+id/firm"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="12dp"
-        android:text="@string/copy_right"
-        android:textColor="#666666"
-        android:textSize="12sp" />
+<!--    <TextView-->
+<!--        android:id="@+id/firm"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_alignParentBottom="true"-->
+<!--        android:layout_centerHorizontal="true"-->
+<!--        android:layout_marginBottom="12dp"-->
+<!--        android:text="@string/copy_right"-->
+<!--        android:textColor="#666666"-->
+<!--        android:textSize="12sp" />-->
 </RelativeLayout>

app/src/main/res/layout/fragment_student_card.xml

@@ -12,13 +12,13 @@
         android:layout_width="650dp"
         android:layout_height="393dp"
         android:contentDescription="@null"
-        android:src="@mipmap/img_sign_in_sl" />
+        android:src="@mipmap/img_sign_in_aky_card_new" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="19dp"
-        android:text="请将您的校园卡放置在刷卡感应区登录（如图示）"
+        android:text="请将您的卡片放置在刷卡感应区登录（如图示）"
         android:textColor="#163277"
         android:textSize="17sp" />
 

app/src/main/res/layout/widget_title_bar.xml

@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@null"
         android:scaleType="centerCrop"
-        android:src="@mipmap/img_dl_logo_two" />
+        android:src="@mipmap/img_dl_logo_aky" />
 
     <TextView
         android:layout_width="wrap_content"

config/config.gradle

@@ -45,7 +45,7 @@ ext {
             luban                        : 'top.zibin:Luban:1.1.8',
             RecyclerViewAdapterHelper    : 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4',
             eventbus                     : 'org.greenrobot:eventbus:3.2.0',
-            rxpermissions                : 'com.github.tbruyelle:rxpermissions:0.11',
+           // rxpermissions                : 'com.github.tbruyelle:rxpermissions:0.11',
             glide                        : 'com.github.bumptech.glide:glide:4.11.0',
             buglySDK                     : 'com.tencent.bugly:crashreport:3.4.4',
             buglyNDK                     : 'com.tencent.bugly:nativecrashreport:3.9.2',

settings.gradle

@@ -20,6 +20,9 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         jcenter()
+        flatDir {
+            dirs 'app/libs'
+        }
     }
 }