Browse Source

格式化了一下代码

bfzgs 2 years ago
parent
commit
04aa35a6c3
41 changed files with 275 additions and 264 deletions
  1. 14 14
      app/src/main/AndroidManifest.xml
  2. 3 2
      app/src/main/assets/echarts.html
  3. 1 1
      app/src/main/java/org/brynhild/graduation/activity/admin/AdminMainPageActivity.kt
  4. 4 4
      app/src/main/java/org/brynhild/graduation/activity/admin/ClassDetailInfoActivity.kt
  5. 2 2
      app/src/main/java/org/brynhild/graduation/activity/admin/UserDetailInfoActivity.kt
  6. 0 1
      app/src/main/java/org/brynhild/graduation/activity/common/AccountInfoActivity.kt
  7. 64 54
      app/src/main/java/org/brynhild/graduation/activity/common/StatisticActivity.kt
  8. 0 2
      app/src/main/java/org/brynhild/graduation/activity/common/TimetableActivity.kt
  9. 6 20
      app/src/main/java/org/brynhild/graduation/activity/teacher/ClassDetailInfoActivityUsingByTeacher.kt
  10. 1 4
      app/src/main/java/org/brynhild/graduation/activity/teacher/TeacherMainPageActivity.kt
  11. 11 8
      app/src/main/java/org/brynhild/graduation/activity/teacher/ui/clazz/ClazzFragment.kt
  12. 53 42
      app/src/main/java/org/brynhild/graduation/activity/teacher/ui/sign/SignInFragment.kt
  13. 2 4
      app/src/main/java/org/brynhild/graduation/activity/teacher/ui/timetable/TimetableFragment.kt
  14. 16 6
      app/src/main/java/org/brynhild/graduation/activity/teacher/ui/user/UserFragment.kt
  15. 1 4
      app/src/main/java/org/brynhild/graduation/activity/user/UserActivity.kt
  16. 50 39
      app/src/main/java/org/brynhild/graduation/activity/user/ui/sign/SignInFragment.kt
  17. 2 7
      app/src/main/java/org/brynhild/graduation/activity/user/ui/timetable/TimetableFragment.kt
  18. 16 8
      app/src/main/java/org/brynhild/graduation/activity/user/ui/user/UserFragment.kt
  19. 1 2
      app/src/main/java/org/brynhild/graduation/common/config/LoginConfiguration.kt
  20. 4 4
      app/src/main/java/org/brynhild/graduation/common/constant/StatisticConstant.java
  21. 4 4
      app/src/main/java/org/brynhild/graduation/common/transfer/bo/timetable/StatisticInfo.kt
  22. 1 1
      app/src/main/java/org/brynhild/graduation/common/transfer/vo/timetable/AdminQueryClassStatistic.kt
  23. 1 1
      app/src/main/java/org/brynhild/graduation/common/transfer/vo/timetable/AdminQueryStudentStatistic.kt
  24. 1 1
      app/src/main/java/org/brynhild/graduation/common/transfer/vo/timetable/QueryTeachingClassRequest.kt
  25. 1 1
      app/src/main/java/org/brynhild/graduation/common/transfer/vo/timetable/QueryTeachingCourseStatisticRequest.kt
  26. 2 1
      app/src/main/java/org/brynhild/graduation/common/utils/FileDownloadUtil.java
  27. 3 2
      app/src/main/java/org/brynhild/graduation/common/utils/FileUtils.java
  28. 2 2
      app/src/main/java/org/brynhild/graduation/network/adapter/ClassEntityAdapterUsingByTeacher.kt
  29. 0 4
      app/src/main/java/org/brynhild/graduation/network/adapter/UserAdapterUsingByTeacher.kt
  30. 0 6
      app/src/main/java/org/brynhild/graduation/service/http/AdminService.kt
  31. 0 1
      app/src/main/java/org/brynhild/graduation/service/http/StudentService.kt
  32. 0 1
      app/src/main/java/org/brynhild/graduation/service/http/TeacherService.kt
  33. 1 0
      app/src/main/res/layout/activity_statistic.xml
  34. 1 1
      app/src/main/res/layout/activity_user.xml
  35. 0 1
      app/src/main/res/layout/activity_user_main_page.xml
  36. 1 0
      app/src/main/res/layout/fragment_clazz.xml
  37. 2 2
      app/src/main/res/layout/fragment_sign_in.xml
  38. 2 2
      app/src/main/res/layout/fragment_sign_in_teacher.xml
  39. 1 2
      app/src/main/res/layout/fragment_timetable_teacher.xml
  40. 1 2
      app/src/main/res/layout/fragment_user.xml
  41. 0 1
      app/src/main/res/layout/fragment_user_teacher.xml

+ 14 - 14
app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- 允许应用程序多播状态 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <!-- 允许应用程序改变网络状态 -->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <!-- 允许应用程序改变WIFI连接状态 -->
@@ -26,11 +26,11 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar"
-        tools:targetApi="31" >
+        tools:targetApi="31">
         <activity
             android:name=".activity.teacher.TeacherMainPageActivity"
             android:exported="false"
-            android:label="@string/title_activity_teacher_main_page" >
+            android:label="@string/title_activity_teacher_main_page">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -38,70 +38,70 @@
         <activity
             android:name=".activity.user.UserActivity"
             android:exported="false"
-            android:label="@string/title_activity_user" >
+            android:label="@string/title_activity_user">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.common.StatisticActivity"
-            android:exported="true" >
+            android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.teacher.ClassDetailInfoActivityUsingByTeacher"
-            android:exported="true" >
+            android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.common.TimetableActivity"
-            android:exported="true" >
+            android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.admin.AcademyDetailInfoActivity"
-            android:exported="false" >
+            android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.admin.CourseDetailInfoActivity"
-            android:exported="false" >
+            android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.admin.AreaDetailInfoActivity"
-            android:exported="false" >
+            android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.admin.DeviceDetailInfoActivity"
-            android:exported="false" >
+            android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.admin.MajorDetailInfoActivity"
-            android:exported="false" >
+            android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".activity.admin.ClassDetailInfoActivity"
-            android:exported="false" >
+            android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -142,7 +142,7 @@
             android:launchMode="singleTask" />
         <activity
             android:name=".MainActivity"
-            android:exported="true" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

+ 3 - 2
app/src/main/assets/echarts.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html style="height: 100%">
 <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <meta content="width=device-width, initial-scale=1" name="viewport"/>
     <meta charset="utf-8">
 </head>
 <body style="height: 100%; margin: 0">
 <div id="container" style="height: 600px;width: 400px"></div>
-<script type="text/javascript" src="echarts.min.js"></script>
+<script src="echarts.min.js" type="text/javascript"></script>
 <script type="text/javascript">
         var chart = echarts.init(document.getElementById('container'));
 
@@ -14,6 +14,7 @@ function setChartOptions(options) {
             chart.setOption(options);
         }
 
+
 </script>
 </body>
 </html>

+ 1 - 1
app/src/main/java/org/brynhild/graduation/activity/admin/AdminMainPageActivity.kt

