Frankensteinly před 1 rokem
rodič
revize
03de5f30be
53 změnil soubory, kde provedl 124 přidání a 134 odebrání
  1. 1 0
      .idea/.name
  2. 2 2
      app/build.gradle
  3. 1 1
      app/src/androidTest/java/com/grkj/iscs/ExampleInstrumentedTest.kt
  4. 1 1
      app/src/main/AndroidManifest.xml
  5. 1 1
      app/src/main/java/com/grkj/iscs/CustomBleGattCallback.kt
  6. 1 1
      app/src/main/java/com/grkj/iscs/CustomBleIndicateCallback.kt
  7. 1 1
      app/src/main/java/com/grkj/iscs/CustomBleScanCallback.kt
  8. 1 1
      app/src/main/java/com/grkj/iscs/CustomBleWriteCallback.kt
  9. 4 4
      app/src/main/java/com/grkj/iscs/MyApplication.kt
  10. 1 1
      app/src/main/java/com/grkj/iscs/RealResponse.kt
  11. 1 1
      app/src/main/java/com/grkj/iscs/Token.kt
  12. 1 1
      app/src/main/java/com/grkj/iscs/activity/BaseBindingActivity.kt
  13. 16 16
      app/src/main/java/com/grkj/iscs/activity/BleActivity.kt
  14. 6 6
      app/src/main/java/com/grkj/iscs/activity/CmdActivity.kt
  15. 2 5
      app/src/main/java/com/grkj/iscs/activity/MainActivity.kt
  16. 3 3
      app/src/main/java/com/grkj/iscs/activity/ModbusActivity.kt
  17. 2 2
      app/src/main/java/com/grkj/iscs/activity/ScreenAdaptActivity.kt
  18. 2 2
      app/src/main/java/com/grkj/iscs/activity/WebActivity.kt
  19. 19 19
      app/src/main/java/com/grkj/iscs/ble/BleCmdManager.kt
  20. 1 1
      app/src/main/java/com/grkj/iscs/ble/BleConst.kt
  21. 10 11
      app/src/main/java/com/grkj/iscs/ble/BleUtil.kt
  22. 1 1
      app/src/main/java/com/grkj/iscs/ble/KeyGenerator.java
  23. 2 2
      app/src/main/java/com/grkj/iscs/extentions/ByteArray.kt
  24. 1 1
      app/src/main/java/com/grkj/iscs/extentions/Int.kt
  25. 1 1
      app/src/main/java/com/grkj/iscs/extentions/Long.kt
  26. 1 1
      app/src/main/java/com/grkj/iscs/extentions/String.kt
  27. 4 4
      app/src/main/java/com/grkj/iscs/modbus/ModBusController.kt
  28. 6 6
      app/src/main/java/com/grkj/iscs/modbus/ModBusManager.kt
  29. 3 6
      app/src/main/java/com/grkj/iscs/modbus/PortManager.kt
  30. 1 1
      app/src/main/java/com/grkj/iscs/model/BleBean.kt
  31. 1 1
      app/src/main/java/com/grkj/iscs/model/Constants.kt
  32. 1 1
      app/src/main/java/com/grkj/iscs/model/FileBean.kt
  33. 1 3
      app/src/main/java/com/grkj/iscs/research/UnixTime.java
  34. 1 1
      app/src/main/java/com/grkj/iscs/research/WorkTicketBean.kt
  35. 1 1
      app/src/main/java/com/grkj/iscs/util/CRC16.java
  36. 1 1
      app/src/main/java/com/grkj/iscs/util/DownloadCallBack.kt
  37. 1 1
      app/src/main/java/com/grkj/iscs/util/Executor.kt
  38. 1 3
      app/src/main/java/com/grkj/iscs/util/FileUtil.kt
  39. 1 1
      app/src/main/java/com/grkj/iscs/util/Funcs.kt
  40. 2 2
      app/src/main/java/com/grkj/iscs/util/NetHttpManager.kt
  41. 2 2
      app/src/main/java/com/grkj/iscs/util/ToastUtils.kt
  42. 1 1
      app/src/main/java/com/grkj/iscs/util/log/ILog.kt
  43. 1 1
      app/src/main/java/com/grkj/iscs/util/log/LogDiskStrategy.kt
  44. 1 1
      app/src/main/java/com/grkj/iscs/util/log/LogHandle.kt
  45. 1 1
      app/src/main/java/com/grkj/iscs/util/log/LogUtil.kt
  46. 1 1
      app/src/main/java/com/grkj/iscs/util/log/LogWriteHandler.kt
  47. 2 2
      app/src/main/java/com/grkj/iscs/util/log/MyCsvFormatStrategy.kt
  48. 1 1
      app/src/main/java/com/grkj/iscs/util/log/MyDiskLogStrategy.kt
  49. 1 1
      app/src/main/res/values-night/themes.xml
  50. 1 1
      app/src/main/res/values/strings.xml
  51. 2 2
      app/src/main/res/values/themes.xml
  52. 1 1
      app/src/test/java/com/grkj/iscs/ExampleUnitTest.kt
  53. 1 1
      settings.gradle