@@ -863,7 +863,7 @@ class AdminMainPageActivity : BaseActivity() {
         activityMainPageBinding = ActivityMainPageBinding.inflate(LayoutInflater.from(this))
         setContentView(activityMainPageBinding.root)
 
-        LoginConfiguration.loadTimeTableConfig{
+        LoginConfiguration.loadTimeTableConfig {
 
         }
 

+ 4 - 4
app/src/main/java/org/brynhild/graduation/activity/admin/ClassDetailInfoActivity.kt

@@ -172,9 +172,9 @@ class ClassDetailInfoActivity : BaseActivity() {
         }
 
         binding.adminClassStatistic.setOnClickListener {
-            val intent=Intent(this,StatisticActivity::class.java)
-            intent.putExtra(StatisticConstant.ACTION,StatisticConstant.CLASS_ACTION)
-            intent.putExtra(StatisticConstant.ID_ENUM,classEntity.id)
+            val intent = Intent(this, StatisticActivity::class.java)
+            intent.putExtra(StatisticConstant.ACTION, StatisticConstant.CLASS_ACTION)
+            intent.putExtra(StatisticConstant.ID_ENUM, classEntity.id)
             startActivity(intent)
         }
 
@@ -424,7 +424,7 @@ class ClassDetailInfoActivity : BaseActivity() {
                     }
                     .show()
             }
-            R.id.admin_class_delete->{
+            R.id.admin_class_delete -> {
                 ConfirmPopupWindow.ConfirmPopupWindowBuilder.init(this@ClassDetailInfoActivity)
                     .setContent("确定删除班级:${classEntity.name}吗")
                     .setCancelText("取消删除")

+ 2 - 2
app/src/main/java/org/brynhild/graduation/activity/admin/UserDetailInfoActivity.kt

@@ -255,9 +255,9 @@ class UserDetailInfoActivity : BaseActivity() {
         }
 
         binding.statisticBtn.setOnClickListener {
-            val intent=Intent(this, StatisticActivity::class.java)
+            val intent = Intent(this, StatisticActivity::class.java)
             intent.putExtra(StatisticConstant.ACTION, StatisticConstant.STUDENT_ACTION)
-            intent.putExtra(StatisticConstant.ID_ENUM,user.id)
+            intent.putExtra(StatisticConstant.ID_ENUM, user.id)
             startActivity(intent)
         }
     }

+ 0 - 1
app/src/main/java/org/brynhild/graduation/activity/common/AccountInfoActivity.kt

@@ -16,7 +16,6 @@ import org.brynhild.graduation.common.config.LoginConfiguration.saveLoginInfo
 import org.brynhild.graduation.common.config.MyApplication
 import org.brynhild.graduation.common.constant.BroadcastConstant
 import org.brynhild.graduation.common.transfer.Result
-import org.brynhild.graduation.common.transfer.dto.AccountBasicInfo
 import org.brynhild.graduation.common.transfer.dto.FileInfo
 import org.brynhild.graduation.common.transfer.handler.ResponseHandler
 import org.brynhild.graduation.common.transfer.utils.ServiceCreator

+ 64 - 54
app/src/main/java/org/brynhild/graduation/activity/common/StatisticActivity.kt

@@ -37,11 +37,11 @@ class StatisticActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
 
 
-        binding=ActivityStatisticBinding.inflate(LayoutInflater.from(this))
+        binding = ActivityStatisticBinding.inflate(LayoutInflater.from(this))
         setContentView(binding.root)
 
-        type=intent.getIntExtra(StatisticConstant.ACTION,1)
-        id=intent.getLongExtra(StatisticConstant.ID_ENUM,0L)
+        type = intent.getIntExtra(StatisticConstant.ACTION, 1)
+        id = intent.getLongExtra(StatisticConstant.ID_ENUM, 0L)
 
 
         val webSettings: WebSettings = binding.backupChart.settings
@@ -50,7 +50,12 @@ class StatisticActivity : BaseActivity() {
         webSettings.javaScriptCanOpenWindowsAutomatically = true
         webSettings.setSupportZoom(false)
         webSettings.displayZoomControls = false
-        binding.backupChart.setBackgroundColor(ContextCompat.getColor(this, android.R.color.transparent))
+        binding.backupChart.setBackgroundColor(
+            ContextCompat.getColor(
+                this,
+                android.R.color.transparent
+            )
+        )
         binding.backupChart.loadUrl("file:///android_asset/echarts.html")
         binding.backupChart.webViewClient = object : WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
@@ -62,34 +67,35 @@ class StatisticActivity : BaseActivity() {
         bindOnClick()
     }
 
-    private fun bindOnClick(){
+    private fun bindOnClick() {
         binding.downloadStatistic.setOnClickListener {
-            val service=ServiceCreator.create(CommonService::class.java)
-            val handler=object:Callback<Result>{
+            val service = ServiceCreator.create(CommonService::class.java)
+            val handler = object : Callback<Result> {
                 override fun onResponse(call: Call<Result>, response: Response<Result>) {
-                    ResponseHandler.handle(response,{
-                        val gson=Gson()
-                        val list=ArrayList<FileInfo>()
-                        for(item in it.data as List<*>){
-                            val json=gson.toJson(item)
-                            val info=JsonUtils.fromJson<FileInfo>(json)
-                            if(info!=null){
+                    ResponseHandler.handle(response, {
+                        val gson = Gson()
+                        val list = ArrayList<FileInfo>()
+                        for (item in it.data as List<*>) {
+                            val json = gson.toJson(item)
+                            val info = JsonUtils.fromJson<FileInfo>(json)
+                            if (info != null) {
                                 list.add(info)
                             }
                         }
-                        if(list.size==1){
-                            val info=list[0]
-                            val downLoadName=if(type==StatisticConstant.STUDENT_ACTION){
+                        if (list.size == 1) {
+                            val info = list[0]
+                            val downLoadName = if (type == StatisticConstant.STUDENT_ACTION) {
                                 "student-${id}.docx"
-                            }else{
+                            } else {
                                 "class-${id}.docx"
                             }
                             println("download:${info.path}")
-                            FileDownloadUtil.downLoad(info.path,downLoadName){
-                                Toast.makeText(this@StatisticActivity,"文件下载完成",Toast.LENGTH_SHORT).show()
+                            FileDownloadUtil.downLoad(info.path, downLoadName) {
+                                Toast.makeText(this@StatisticActivity, "文件下载完成", Toast.LENGTH_SHORT)
+                                    .show()
                             }
                         }
-                    },{
+                    }, {
                         ResponseHandler.showMessage(it)
                     })
                 }
@@ -99,19 +105,21 @@ class StatisticActivity : BaseActivity() {
                 }
             }
 
-            when(type){
-                StatisticConstant.CLASS_ACTION->{
-                    val data=AdminQueryClassStatistic(id)
-                    service.generateClassStatistic(LoginConfiguration.userInfo!!.token,data).enqueue(handler)
+            when (type) {
+                StatisticConstant.CLASS_ACTION -> {
+                    val data = AdminQueryClassStatistic(id)
+                    service.generateClassStatistic(LoginConfiguration.userInfo!!.token, data)
+                        .enqueue(handler)
                 }
-                StatisticConstant.STUDENT_ACTION->{
-                    val data=AdminQueryStudentStatistic(id)
-                    service.generateStudentStatistic(LoginConfiguration.userInfo!!.token,data).enqueue(handler)
+                StatisticConstant.STUDENT_ACTION -> {
+                    val data = AdminQueryStudentStatistic(id)
+                    service.generateStudentStatistic(LoginConfiguration.userInfo!!.token, data)
+                        .enqueue(handler)
                 }
             }
         }
 
-        binding.title.text="考勤数据"
+        binding.title.text = "考勤数据"
         binding.backButton.setOnClickListener {
             finish()
         }
@@ -119,22 +127,22 @@ class StatisticActivity : BaseActivity() {
 
 
     private fun loadStatisticInfo() {
-        val service=ServiceCreator.create(CommonService::class.java)
-        val handler=object:Callback<Result>{
+        val service = ServiceCreator.create(CommonService::class.java)
+        val handler = object : Callback<Result> {
             override fun onResponse(call: Call<Result>, response: Response<Result>) {
-                ResponseHandler.handle(response,{
-                    val gson=Gson()
-                    val list=ArrayList<StatisticInfo>()
+                ResponseHandler.handle(response, {
+                    val gson = Gson()
+                    val list = ArrayList<StatisticInfo>()
                     println(gson.toJson(it))
-                    for(item in it.data as List<*>){
-                        val json=gson.toJson(item)
-                        val info=JsonUtils.fromJson<StatisticInfo>(json)
-                        if(info!=null){
+                    for (item in it.data as List<*>) {
+                        val json = gson.toJson(item)
+                        val info = JsonUtils.fromJson<StatisticInfo>(json)
+                        if (info != null) {
                             list.add(info)
                         }
                     }
                     renderStatisticInfoList(list)
-                },{
+                }, {
                     ResponseHandler.showMessage(it)
                 })
             }
@@ -144,32 +152,34 @@ class StatisticActivity : BaseActivity() {
             }
         }
 
-        when(type){
-            StatisticConstant.CLASS_ACTION->{
-                val data=AdminQueryClassStatistic(id)
-                service.queryClassStatistic(LoginConfiguration.userInfo!!.token,data).enqueue(handler)
+        when (type) {
+            StatisticConstant.CLASS_ACTION -> {
+                val data = AdminQueryClassStatistic(id)
+                service.queryClassStatistic(LoginConfiguration.userInfo!!.token, data)
+                    .enqueue(handler)
             }
-            StatisticConstant.STUDENT_ACTION->{
-                val data=AdminQueryStudentStatistic(id)
-                service.queryStudentStatistic(LoginConfiguration.userInfo!!.token,data).enqueue(handler)
+            StatisticConstant.STUDENT_ACTION -> {
+                val data = AdminQueryStudentStatistic(id)
+                service.queryStudentStatistic(LoginConfiguration.userInfo!!.token, data)
+                    .enqueue(handler)
             }
         }
 
     }
 
-    private fun renderStatisticInfoList(list:List<StatisticInfo>){
-        var first=true
-        val nameBuilder=StringBuilder()
-        val rateBuilder=StringBuilder()
+    private fun renderStatisticInfoList(list: List<StatisticInfo>) {
+        var first = true
+        val nameBuilder = StringBuilder()
+        val rateBuilder = StringBuilder()
 
-        for(item in list){
-            if(!first){
+        for (item in list) {
+            if (!first) {
                 nameBuilder.append(",")
                 rateBuilder.append(",")
             }
             nameBuilder.append(item.course.name)
-            rateBuilder.append(item.rate*100)
-            first=false
+            rateBuilder.append(item.rate * 100)
+            first = false
         }
         val chartOptions = """
             setChartOptions(

+ 0 - 2
app/src/main/java/org/brynhild/graduation/activity/common/TimetableActivity.kt

@@ -19,8 +19,6 @@ import org.brynhild.graduation.common.transfer.handler.ResponseHandler
 import org.brynhild.graduation.common.transfer.utils.ServiceCreator
 import org.brynhild.graduation.common.transfer.vo.timetable.AdminAddTimeTable
 import org.brynhild.graduation.common.transfer.vo.timetable.QueryTimeTableRequest
-import org.brynhild.graduation.common.utils.FileDownloadUtil
-import org.brynhild.graduation.common.utils.FileUtils
 import org.brynhild.graduation.common.utils.JsonUtils
 import org.brynhild.graduation.databinding.ActivityTimetableBinding
 import org.brynhild.graduation.databinding.AdminAddTimetableDialogBinding

+ 6 - 20
app/src/main/java/org/brynhild/graduation/activity/teacher/ClassDetailInfoActivityUsingByTeacher.kt

@@ -1,39 +1,22 @@
 package org.brynhild.graduation.activity.teacher
 
-import android.app.AlertDialog
-import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuItem
 import androidx.recyclerview.widget.GridLayoutManager
-import com.example.devicemanager.view.ConfirmPopupWindow
 import com.google.gson.Gson
-import org.brynhild.graduation.R
 import org.brynhild.graduation.activity.common.BaseActivity
-import org.brynhild.graduation.activity.common.StatisticActivity
-import org.brynhild.graduation.activity.common.TimetableActivity
-import org.brynhild.graduation.common.callback.RecyclerViewCallback
 import org.brynhild.graduation.common.config.LoginConfiguration
-import org.brynhild.graduation.common.constant.StatisticConstant
 import org.brynhild.graduation.common.transfer.Result
 import org.brynhild.graduation.common.transfer.handler.ResponseHandler
 import org.brynhild.graduation.common.transfer.utils.ServiceCreator
-import org.brynhild.graduation.common.transfer.vo.device.AdminClearFingerPrintDataAtDevice
-import org.brynhild.graduation.common.transfer.vo.device.AdminGetClassFingerPrintDataIdList
-import org.brynhild.graduation.common.transfer.vo.device.AdminPushFingerPrintDataToDevice
-import org.brynhild.graduation.common.transfer.vo.device.EnrollFingerPrint
-import org.brynhild.graduation.common.transfer.vo.user.*
+import org.brynhild.graduation.common.transfer.vo.user.QueryUserRequest
 import org.brynhild.graduation.common.utils.JsonUtils
-import org.brynhild.graduation.common.utils.MultipleSelectHandler
-import org.brynhild.graduation.databinding.*
-import org.brynhild.graduation.network.adapter.UserAdapter
+import org.brynhild.graduation.databinding.ActivityClassDetailInfoUsingByTeacherBinding
 import org.brynhild.graduation.network.adapter.UserAdapterUsingByTeacher
 import org.brynhild.graduation.network.entiity.ClassEntity
 import org.brynhild.graduation.network.entiity.User
-import org.brynhild.graduation.service.http.AdminService
 import org.brynhild.graduation.service.http.TeacherService
 import retrofit2.Call
 import retrofit2.Callback
@@ -79,7 +62,10 @@ class ClassDetailInfoActivityUsingByTeacher : BaseActivity() {
                             }
                         }
                         userList = userArrayList
-                        val adapter = UserAdapterUsingByTeacher(this@ClassDetailInfoActivityUsingByTeacher, userArrayList)
+                        val adapter = UserAdapterUsingByTeacher(
+                            this@ClassDetailInfoActivityUsingByTeacher,
+                            userArrayList
+                        )
 
                         binding.recyclerView.adapter = adapter
                     }, {

+ 1 - 4
app/src/main/java/org/brynhild/graduation/activity/teacher/TeacherMainPageActivity.kt

@@ -1,12 +1,9 @@
 package org.brynhild.graduation.activity.teacher
 
 import android.os.Bundle
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.brynhild.graduation.R
 import org.brynhild.graduation.activity.common.BaseActivity
 import org.brynhild.graduation.databinding.ActivityTeacherMainPageBinding

+ 11 - 8
app/src/main/java/org/brynhild/graduation/activity/teacher/ui/clazz/ClazzFragment.kt

@@ -15,11 +15,8 @@ import org.brynhild.graduation.common.transfer.utils.ServiceCreator
 import org.brynhild.graduation.common.transfer.vo.timetable.QueryTeachingClassRequest
 import org.brynhild.graduation.common.utils.JsonUtils
 import org.brynhild.graduation.databinding.FragmentClazzBinding
-import org.brynhild.graduation.network.adapter.ClassEntityAdapter
 import org.brynhild.graduation.network.adapter.ClassEntityAdapterUsingByTeacher
-import org.brynhild.graduation.network.adapter.CourseAdapter
 import org.brynhild.graduation.network.entiity.ClassEntity
-import org.brynhild.graduation.network.entiity.Course
 import org.brynhild.graduation.service.http.TeacherService
 import retrofit2.Call
 import retrofit2.Callback
@@ -46,13 +43,13 @@ class ClazzFragment : Fragment() {
         binding.recyclerView.layoutManager = singleColumnLayout
 
         binding.swipeRefresh.setOnRefreshListener {
-            loadTeachingClassList{
-                Toast.makeText(this@ClazzFragment.context,"数据更新完成",Toast.LENGTH_SHORT).show()
+            loadTeachingClassList {
+                Toast.makeText(this@ClazzFragment.context, "数据更新完成", Toast.LENGTH_SHORT).show()
             }
             binding.swipeRefresh.isRefreshing = false
         }
 
-        loadTeachingClassList{
+        loadTeachingClassList {
 
         }
 
@@ -69,7 +66,10 @@ class ClazzFragment : Fragment() {
         val data = QueryTeachingClassRequest(LoginConfiguration.userInfo!!.user.id)
         service.queryTeachingClass(LoginConfiguration.userInfo!!.token, data)
             .enqueue(object : Callback<org.brynhild.graduation.common.transfer.Result> {
-                override fun onResponse(call: Call<org.brynhild.graduation.common.transfer.Result>, response: Response<org.brynhild.graduation.common.transfer.Result>) {
+                override fun onResponse(
+                    call: Call<org.brynhild.graduation.common.transfer.Result>,
+                    response: Response<org.brynhild.graduation.common.transfer.Result>
+                ) {
                     ResponseHandler.handle(response, {
                         val gson = Gson()
                         val clientArrayList = ArrayList<ClassEntity>()
@@ -90,7 +90,10 @@ class ClazzFragment : Fragment() {
                     })
                 }
 
-                override fun onFailure(call: Call<org.brynhild.graduation.common.transfer.Result>, t: Throwable) {
+                override fun onFailure(
+                    call: Call<org.brynhild.graduation.common.transfer.Result>,
+                    t: Throwable
+                ) {
                     t.printStackTrace()
                 }
             })

+ 53 - 42
app/src/main/java/org/brynhild/graduation/activity/teacher/ui/sign/SignInFragment.kt

@@ -19,12 +19,10 @@ import org.brynhild.graduation.common.transfer.bo.timetable.StatisticInfo
 import org.brynhild.graduation.common.transfer.dto.FileInfo
 import org.brynhild.graduation.common.transfer.handler.ResponseHandler
 import org.brynhild.graduation.common.transfer.utils.ServiceCreator
-import org.brynhild.graduation.common.transfer.vo.timetable.AdminQueryStudentStatistic
 import org.brynhild.graduation.common.transfer.vo.timetable.QueryTeachingCourseStatisticRequest
 import org.brynhild.graduation.common.utils.FileDownloadUtil
 import org.brynhild.graduation.common.utils.JsonUtils
 import org.brynhild.graduation.databinding.FragmentSignInTeacherBinding
-import org.brynhild.graduation.service.http.CommonService
 import org.brynhild.graduation.service.http.TeacherService
 import retrofit2.Call
 import retrofit2.Callback
@@ -32,7 +30,7 @@ import retrofit2.Response
 
 class SignInFragment : Fragment() {
 
-        private var _binding: FragmentSignInTeacherBinding? = null
+    private var _binding: FragmentSignInTeacherBinding? = null
     private val binding get() = _binding!!
 
     @SuppressLint("SetJavaScriptEnabled")
@@ -50,7 +48,12 @@ class SignInFragment : Fragment() {
         webSettings.javaScriptCanOpenWindowsAutomatically = true
         webSettings.setSupportZoom(false)
         webSettings.displayZoomControls = false
-        binding.backupChart.setBackgroundColor(ContextCompat.getColor(MyApplication.context, android.R.color.transparent))
+        binding.backupChart.setBackgroundColor(
+            ContextCompat.getColor(
+                MyApplication.context,
+                android.R.color.transparent
+            )
+        )
         binding.backupChart.loadUrl("file:///android_asset/echarts.html")
         binding.backupChart.webViewClient = object : WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
@@ -67,60 +70,67 @@ class SignInFragment : Fragment() {
         _binding = null
     }
 
-    private fun bindOnClick(){
+    private fun bindOnClick() {
         binding.downloadStatistic.setOnClickListener {
-            val service= ServiceCreator.create(TeacherService::class.java)
-            val handler=object: Callback<Result> {
+            val service = ServiceCreator.create(TeacherService::class.java)
+            val handler = object : Callback<Result> {
                 override fun onResponse(call: Call<Result>, response: Response<Result>) {
-                    ResponseHandler.handle(response,{
-                        val gson= Gson()
-                        val list=ArrayList<FileInfo>()
-                        for(item in it.data as List<*>){
-                            val json=gson.toJson(item)
-                            val info= JsonUtils.fromJson<FileInfo>(json)
-                            if(info!=null){
+                    ResponseHandler.handle(response, {
+                        val gson = Gson()
+                        val list = ArrayList<FileInfo>()
+                        for (item in it.data as List<*>) {
+                            val json = gson.toJson(item)
+                            val info = JsonUtils.fromJson<FileInfo>(json)
+                            if (info != null) {
                                 list.add(info)
                             }
                         }
-                        if(list.size==1){
-                            val info=list[0]
-                            val downLoadName="student-${LoginConfiguration.userInfo!!.user.id}.docx"
+                        if (list.size == 1) {
+                            val info = list[0]
+                            val downLoadName =
+                                "student-${LoginConfiguration.userInfo!!.user.id}.docx"
                             println("download:${info.path}")
-                            FileDownloadUtil.downLoad(info.path,downLoadName){
-                                Toast.makeText(this@SignInFragment.context,"文件下载完成", Toast.LENGTH_SHORT).show()
+                            FileDownloadUtil.downLoad(info.path, downLoadName) {
+                                Toast.makeText(
+                                    this@SignInFragment.context,
+                                    "文件下载完成",
+                                    Toast.LENGTH_SHORT
+                                ).show()
                             }
                         }
-                    },{
+                    }, {
                         ResponseHandler.showMessage(it)
                     })
                 }
+
                 override fun onFailure(call: Call<Result>, t: Throwable) {
                     t.printStackTrace()
                 }
             }
-            val data= QueryTeachingCourseStatisticRequest(LoginConfiguration.userInfo!!.user.id)
-            service.generateTeachingCourseStatistic(LoginConfiguration.userInfo!!.token,data).enqueue(handler)
+            val data = QueryTeachingCourseStatisticRequest(LoginConfiguration.userInfo!!.user.id)
+            service.generateTeachingCourseStatistic(LoginConfiguration.userInfo!!.token, data)
+                .enqueue(handler)
         }
     }
 
 
     private fun loadStatisticInfo() {
-        val service= ServiceCreator.create(TeacherService::class.java)
-        val handler=object: Callback<Result> {
+        val service = ServiceCreator.create(TeacherService::class.java)
+        val handler = object : Callback<Result> {
             override fun onResponse(call: Call<Result>, response: Response<Result>) {
-                ResponseHandler.handle(response,{
-                    val gson= Gson()
-                    val list=ArrayList<StatisticInfo>()
+                ResponseHandler.handle(response, {
+                    val gson = Gson()
+                    val list = ArrayList<StatisticInfo>()
                     println(gson.toJson(it))
-                    for(item in it.data as List<*>){
-                        val json=gson.toJson(item)
-                        val info= JsonUtils.fromJson<StatisticInfo>(json)
-                        if(info!=null){
+                    for (item in it.data as List<*>) {
+                        val json = gson.toJson(item)
+                        val info = JsonUtils.fromJson<StatisticInfo>(json)
+                        if (info != null) {
                             list.add(info)
                         }
                     }
                     renderStatisticInfoList(list)
-                },{
+                }, {
                     ResponseHandler.showMessage(it)
                 })
             }
@@ -130,24 +140,25 @@ class SignInFragment : Fragment() {
             }
         }
 
-        val data= QueryTeachingCourseStatisticRequest(LoginConfiguration.userInfo!!.user.id)
-        service.queryTeachingCourseStatistic(LoginConfiguration.userInfo!!.token,data).enqueue(handler)
+        val data = QueryTeachingCourseStatisticRequest(LoginConfiguration.userInfo!!.user.id)
+        service.queryTeachingCourseStatistic(LoginConfiguration.userInfo!!.token, data)
+            .enqueue(handler)
 
     }
 
-    private fun renderStatisticInfoList(list:List<StatisticInfo>){
-        var first=true
-        val nameBuilder=StringBuilder()
-        val rateBuilder=StringBuilder()
+    private fun renderStatisticInfoList(list: List<StatisticInfo>) {
+        var first = true
+        val nameBuilder = StringBuilder()
+        val rateBuilder = StringBuilder()
 
-        for(item in list){
-            if(!first){
+        for (item in list) {
+            if (!first) {
                 nameBuilder.append(",")
                 rateBuilder.append(",")
             }
             nameBuilder.append(item.course.name)
-            rateBuilder.append(item.rate*100)
-            first=false
+            rateBuilder.append(item.rate * 100)
+            first = false
         }
         val chartOptions = """
             setChartOptions(

+ 2 - 4
app/src/main/java/org/brynhild/graduation/activity/teacher/ui/timetable/TimetableFragment.kt

@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
-import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
@@ -25,7 +24,6 @@ import org.brynhild.graduation.common.transfer.vo.timetable.QueryTimeTableReques
 import org.brynhild.graduation.common.utils.JsonUtils
 import org.brynhild.graduation.databinding.FragmentTimetableTeacherBinding
 import org.brynhild.graduation.network.entiity.TimeTableInfo
-import org.brynhild.graduation.service.http.StudentService
 import org.brynhild.graduation.service.http.TeacherService
 import retrofit2.Call
 import retrofit2.Callback
@@ -72,7 +70,7 @@ class TimetableFragment : Fragment() {
         }
 
 
-        LoginConfiguration.loadTimeTableConfig{
+        LoginConfiguration.loadTimeTableConfig {
             initTimetableView()
             loadTimeTableData()
         }
@@ -196,7 +194,7 @@ class TimetableFragment : Fragment() {
                 }
                 var target = -1
 
-                if(this@TimetableFragment.context!=null){
+                if (this@TimetableFragment.context != null) {
                     val builder = AlertDialog.Builder(this@with.context)
                     with(builder) {
                         binding.idTitle.text = "设置当前周"

+ 16 - 6
app/src/main/java/org/brynhild/graduation/activity/teacher/ui/user/UserFragment.kt

@@ -130,7 +130,7 @@ class UserFragment : Fragment() {
             val user = LoginConfiguration.userInfo!!.user
             modifyAccountBasicInfoDialogBinding.email.setText(user.email)
             modifyAccountBasicInfoDialogBinding.tel.setText(user.tel)
-            if(this@UserFragment.context!=null){
+            if (this@UserFragment.context != null) {
                 AlertDialog.Builder(this@UserFragment.context!!)
                     .setTitle("修改联系方式")
                     .setView(modifyAccountBasicInfoDialogBinding.root)
@@ -176,7 +176,11 @@ class UserFragment : Fragment() {
                                 }
 
                                 override fun onFailure(call: Call<Result>, t: Throwable) {
-                                    Toast.makeText(MyApplication.context, "请求失败", Toast.LENGTH_SHORT)
+                                    Toast.makeText(
+                                        MyApplication.context,
+                                        "请求失败",
+                                        Toast.LENGTH_SHORT
+                                    )
                                         .show()
                                 }
                             })
@@ -194,7 +198,7 @@ class UserFragment : Fragment() {
         binding.modifyPassword.setOnClickListener {
             modifyAccountPasswordInfoDialogBinding =
                 ModifyAccountPasswordInfoDialogBinding.inflate(LayoutInflater.from(this@UserFragment.context))
-            if(this@UserFragment.context!=null){
+            if (this@UserFragment.context != null) {
                 AlertDialog.Builder(this@UserFragment.context!!)
                     .setTitle("修改密码")
                     .setView(modifyAccountPasswordInfoDialogBinding.root)
@@ -204,7 +208,8 @@ class UserFragment : Fragment() {
                         val passwordConfirm =
                             modifyAccountPasswordInfoDialogBinding.newPasswordConfirm.text.toString()
                         if (password != passwordConfirm) {
-                            Toast.makeText(MyApplication.context, "两次密码不匹配", Toast.LENGTH_SHORT).show()
+                            Toast.makeText(MyApplication.context, "两次密码不匹配", Toast.LENGTH_SHORT)
+                                .show()
                             return@setPositiveButton
                         }
                         val service = ServiceCreator.create(AccountService::class.java)
@@ -236,7 +241,11 @@ class UserFragment : Fragment() {
                                 }
 
                                 override fun onFailure(call: Call<Result>, t: Throwable) {
-                                    Toast.makeText(MyApplication.context, "请求失败", Toast.LENGTH_SHORT)
+                                    Toast.makeText(
+                                        MyApplication.context,
+                                        "请求失败",
+                                        Toast.LENGTH_SHORT
+                                    )
                                         .show()
                                 }
                             })
@@ -273,7 +282,8 @@ class UserFragment : Fragment() {
                     val uri = data.data
                     if (Uri2PathUtil.getRealPathFromUri(this@UserFragment.context, uri) != null) {
                         //从uri得到绝对路径,并获取到file文件
-                        val file = File(Uri2PathUtil.getRealPathFromUri(this@UserFragment.context, uri))
+                        val file =
+                            File(Uri2PathUtil.getRealPathFromUri(this@UserFragment.context, uri))
                         FileUploadUtil.uploadFile(file, object : okhttp3.Callback {
                             override fun onFailure(call: okhttp3.Call, e: IOException) {
                                 println("failed")

+ 1 - 4
app/src/main/java/org/brynhild/graduation/activity/user/UserActivity.kt

@@ -1,12 +1,9 @@
 package org.brynhild.graduation.activity.user
 
 import android.os.Bundle
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.brynhild.graduation.R
 import org.brynhild.graduation.activity.common.BaseActivity
 import org.brynhild.graduation.databinding.ActivityUserBinding

+ 50 - 39
app/src/main/java/org/brynhild/graduation/activity/user/ui/sign/SignInFragment.kt

@@ -52,7 +52,12 @@ class SignInFragment : Fragment() {
         webSettings.javaScriptCanOpenWindowsAutomatically = true
         webSettings.setSupportZoom(false)
         webSettings.displayZoomControls = false
-        binding.backupChart.setBackgroundColor(ContextCompat.getColor(MyApplication.context, android.R.color.transparent))
+        binding.backupChart.setBackgroundColor(
+            ContextCompat.getColor(
+                MyApplication.context,
+                android.R.color.transparent
+            )
+        )
         binding.backupChart.loadUrl("file:///android_asset/echarts.html")
         binding.backupChart.webViewClient = object : WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
@@ -71,30 +76,35 @@ class SignInFragment : Fragment() {
         _binding = null
     }
 
-    private fun bindOnClick(){
+    private fun bindOnClick() {
         binding.downloadStatistic.setOnClickListener {
-            val service= ServiceCreator.create(CommonService::class.java)
-            val handler=object: Callback<Result> {
+            val service = ServiceCreator.create(CommonService::class.java)
+            val handler = object : Callback<Result> {
                 override fun onResponse(call: Call<Result>, response: Response<Result>) {
-                    ResponseHandler.handle(response,{
-                        val gson= Gson()
-                        val list=ArrayList<FileInfo>()
-                        for(item in it.data as List<*>){
-                            val json=gson.toJson(item)
-                            val info= JsonUtils.fromJson<FileInfo>(json)
-                            if(info!=null){
+                    ResponseHandler.handle(response, {
+                        val gson = Gson()
+                        val list = ArrayList<FileInfo>()
+                        for (item in it.data as List<*>) {
+                            val json = gson.toJson(item)
+                            val info = JsonUtils.fromJson<FileInfo>(json)
+                            if (info != null) {
                                 list.add(info)
                             }
                         }
-                        if(list.size==1){
-                            val info=list[0]
-                            val downLoadName="student-${LoginConfiguration.userInfo!!.user.id}.docx"
+                        if (list.size == 1) {
+                            val info = list[0]
+                            val downLoadName =
+                                "student-${LoginConfiguration.userInfo!!.user.id}.docx"
                             println("download:${info.path}")
-                            FileDownloadUtil.downLoad(info.path,downLoadName){
-                                Toast.makeText(this@SignInFragment.context,"文件下载完成", Toast.LENGTH_SHORT).show()
+                            FileDownloadUtil.downLoad(info.path, downLoadName) {
+                                Toast.makeText(
+                                    this@SignInFragment.context,
+                                    "文件下载完成",
+                                    Toast.LENGTH_SHORT
+                                ).show()
                             }
                         }
-                    },{
+                    }, {
                         ResponseHandler.showMessage(it)
                     })
                 }
@@ -104,30 +114,31 @@ class SignInFragment : Fragment() {
                 }
             }
 
-            val data= AdminQueryStudentStatistic(LoginConfiguration.userInfo!!.user.id)
-            service.generateStudentStatistic(LoginConfiguration.userInfo!!.token,data).enqueue(handler)
+            val data = AdminQueryStudentStatistic(LoginConfiguration.userInfo!!.user.id)
+            service.generateStudentStatistic(LoginConfiguration.userInfo!!.token, data)
+                .enqueue(handler)
 
         }
     }
 
 
     private fun loadStatisticInfo() {
-        val service= ServiceCreator.create(CommonService::class.java)
-        val handler=object: Callback<Result> {
+        val service = ServiceCreator.create(CommonService::class.java)
+        val handler = object : Callback<Result> {
             override fun onResponse(call: Call<Result>, response: Response<Result>) {
-                ResponseHandler.handle(response,{
-                    val gson= Gson()
-                    val list=ArrayList<StatisticInfo>()
+                ResponseHandler.handle(response, {
+                    val gson = Gson()
+                    val list = ArrayList<StatisticInfo>()
                     println(gson.toJson(it))
-                    for(item in it.data as List<*>){
-                        val json=gson.toJson(item)
-                        val info= JsonUtils.fromJson<StatisticInfo>(json)
-                        if(info!=null){
+                    for (item in it.data as List<*>) {
+                        val json = gson.toJson(item)
+                        val info = JsonUtils.fromJson<StatisticInfo>(json)
+                        if (info != null) {
                             list.add(info)
                         }
                     }
                     renderStatisticInfoList(list)
-                },{
+                }, {
                     ResponseHandler.showMessage(it)
                 })
             }
@@ -137,24 +148,24 @@ class SignInFragment : Fragment() {
             }
         }
 
-        val data= AdminQueryStudentStatistic(LoginConfiguration.userInfo!!.user.id)
-        service.queryStudentStatistic(LoginConfiguration.userInfo!!.token,data).enqueue(handler)
+        val data = AdminQueryStudentStatistic(LoginConfiguration.userInfo!!.user.id)
+        service.queryStudentStatistic(LoginConfiguration.userInfo!!.token, data).enqueue(handler)
 
     }
 
-    private fun renderStatisticInfoList(list:List<StatisticInfo>){
-        var first=true
-        val nameBuilder=StringBuilder()
-        val rateBuilder=StringBuilder()
+    private fun renderStatisticInfoList(list: List<StatisticInfo>) {
+        var first = true
+        val nameBuilder = StringBuilder()
+        val rateBuilder = StringBuilder()
 
-        for(item in list){
-            if(!first){
+        for (item in list) {
+            if (!first) {
                 nameBuilder.append(",")
                 rateBuilder.append(",")
             }
             nameBuilder.append(item.course.name)
-            rateBuilder.append(item.rate*100)
-            first=false
+            rateBuilder.append(item.rate * 100)
+            first = false
         }
         val chartOptions = """
             setChartOptions(

+ 2 - 7
app/src/main/java/org/brynhild/graduation/activity/user/ui/timetable/TimetableFragment.kt

@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
-import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
@@ -18,17 +17,13 @@ import com.zhuangfei.timetable.model.Schedule
 import org.brynhild.graduation.R
 import org.brynhild.graduation.common.config.LoginConfiguration
 import org.brynhild.graduation.common.config.MyApplication
-import org.brynhild.graduation.common.constant.AccountConstant
 import org.brynhild.graduation.common.transfer.Result
 import org.brynhild.graduation.common.transfer.handler.ResponseHandler
 import org.brynhild.graduation.common.transfer.utils.ServiceCreator
-import org.brynhild.graduation.common.transfer.vo.timetable.AdminAddTimeTable
 import org.brynhild.graduation.common.transfer.vo.timetable.QueryTimeTableRequest
 import org.brynhild.graduation.common.utils.JsonUtils
-import org.brynhild.graduation.databinding.AdminAddTimetableDialogBinding
 import org.brynhild.graduation.databinding.FragmentTimetableBinding
 import org.brynhild.graduation.network.entiity.TimeTableInfo
-import org.brynhild.graduation.service.http.AdminService
 import org.brynhild.graduation.service.http.StudentService
 import retrofit2.Call
 import retrofit2.Callback
@@ -72,7 +67,7 @@ class TimetableFragment : Fragment() {
         }
 
 
-        LoginConfiguration.loadTimeTableConfig{
+        LoginConfiguration.loadTimeTableConfig {
             initTimetableView()
             loadTimeTableData()
         }
@@ -196,7 +191,7 @@ class TimetableFragment : Fragment() {
                 }
                 var target = -1
 
-                if(this@TimetableFragment.context!=null){
+                if (this@TimetableFragment.context != null) {
                     val builder = AlertDialog.Builder(this@with.context)
                     with(builder) {
                         binding.idTitle.text = "设置当前周"

+ 16 - 8
app/src/main/java/org/brynhild/graduation/activity/user/ui/user/UserFragment.kt

@@ -9,7 +9,6 @@ import android.os.Message
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
@@ -29,7 +28,6 @@ import org.brynhild.graduation.common.transfer.vo.user.ModifyAccountInfo
 import org.brynhild.graduation.common.utils.FileUploadUtil
 import org.brynhild.graduation.common.utils.JsonUtils
 import org.brynhild.graduation.common.utils.Uri2PathUtil
-import org.brynhild.graduation.databinding.ActivityAccountInfoBinding
 import org.brynhild.graduation.databinding.FragmentUserBinding
 import org.brynhild.graduation.databinding.ModifyAccountBasicInfoDialogBinding
 import org.brynhild.graduation.databinding.ModifyAccountPasswordInfoDialogBinding
@@ -130,7 +128,7 @@ class UserFragment : Fragment() {
             val user = LoginConfiguration.userInfo!!.user
             modifyAccountBasicInfoDialogBinding.email.setText(user.email)
             modifyAccountBasicInfoDialogBinding.tel.setText(user.tel)
-            if(this@UserFragment.context!=null){
+            if (this@UserFragment.context != null) {
                 AlertDialog.Builder(this@UserFragment.context!!)
                     .setTitle("修改联系方式")
                     .setView(modifyAccountBasicInfoDialogBinding.root)
@@ -176,7 +174,11 @@ class UserFragment : Fragment() {
                                 }
 
                                 override fun onFailure(call: Call<Result>, t: Throwable) {
-                                    Toast.makeText(MyApplication.context, "请求失败", Toast.LENGTH_SHORT)
+                                    Toast.makeText(
+                                        MyApplication.context,
+                                        "请求失败",
+                                        Toast.LENGTH_SHORT
+                                    )
                                         .show()
                                 }
                             })
@@ -194,7 +196,7 @@ class UserFragment : Fragment() {
         binding.modifyPassword.setOnClickListener {
             modifyAccountPasswordInfoDialogBinding =
                 ModifyAccountPasswordInfoDialogBinding.inflate(LayoutInflater.from(this@UserFragment.context))
-            if(this@UserFragment.context!=null){
+            if (this@UserFragment.context != null) {
                 AlertDialog.Builder(this@UserFragment.context!!)
                     .setTitle("修改密码")
                     .setView(modifyAccountPasswordInfoDialogBinding.root)
@@ -204,7 +206,8 @@ class UserFragment : Fragment() {
                         val passwordConfirm =
                             modifyAccountPasswordInfoDialogBinding.newPasswordConfirm.text.toString()
                         if (password != passwordConfirm) {
-                            Toast.makeText(MyApplication.context, "两次密码不匹配", Toast.LENGTH_SHORT).show()
+                            Toast.makeText(MyApplication.context, "两次密码不匹配", Toast.LENGTH_SHORT)
+                                .show()
                             return@setPositiveButton
                         }
                         val service = ServiceCreator.create(AccountService::class.java)
@@ -236,7 +239,11 @@ class UserFragment : Fragment() {
                                 }
 
                                 override fun onFailure(call: Call<Result>, t: Throwable) {
-                                    Toast.makeText(MyApplication.context, "请求失败", Toast.LENGTH_SHORT)
+                                    Toast.makeText(
+                                        MyApplication.context,
+                                        "请求失败",
+                                        Toast.LENGTH_SHORT
+                                    )
                                         .show()
                                 }
                             })
@@ -273,7 +280,8 @@ class UserFragment : Fragment() {
                     val uri = data.data
                     if (Uri2PathUtil.getRealPathFromUri(this@UserFragment.context, uri) != null) {
                         //从uri得到绝对路径,并获取到file文件
-                        val file = File(Uri2PathUtil.getRealPathFromUri(this@UserFragment.context, uri))
+                        val file =
+                            File(Uri2PathUtil.getRealPathFromUri(this@UserFragment.context, uri))
                         FileUploadUtil.uploadFile(file, object : okhttp3.Callback {
                             override fun onFailure(call: okhttp3.Call, e: IOException) {
                                 println("failed")

+ 1 - 2
app/src/main/java/org/brynhild/graduation/common/config/LoginConfiguration.kt

@@ -2,7 +2,6 @@ package org.brynhild.graduation.common.config
 
 import android.content.Context
 import android.content.Intent
-import android.os.Looper
 import android.util.Log
 import android.widget.Toast
 import com.google.gson.Gson
@@ -89,7 +88,7 @@ object LoginConfiguration {
         Log.d("LoginActivity", "save info:name:$accountName,password:$accountPassword")
     }
 
-    fun loadTimeTableConfig(callback:DefaultCallback) {
+    fun loadTimeTableConfig(callback: DefaultCallback) {
         val service = ServiceCreator.create(CommonService::class.java)
         service.loadTimeTableConfig()
             .enqueue(object : Callback<Result> {

+ 4 - 4
app/src/main/java/org/brynhild/graduation/common/constant/StatisticConstant.java

@@ -1,9 +1,9 @@
 package org.brynhild.graduation.common.constant;
 
 public class StatisticConstant {
-    public static final Integer CLASS_ACTION=1;
-    public static final Integer STUDENT_ACTION=2;
+    public static final Integer CLASS_ACTION = 1;
+    public static final Integer STUDENT_ACTION = 2;
 
-    public static final String ACTION="action";
-    public static final String ID_ENUM="id";
+    public static final String ACTION = "action";
+    public static final String ID_ENUM = "id";
 }

+ 4 - 4
app/src/main/java/org/brynhild/graduation/common/transfer/bo/timetable/StatisticInfo.kt

@@ -4,10 +4,10 @@ import org.brynhild.graduation.network.entiity.Course
 
 data class StatisticInfo(
     val course: Course,
-    val count:Long,
-    val actualCount:Long,
-    val rate:Double
-):Comparable<StatisticInfo>{
+    val count: Long,
+    val actualCount: Long,
+    val rate: Double
+) : Comparable<StatisticInfo> {
     override fun compareTo(other: StatisticInfo): Int {
         return other.rate.compareTo(rate)
     }

+ 1 - 1
app/src/main/java/org/brynhild/graduation/common/transfer/vo/timetable/AdminQueryClassStatistic.kt

@@ -1,5 +1,5 @@
 package org.brynhild.graduation.common.transfer.vo.timetable
 
 data class AdminQueryClassStatistic(
-	val id:Long?,
+    val id: Long?,
 )

+ 1 - 1
app/src/main/java/org/brynhild/graduation/common/transfer/vo/timetable/AdminQueryStudentStatistic.kt

@@ -1,5 +1,5 @@
 package org.brynhild.graduation.common.transfer.vo.timetable
 
 data class AdminQueryStudentStatistic(
-	val id:Long?,
+    val id: Long?,
 )

+ 1 - 1
app/src/main/java/org/brynhild/graduation/common/transfer/vo/timetable/QueryTeachingClassRequest.kt

@@ -1,5 +1,5 @@
 package org.brynhild.graduation.common.transfer.vo.timetable
 
 data class QueryTeachingClassRequest(
-	val teacherId:Long,
+    val teacherId: Long,
 )

+ 1 - 1
app/src/main/java/org/brynhild/graduation/common/transfer/vo/timetable/QueryTeachingCourseStatisticRequest.kt

@@ -1,5 +1,5 @@
 package org.brynhild.graduation.common.transfer.vo.timetable
 
 data class QueryTeachingCourseStatisticRequest(
-    val id:Long
+    val id: Long
 )

+ 2 - 1
app/src/main/java/org/brynhild/graduation/common/utils/FileDownloadUtil.java

@@ -13,7 +13,8 @@ import java.net.URL;
 public class FileDownloadUtil {
     /**
      * 从服务器下载文件
-     * @param path 下载文件的地址
+     *
+     * @param path     下载文件的地址
      * @param FileName 文件名字
      */
     public static void downLoad(final String path, final String FileName, DefaultCallback callback) {

+ 3 - 2
app/src/main/java/org/brynhild/graduation/common/utils/FileUtils.java

@@ -6,7 +6,7 @@ import java.io.File;
 
 public class FileUtils {
     private String path = Environment.getExternalStorageDirectory().toString() + "/brynhild";
- 
+
     public FileUtils() {
         File file = new File(path);
         /**
@@ -16,9 +16,10 @@ public class FileUtils {
             file.mkdirs();
         }
     }
- 
+
     /**
      * 创建一个文件
+     *
      * @param FileName 文件名
      * @return
      */

+ 2 - 2
app/src/main/java/org/brynhild/graduation/network/adapter/ClassEntityAdapterUsingByTeacher.kt

@@ -9,7 +9,6 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.gson.Gson
 import org.brynhild.graduation.R
-import org.brynhild.graduation.activity.admin.ClassDetailInfoActivity
 import org.brynhild.graduation.activity.teacher.ClassDetailInfoActivityUsingByTeacher
 import org.brynhild.graduation.common.config.MyApplication
 import org.brynhild.graduation.network.entiity.ClassEntity
@@ -31,7 +30,8 @@ class ClassEntityAdapterUsingByTeacher(
         holder.itemView.setOnClickListener {
             val position = holder.adapterPosition
             val classEntity = classEntityList[position]
-            val intent = Intent(MyApplication.context, ClassDetailInfoActivityUsingByTeacher::class.java)
+            val intent =
+                Intent(MyApplication.context, ClassDetailInfoActivityUsingByTeacher::class.java)
             intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             val gson = Gson()
             intent.putExtra("class", gson.toJson(classEntity))

+ 0 - 4
app/src/main/java/org/brynhild/graduation/network/adapter/UserAdapterUsingByTeacher.kt

@@ -1,7 +1,6 @@
 package org.brynhild.graduation.network.adapter
 
 import android.content.Context
-import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,10 +8,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.google.gson.Gson
 import org.brynhild.graduation.R
-import org.brynhild.graduation.activity.admin.UserDetailInfoActivity
-import org.brynhild.graduation.common.config.MyApplication
 import org.brynhild.graduation.network.entiity.User
 
 class UserAdapterUsingByTeacher(private val context: Context, private val userList: List<User>) :

+ 0 - 6
app/src/main/java/org/brynhild/graduation/service/http/AdminService.kt

@@ -233,10 +233,4 @@ interface AdminService {
     ): Call<Result>
 
 
-
-
-
-
-
-
 }

+ 0 - 1
app/src/main/java/org/brynhild/graduation/service/http/StudentService.kt

@@ -2,7 +2,6 @@ package org.brynhild.graduation.service.http
 
 import org.brynhild.graduation.common.constant.AccountConstant
 import org.brynhild.graduation.common.transfer.Result
-import org.brynhild.graduation.common.transfer.vo.device.QuerySignInRecordRequest
 import org.brynhild.graduation.common.transfer.vo.timetable.QueryTimeTableRequest
 import retrofit2.Call
 import retrofit2.http.Body

+ 0 - 1
app/src/main/java/org/brynhild/graduation/service/http/TeacherService.kt

@@ -2,7 +2,6 @@ package org.brynhild.graduation.service.http
 
 import org.brynhild.graduation.common.constant.AccountConstant
 import org.brynhild.graduation.common.transfer.Result
-import org.brynhild.graduation.common.transfer.vo.device.QuerySignInRecordRequest
 import org.brynhild.graduation.common.transfer.vo.timetable.QueryTeachingClassRequest
 import org.brynhild.graduation.common.transfer.vo.timetable.QueryTeachingCourseStatisticRequest
 import org.brynhild.graduation.common.transfer.vo.timetable.QueryTimeTableRequest

+ 1 - 0
app/src/main/res/layout/activity_statistic.xml

@@ -53,6 +53,7 @@
         android:id="@+id/backupChart"
         android:layout_width="match_parent"
         android:layout_height="600dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 1 - 1
app/src/main/res/layout/activity_user.xml

@@ -23,11 +23,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:defaultNavHost="true"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
         app:layout_constraintBottom_toTopOf="@id/nav_view"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
         app:navGraph="@navigation/mobile_navigation" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 0 - 1
app/src/main/res/layout/activity_user_main_page.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

+ 1 - 0
app/src/main/res/layout/fragment_clazz.xml

@@ -16,6 +16,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"

+ 2 - 2
app/src/main/res/layout/fragment_sign_in.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".activity.teacher.ui.sign.SignInFragment">
 
     <WebView
         android:id="@+id/backupChart"
         android:layout_width="match_parent"
         android:layout_height="600dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 2 - 2
app/src/main/res/layout/fragment_sign_in_teacher.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".activity.teacher.ui.sign.SignInFragment">
 
     <WebView
         android:id="@+id/backupChart"
         android:layout_width="match_parent"
         android:layout_height="600dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 1 - 2
app/src/main/res/layout/fragment_timetable_teacher.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:orientation="vertical"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".activity.teacher.ui.timetable.TimetableFragment">
 
     <RelativeLayout

+ 1 - 2
app/src/main/res/layout/fragment_user.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".activity.user.ui.user.UserFragment">
 
     <de.hdodenhof.circleimageview.CircleImageView

+ 0 - 1
app/src/main/res/layout/fragment_user_teacher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"