+ 1 - 0
.idea/.name

@@ -0,0 +1 @@
+ISCS

+ 2 - 2
app/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace 'com.example.whatever'
+    namespace 'com.grkj.iscs'
     compileSdk 34
     viewBinding.enabled = true
 
@@ -13,7 +13,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.example.whatever"
+        applicationId "com.grkj.iscs"
         minSdk 24
         targetSdk 34
         versionCode 1

+ 1 - 1
app/src/androidTest/java/com/example/whatever/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/grkj/iscs/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.example.whatever
+package com.grkj.iscs
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

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

@@ -18,7 +18,7 @@
         android:networkSecurityConfig="@xml/common_network_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Whatever"
+        android:theme="@style/Theme.ISCS"
         tools:targetApi="31" >
         <activity
             android:name=".activity.CmdActivity"

+ 1 - 1
app/src/main/java/com/example/whatever/CustomBleGattCallback.kt → app/src/main/java/com/grkj/iscs/CustomBleGattCallback.kt

@@ -1,4 +1,4 @@
-package com.example.whatever
+package com.grkj.iscs
 
 import com.clj.fastble.callback.BleGattCallback
 

+ 1 - 1
app/src/main/java/com/example/whatever/CustomBleIndicateCallback.kt → app/src/main/java/com/grkj/iscs/CustomBleIndicateCallback.kt

@@ -1,4 +1,4 @@
-package com.example.whatever
+package com.grkj.iscs
 
 import com.clj.fastble.callback.BleIndicateCallback
 

+ 1 - 1
app/src/main/java/com/example/whatever/CustomBleScanCallback.kt → app/src/main/java/com/grkj/iscs/CustomBleScanCallback.kt

@@ -1,4 +1,4 @@
-package com.example.whatever
+package com.grkj.iscs
 
 import com.clj.fastble.callback.BleScanCallback
 

+ 1 - 1
app/src/main/java/com/example/whatever/CustomBleWriteCallback.kt → app/src/main/java/com/grkj/iscs/CustomBleWriteCallback.kt

@@ -1,4 +1,4 @@
-package com.example.whatever
+package com.grkj.iscs
 
 import com.clj.fastble.callback.BleWriteCallback
 

+ 4 - 4
app/src/main/java/com/example/whatever/MyApplication.kt → app/src/main/java/com/grkj/iscs/MyApplication.kt

@@ -1,11 +1,11 @@
-package com.example.whatever
+package com.grkj.iscs
 
 import android.app.Application
 import android.content.Context
 import androidx.multidex.MultiDex
-import com.example.whatever.ble.BleUtil
-import com.example.whatever.util.FileUtil
-import com.example.whatever.util.log.LogUtil
+import com.grkj.iscs.ble.BleUtil
+import com.grkj.iscs.util.FileUtil
+import com.grkj.iscs.util.log.LogUtil
 
 class MyApplication : Application() {
 

+ 1 - 1
app/src/main/java/com/example/whatever/RealResponse.kt → app/src/main/java/com/grkj/iscs/RealResponse.kt

@@ -1,3 +1,3 @@
-package com.example.whatever
+package com.grkj.iscs
 
 data class RealResponse(val code: Int, val msg: String, val data: Any?)

+ 1 - 1
app/src/main/java/com/example/whatever/Token.kt → app/src/main/java/com/grkj/iscs/Token.kt

@@ -1,4 +1,4 @@
-package com.example.whatever
+package com.grkj.iscs
 
 import android.content.Context
 import android.content.SharedPreferences

+ 1 - 1
app/src/main/java/com/example/whatever/activity/BaseBindingActivity.kt → app/src/main/java/com/grkj/iscs/activity/BaseBindingActivity.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.activity
+package com.grkj.iscs.activity
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity

+ 16 - 16
app/src/main/java/com/example/whatever/activity/BleActivity.kt → app/src/main/java/com/grkj/iscs/activity/BleActivity.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.activity
+package com.grkj.iscs.activity
 
 import android.Manifest.permission.ACCESS_COARSE_LOCATION
 import android.Manifest.permission.ACCESS_FINE_LOCATION
@@ -13,21 +13,21 @@ import android.util.Log
 import com.clj.fastble.BleManager
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
-import com.example.whatever.CustomBleGattCallback
-import com.example.whatever.CustomBleIndicateCallback
-import com.example.whatever.CustomBleScanCallback
-import com.example.whatever.CustomBleWriteCallback
-import com.example.whatever.R
-import com.example.whatever.databinding.ActivityBleBinding
-import com.example.whatever.model.BleBean
-import com.example.whatever.model.Constants.PERMISSION_REQUEST_CODE
-import com.example.whatever.ble.BleConst.INDICATE_UUID
-import com.example.whatever.ble.BleConst.SERVICE_UUID
-import com.example.whatever.ble.BleCmdManager
-import com.example.whatever.extentions.toHexStrings
-import com.example.whatever.util.ToastUtils
-import com.example.whatever.ble.BleUtil
-import com.example.whatever.util.log.LogUtil
+import com.grkj.iscs.CustomBleGattCallback
+import com.grkj.iscs.CustomBleIndicateCallback
+import com.grkj.iscs.CustomBleScanCallback
+import com.grkj.iscs.CustomBleWriteCallback
+import com.grkj.iscs.R
+import com.grkj.iscs.databinding.ActivityBleBinding
+import com.grkj.iscs.model.BleBean
+import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
+import com.grkj.iscs.ble.BleConst.INDICATE_UUID
+import com.grkj.iscs.ble.BleConst.SERVICE_UUID
+import com.grkj.iscs.ble.BleCmdManager
+import com.grkj.iscs.extentions.toHexStrings
+import com.grkj.iscs.util.ToastUtils
+import com.grkj.iscs.ble.BleUtil
+import com.grkj.iscs.util.log.LogUtil
 import com.leon.lfilepickerlibrary.LFilePicker
 import com.zhy.adapter.recyclerview.CommonAdapter
 import com.zhy.adapter.recyclerview.base.ViewHolder

+ 6 - 6
app/src/main/java/com/example/whatever/activity/CmdActivity.kt → app/src/main/java/com/grkj/iscs/activity/CmdActivity.kt

@@ -1,12 +1,12 @@
-package com.example.whatever.activity
+package com.grkj.iscs.activity
 
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
-import com.example.whatever.CustomBleIndicateCallback
-import com.example.whatever.CustomBleWriteCallback
-import com.example.whatever.databinding.ActivityCmdBinding
-import com.example.whatever.ble.BleCmdManager
-import com.example.whatever.ble.BleUtil
+import com.grkj.iscs.CustomBleIndicateCallback
+import com.grkj.iscs.CustomBleWriteCallback
+import com.grkj.iscs.databinding.ActivityCmdBinding
+import com.grkj.iscs.ble.BleCmdManager
+import com.grkj.iscs.ble.BleUtil
 
 class CmdActivity : BaseBindingActivity<ActivityCmdBinding>() {
 

+ 2 - 5
app/src/main/java/com/example/whatever/activity/MainActivity.kt → app/src/main/java/com/grkj/iscs/activity/MainActivity.kt

@@ -1,10 +1,7 @@
-package com.example.whatever.activity
+package com.grkj.iscs.activity
 
 import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.example.whatever.R
-import com.example.whatever.databinding.ActivityMainBinding
+import com.grkj.iscs.databinding.ActivityMainBinding
 
 class MainActivity : BaseBindingActivity<ActivityMainBinding>() {
 

+ 3 - 3
app/src/main/java/com/example/whatever/activity/ModbusActivity.kt → app/src/main/java/com/grkj/iscs/activity/ModbusActivity.kt

@@ -1,7 +1,7 @@
-package com.example.whatever.activity
+package com.grkj.iscs.activity
 
-import com.example.whatever.databinding.ActivityModbusBinding
-import com.example.whatever.modbus.ModBusController
+import com.grkj.iscs.databinding.ActivityModbusBinding
+import com.grkj.iscs.modbus.ModBusController
 
 class ModbusActivity : BaseBindingActivity<ActivityModbusBinding>() {
     override val viewBinding: ActivityModbusBinding

+ 2 - 2
app/src/main/java/com/example/whatever/activity/ScreenAdaptActivity.kt → app/src/main/java/com/grkj/iscs/activity/ScreenAdaptActivity.kt

@@ -1,8 +1,8 @@
-package com.example.whatever.activity
+package com.grkj.iscs.activity
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.example.whatever.databinding.ActivityScreenAdaptBinding
+import com.grkj.iscs.databinding.ActivityScreenAdaptBinding
 
 class ScreenAdaptActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

+ 2 - 2
app/src/main/java/com/example/whatever/activity/WebActivity.kt → app/src/main/java/com/grkj/iscs/activity/WebActivity.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.activity
+package com.grkj.iscs.activity
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -6,7 +6,7 @@ import android.view.KeyEvent
 import android.view.View
 import android.webkit.WebViewClient
 import androidx.appcompat.app.AppCompatActivity
-import com.example.whatever.databinding.ActivityWebBinding
+import com.grkj.iscs.databinding.ActivityWebBinding
 
 
 class WebActivity : AppCompatActivity() {

+ 19 - 19
app/src/main/java/com/example/whatever/ble/BleCmdManager.kt → app/src/main/java/com/grkj/iscs/ble/BleCmdManager.kt

@@ -1,25 +1,25 @@
-package com.example.whatever.ble
+package com.grkj.iscs.ble
 
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
-import com.example.whatever.CustomBleWriteCallback
-import com.example.whatever.extentions.crc16
-import com.example.whatever.extentions.startsWith
-import com.example.whatever.extentions.toByteArray
-import com.example.whatever.extentions.toHexStrings
-import com.example.whatever.model.BleBean
-import com.example.whatever.ble.BleConst.REQ_CURRENT_STATUS
-import com.example.whatever.ble.BleConst.REQ_GET_TOKEN
-import com.example.whatever.ble.BleConst.REQ_GET_VERSION
-import com.example.whatever.ble.BleConst.REQ_POWER_STATUS
-import com.example.whatever.ble.BleConst.REQ_SEND_WORK_TICKET
-import com.example.whatever.ble.BleConst.REQ_SWITCH_MODE
-import com.example.whatever.ble.BleConst.REQ_TRANSFER_FILE
-import com.example.whatever.ble.BleConst.REQ_WORK_TICKET_RESULT
-import com.example.whatever.ble.BleConst.REQ_WORK_TICKET_RESULT_PART
-import com.example.whatever.ble.BleConst.WRITE_UUID
-import com.example.whatever.util.Executor
-import com.example.whatever.util.log.LogUtil
+import com.grkj.iscs.CustomBleWriteCallback
+import com.grkj.iscs.extentions.crc16
+import com.grkj.iscs.extentions.startsWith
+import com.grkj.iscs.extentions.toByteArray
+import com.grkj.iscs.extentions.toHexStrings
+import com.grkj.iscs.model.BleBean
+import com.grkj.iscs.ble.BleConst.REQ_CURRENT_STATUS
+import com.grkj.iscs.ble.BleConst.REQ_GET_TOKEN
+import com.grkj.iscs.ble.BleConst.REQ_GET_VERSION
+import com.grkj.iscs.ble.BleConst.REQ_POWER_STATUS
+import com.grkj.iscs.ble.BleConst.REQ_SEND_WORK_TICKET
+import com.grkj.iscs.ble.BleConst.REQ_SWITCH_MODE
+import com.grkj.iscs.ble.BleConst.REQ_TRANSFER_FILE
+import com.grkj.iscs.ble.BleConst.REQ_WORK_TICKET_RESULT
+import com.grkj.iscs.ble.BleConst.REQ_WORK_TICKET_RESULT_PART
+import com.grkj.iscs.ble.BleConst.WRITE_UUID
+import com.grkj.iscs.util.Executor
+import com.grkj.iscs.util.log.LogUtil
 import java.io.File
 
 /**

+ 1 - 1
app/src/main/java/com/example/whatever/ble/BleConst.kt → app/src/main/java/com/grkj/iscs/ble/BleConst.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.ble
+package com.grkj.iscs.ble
 
 /**
  * 指令,均为未加密或解密后的

+ 10 - 11
app/src/main/java/com/example/whatever/ble/BleUtil.kt → app/src/main/java/com/grkj/iscs/ble/BleUtil.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.ble
+package com.grkj.iscs.ble
 
 import android.app.Application
 import android.bluetooth.BluetoothGatt
@@ -10,16 +10,15 @@ import com.clj.fastble.callback.BleMtuChangedCallback
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
 import com.clj.fastble.scan.BleScanRuleConfig
-import com.example.whatever.CustomBleGattCallback
-import com.example.whatever.CustomBleIndicateCallback
-import com.example.whatever.CustomBleScanCallback
-import com.example.whatever.CustomBleWriteCallback
-import com.example.whatever.model.BleBean
-import com.example.whatever.model.Constants.BLE_LOCAL_NAME
-import com.example.whatever.ble.BleConst.INDICATE_UUID
-import com.example.whatever.ble.BleConst.MTU
-import com.example.whatever.ble.BleConst.SERVICE_UUID
-import com.example.whatever.ble.BleConst.WRITE_UUID
+import com.grkj.iscs.CustomBleGattCallback
+import com.grkj.iscs.CustomBleIndicateCallback
+import com.grkj.iscs.CustomBleScanCallback
+import com.grkj.iscs.CustomBleWriteCallback
+import com.grkj.iscs.model.BleBean
+import com.grkj.iscs.model.Constants.BLE_LOCAL_NAME
+import com.grkj.iscs.ble.BleConst.INDICATE_UUID
+import com.grkj.iscs.ble.BleConst.MTU
+import com.grkj.iscs.ble.BleConst.SERVICE_UUID
 
 /**
  * 蓝牙工具类

+ 1 - 1
app/src/main/java/com/example/whatever/ble/KeyGenerator.java → app/src/main/java/com/grkj/iscs/ble/KeyGenerator.java

@@ -1,4 +1,4 @@
-package com.example.whatever.ble;
+package com.grkj.iscs.ble;
 
 /**
  * 蓝牙 章节 4.1

+ 2 - 2
app/src/main/java/com/example/whatever/extentions/ByteArray.kt → app/src/main/java/com/grkj/iscs/extentions/ByteArray.kt

@@ -1,7 +1,7 @@
-package com.example.whatever.extentions
+package com.grkj.iscs.extentions
 
 import android.util.Base64
-import com.example.whatever.util.CRC16
+import com.grkj.iscs.util.CRC16
 import java.io.ByteArrayOutputStream
 import kotlin.experimental.xor
 

+ 1 - 1
app/src/main/java/com/example/whatever/extentions/Int.kt → app/src/main/java/com/grkj/iscs/extentions/Int.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.extentions
+package com.grkj.iscs.extentions
 
 //fun Int.toByteArray(capability: Int = 2): ByteArray {
 //    return ByteBuffer.allocate(capability)

+ 1 - 1
app/src/main/java/com/example/whatever/extentions/Long.kt → app/src/main/java/com/grkj/iscs/extentions/Long.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.extentions
+package com.grkj.iscs.extentions
 
 import java.nio.ByteBuffer
 import java.nio.ByteOrder

+ 1 - 1
app/src/main/java/com/example/whatever/extentions/String.kt → app/src/main/java/com/grkj/iscs/extentions/String.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.extentions
+package com.grkj.iscs.extentions
 
 /**
  * 长度不足默认补0

+ 4 - 4
app/src/main/java/com/example/whatever/modbus/ModBusController.kt → app/src/main/java/com/grkj/iscs/modbus/ModBusController.kt

@@ -1,9 +1,9 @@
-package com.example.whatever.modbus
+package com.grkj.iscs.modbus
 
 import android.content.Context
-import com.example.whatever.extentions.toHexStrings
-import com.example.whatever.util.Executor
-import com.example.whatever.util.log.LogUtil
+import com.grkj.iscs.extentions.toHexStrings
+import com.grkj.iscs.util.Executor
+import com.grkj.iscs.util.log.LogUtil
 import java.util.*
 import java.util.concurrent.Executors
 

+ 6 - 6
app/src/main/java/com/example/whatever/modbus/ModBusManager.kt → app/src/main/java/com/grkj/iscs/modbus/ModBusManager.kt

@@ -1,10 +1,10 @@
-package com.example.whatever.modbus
+package com.grkj.iscs.modbus
 
-import com.example.whatever.extentions.crc16
-import com.example.whatever.extentions.toHexStrings
-import com.example.whatever.util.Executor
-import com.example.whatever.util.jvmSeconds
-import com.example.whatever.util.log.LogUtil
+import com.grkj.iscs.extentions.crc16
+import com.grkj.iscs.extentions.toHexStrings
+import com.grkj.iscs.util.Executor
+import com.grkj.iscs.util.jvmSeconds
+import com.grkj.iscs.util.log.LogUtil
 import java.util.concurrent.LinkedBlockingQueue
 
 /**

+ 3 - 6
app/src/main/java/com/example/whatever/modbus/PortManager.kt → app/src/main/java/com/grkj/iscs/modbus/PortManager.kt

@@ -1,17 +1,14 @@
-package com.example.whatever.modbus
+package com.grkj.iscs.modbus
 
 import android.content.Context
 import androidx.annotation.WorkerThread
 import com.epton.sdk.SerialPort
-import com.example.whatever.util.Executor
-import com.example.whatever.util.log.LogUtil
+import com.grkj.iscs.util.Executor
+import com.grkj.iscs.util.log.LogUtil
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
-import java.util.concurrent.Executors
-import java.util.concurrent.ScheduledExecutorService
-import java.util.concurrent.TimeUnit
 
 /**
  * 串口通信管理器

+ 1 - 1
app/src/main/java/com/example/whatever/model/BleBean.kt → app/src/main/java/com/grkj/iscs/model/BleBean.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.model
+package com.grkj.iscs.model
 
 import com.clj.fastble.data.BleDevice
 import java.io.File

+ 1 - 1
app/src/main/java/com/example/whatever/model/Constants.kt → app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.model
+package com.grkj.iscs.model
 
 object Constants {
     const val PERMISSION_REQUEST_CODE = 1

+ 1 - 1
app/src/main/java/com/example/whatever/model/FileBean.kt → app/src/main/java/com/grkj/iscs/model/FileBean.kt

@@ -1,3 +1,3 @@
-package com.example.whatever.model
+package com.grkj.iscs.model
 
 data class FileBean(var fileName:String?, var pathStr:String, var isAssets:Boolean)

+ 1 - 3
app/src/main/java/com/example/whatever/research/UnixTime.java → app/src/main/java/com/grkj/iscs/research/UnixTime.java

@@ -1,6 +1,4 @@
-package com.example.whatever.research;
-
-import java.time.Instant;
+package com.grkj.iscs.research;
 
 public class UnixTime {
 

+ 1 - 1
app/src/main/java/com/example/whatever/research/WorkTicketBean.kt → app/src/main/java/com/grkj/iscs/research/WorkTicketBean.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.research
+package com.grkj.iscs.research
 
 class WorkTicketBean {
     /**

+ 1 - 1
app/src/main/java/com/example/whatever/util/CRC16.java → app/src/main/java/com/grkj/iscs/util/CRC16.java

@@ -1,4 +1,4 @@
-package com.example.whatever.util;
+package com.grkj.iscs.util;
 
 public class CRC16 {
 

+ 1 - 1
app/src/main/java/com/example/whatever/util/DownloadCallBack.kt → app/src/main/java/com/grkj/iscs/util/DownloadCallBack.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util
+package com.grkj.iscs.util
 
 import cn.zhxu.okhttps.Process
 import java.io.File

+ 1 - 1
app/src/main/java/com/example/whatever/util/Executor.kt → app/src/main/java/com/grkj/iscs/util/Executor.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util
+package com.grkj.iscs.util
 
 import android.os.Handler
 import android.os.Looper

+ 1 - 3
app/src/main/java/com/example/whatever/util/FileUtil.kt → app/src/main/java/com/grkj/iscs/util/FileUtil.kt

@@ -1,11 +1,9 @@
-package com.example.whatever.util
+package com.grkj.iscs.util
 
 import android.content.Context
 import android.os.Environment
 import java.io.*
 import java.io.File.separator
-import java.text.SimpleDateFormat
-import java.util.*
 
 class FileUtil {
     companion object{

+ 1 - 1
app/src/main/java/com/example/whatever/util/Funcs.kt → app/src/main/java/com/grkj/iscs/util/Funcs.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util
+package com.grkj.iscs.util
 
 import android.content.Context
 import android.os.Environment

+ 2 - 2
app/src/main/java/com/example/whatever/util/NetHttpManager.kt → app/src/main/java/com/grkj/iscs/util/NetHttpManager.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util
+package com.grkj.iscs.util
 
 import android.content.Context
 import android.util.Log
@@ -9,7 +9,7 @@ import cn.zhxu.okhttps.HttpTask
 import cn.zhxu.okhttps.OkHttps
 import cn.zhxu.okhttps.gson.GsonMsgConvertor
 import cn.zhxu.okhttps.okhttp.OkHttpClientWrapper
-import com.example.whatever.Token
+import com.grkj.iscs.Token
 import okhttp3.logging.HttpLoggingInterceptor
 import java.io.IOException
 import java.net.SocketTimeoutException

+ 2 - 2
app/src/main/java/com/example/whatever/util/ToastUtils.kt → app/src/main/java/com/grkj/iscs/util/ToastUtils.kt

@@ -1,9 +1,9 @@
-package com.example.whatever.util
+package com.grkj.iscs.util
 
 import android.content.Context
 import android.os.Looper
 import android.widget.Toast
-import com.example.whatever.MyApplication
+import com.grkj.iscs.MyApplication
 
 class ToastUtils private constructor(context: Context) : Toast(context) {
 

+ 1 - 1
app/src/main/java/com/example/whatever/util/log/ILog.kt → app/src/main/java/com/grkj/iscs/util/log/ILog.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util.log
+package com.grkj.iscs.util.log
 
 import android.content.Context
 

+ 1 - 1
app/src/main/java/com/example/whatever/util/log/LogDiskStrategy.kt → app/src/main/java/com/grkj/iscs/util/log/LogDiskStrategy.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util.log
+package com.grkj.iscs.util.log
 
 import android.os.Handler
 import com.orhanobut.logger.DiskLogStrategy

+ 1 - 1
app/src/main/java/com/example/whatever/util/log/LogHandle.kt → app/src/main/java/com/grkj/iscs/util/log/LogHandle.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util.log
+package com.grkj.iscs.util.log
 
 import android.content.Context
 import android.os.Handler

+ 1 - 1
app/src/main/java/com/example/whatever/util/log/LogUtil.kt → app/src/main/java/com/grkj/iscs/util/log/LogUtil.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util.log
+package com.grkj.iscs.util.log
 
 import android.content.Context
 import android.util.Log

+ 1 - 1
app/src/main/java/com/example/whatever/util/log/LogWriteHandler.kt → app/src/main/java/com/grkj/iscs/util/log/LogWriteHandler.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util.log
+package com.grkj.iscs.util.log
 
 import android.os.Handler
 import android.os.Looper

+ 2 - 2
app/src/main/java/com/example/whatever/util/log/MyCsvFormatStrategy.kt → app/src/main/java/com/grkj/iscs/util/log/MyCsvFormatStrategy.kt

@@ -1,10 +1,10 @@
-package com.example.whatever.util.log
+package com.grkj.iscs.util.log
 
 import android.content.Context
 import android.os.Handler
 import android.os.HandlerThread
 import android.text.TextUtils
-import com.example.whatever.util.FileUtil
+import com.grkj.iscs.util.FileUtil
 import com.orhanobut.logger.FormatStrategy
 import com.orhanobut.logger.LogStrategy
 import com.orhanobut.logger.Logger

+ 1 - 1
app/src/main/java/com/example/whatever/util/log/MyDiskLogStrategy.kt → app/src/main/java/com/grkj/iscs/util/log/MyDiskLogStrategy.kt

@@ -1,4 +1,4 @@
-package com.example.whatever.util.log
+package com.grkj.iscs.util.log
 
 import android.os.Handler
 import android.os.Looper

+ 1 - 1
app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.Whatever" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.ISCS" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
     </style>

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Whatever</string>
+    <string name="app_name">ISCS</string>
 </resources>

+ 2 - 2
app/src/main/res/values/themes.xml

@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.Whatever" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.ISCS" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
     </style>
 
-    <style name="Theme.Whatever" parent="Base.Theme.Whatever" />
+    <style name="Theme.ISCS" parent="Base.Theme.ISCS" />
 </resources>

+ 1 - 1
app/src/test/java/com/example/whatever/ExampleUnitTest.kt → app/src/test/java/com/grkj/iscs/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.example.whatever
+package com.grkj.iscs
 
 import org.junit.Test
 

+ 1 - 1
settings.gradle

@@ -26,5 +26,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Whatever"
+rootProject.name = "ISCS"
 include ':app'