diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6a4c1c4..3be2d50 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } android { - namespace = "com.example.defenseapplication" + namespace = "com.ckkj.defense_device" compileSdk { version = release(36) { minorApiLevel = 1 @@ -11,7 +11,7 @@ android { } defaultConfig { - applicationId = "com.example.defenseapplication" + applicationId = "com.ckkj.defense_device" minSdk = 24 targetSdk = 30 versionCode = 1 diff --git a/app/src/androidTest/java/com/example/defenseapplication/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/ckkj/defense_device/ExampleInstrumentedTest.kt similarity index 94% rename from app/src/androidTest/java/com/example/defenseapplication/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/ckkj/defense_device/ExampleInstrumentedTest.kt index db36c1d..7d831b5 100644 --- a/app/src/androidTest/java/com/example/defenseapplication/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/ckkj/defense_device/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication +package com.ckkj.defense_device import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/java/com/example/defenseapplication/MyApplication.kt b/app/src/main/java/com/ckkj/defense_device/MyApplication.kt similarity index 61% rename from app/src/main/java/com/example/defenseapplication/MyApplication.kt rename to app/src/main/java/com/ckkj/defense_device/MyApplication.kt index d282655..b137d7a 100644 --- a/app/src/main/java/com/example/defenseapplication/MyApplication.kt +++ b/app/src/main/java/com/ckkj/defense_device/MyApplication.kt @@ -1,14 +1,9 @@ -package com.example.defenseapplication +package com.ckkj.defense_device import android.app.Application import android.content.Context -import bean.LoginBean import com.blankj.utilcode.util.Utils -import com.example.defenseapplication.bean.BaseInfo -import com.example.defenseapplication.utils.ApiConfig -import com.example.defenseapplication.utils.LanguageUtil -import com.example.defenseapplication.utils.UserinfoUtil -import com.google.gson.Gson +import com.ckkj.defense_device.utils.LanguageUtil class MyApplication : Application() { diff --git a/app/src/main/java/com/example/defenseapplication/adapter/AddDeviceAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/AddDeviceAdapter.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/adapter/AddDeviceAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/AddDeviceAdapter.kt index 463847f..92e4cba 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/AddDeviceAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/AddDeviceAdapter.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater import android.view.View @@ -6,7 +6,7 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R +import com.ckkj.defense_device.R data class Device( val name: String, diff --git a/app/src/main/java/com/example/defenseapplication/adapter/AddLinkedUserAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/AddLinkedUserAdapter.kt similarity index 91% rename from app/src/main/java/com/example/defenseapplication/adapter/AddLinkedUserAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/AddLinkedUserAdapter.kt index 4b6ec3e..6639915 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/AddLinkedUserAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/AddLinkedUserAdapter.kt @@ -1,11 +1,10 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.graphics.Color import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.ItemAddLinkedUserBinding +import com.ckkj.defense_device.databinding.ItemAddLinkedUserBinding data class UserItem(val name: String, val phone: String, val userId: String = "") diff --git a/app/src/main/java/com/example/defenseapplication/adapter/AlarmLogAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/AlarmLogAdapter.kt similarity index 86% rename from app/src/main/java/com/example/defenseapplication/adapter/AlarmLogAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/AlarmLogAdapter.kt index c648e23..cdbf5ff 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/AlarmLogAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/AlarmLogAdapter.kt @@ -1,10 +1,10 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.bean.DeviceAlarmBean -import com.example.defenseapplication.databinding.ItemAlarmLogBinding +import com.ckkj.defense_device.bean.DeviceAlarmBean +import com.ckkj.defense_device.databinding.ItemAlarmLogBinding class AlarmLogAdapter( private val items: List, diff --git a/app/src/main/java/com/example/defenseapplication/adapter/AlarmLogHorizontalAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/AlarmLogHorizontalAdapter.kt similarity index 88% rename from app/src/main/java/com/example/defenseapplication/adapter/AlarmLogHorizontalAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/AlarmLogHorizontalAdapter.kt index 748238d..9ccf297 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/AlarmLogHorizontalAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/AlarmLogHorizontalAdapter.kt @@ -1,11 +1,11 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.defenseapplication.bean.DeviceAlarmBean -import com.example.defenseapplication.databinding.ItemAlarmLogHorizontalBinding +import com.ckkj.defense_device.bean.DeviceAlarmBean +import com.ckkj.defense_device.databinding.ItemAlarmLogHorizontalBinding class AlarmLogHorizontalAdapter( private val items: List, diff --git a/app/src/main/java/com/example/defenseapplication/adapter/DeviceAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/DeviceAdapter.kt similarity index 93% rename from app/src/main/java/com/example/defenseapplication/adapter/DeviceAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/DeviceAdapter.kt index 38675c5..cf890d4 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/DeviceAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/DeviceAdapter.kt @@ -1,10 +1,10 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.ItemDeviceBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.ItemDeviceBinding data class DeviceUi( val name: String, diff --git a/app/src/main/java/com/example/defenseapplication/adapter/FamilyAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/FamilyAdapter.kt similarity index 93% rename from app/src/main/java/com/example/defenseapplication/adapter/FamilyAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/FamilyAdapter.kt index 0f323fa..7a5e711 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/FamilyAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/FamilyAdapter.kt @@ -1,12 +1,12 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.bean.FamilyBean -import com.example.defenseapplication.databinding.ItemFamilyBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.FamilyBean +import com.ckkj.defense_device.databinding.ItemFamilyBinding class FamilyAdapter( private val onItemClick: (String) -> Unit diff --git a/app/src/main/java/com/example/defenseapplication/adapter/FamilySwitchAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/FamilySwitchAdapter.kt similarity index 91% rename from app/src/main/java/com/example/defenseapplication/adapter/FamilySwitchAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/FamilySwitchAdapter.kt index db9f944..0f33afe 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/FamilySwitchAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/FamilySwitchAdapter.kt @@ -1,12 +1,12 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.ItemSwitchFamilyBinding -import com.example.defenseapplication.model.FamilyItem +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.ItemSwitchFamilyBinding +import com.ckkj.defense_device.model.FamilyItem class FamilySwitchAdapter( private var familyList: List, diff --git a/app/src/main/java/com/example/defenseapplication/adapter/LinkedUserAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/LinkedUserAdapter.kt similarity index 91% rename from app/src/main/java/com/example/defenseapplication/adapter/LinkedUserAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/LinkedUserAdapter.kt index 63f0e47..d1ca480 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/LinkedUserAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/LinkedUserAdapter.kt @@ -1,11 +1,10 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.ItemLinkedUserBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.ItemLinkedUserBinding data class LinkedUser( val userId: String, diff --git a/app/src/main/java/com/example/defenseapplication/adapter/MessageListAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/MessageListAdapter.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/adapter/MessageListAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/MessageListAdapter.kt index f6fa5c4..8c6f1f3 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/MessageListAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/MessageListAdapter.kt @@ -1,11 +1,11 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.databinding.ItemMessageGroupTitleBinding -import com.example.defenseapplication.databinding.ItemMessageNoticeBinding +import com.ckkj.defense_device.databinding.ItemMessageGroupTitleBinding +import com.ckkj.defense_device.databinding.ItemMessageNoticeBinding sealed class MessageListItem { data class Header(val title: String) : MessageListItem() diff --git a/app/src/main/java/com/example/defenseapplication/adapter/WifiListAdapter.kt b/app/src/main/java/com/ckkj/defense_device/adapter/WifiListAdapter.kt similarity index 93% rename from app/src/main/java/com/example/defenseapplication/adapter/WifiListAdapter.kt rename to app/src/main/java/com/ckkj/defense_device/adapter/WifiListAdapter.kt index ae58248..58cc678 100644 --- a/app/src/main/java/com/example/defenseapplication/adapter/WifiListAdapter.kt +++ b/app/src/main/java/com/ckkj/defense_device/adapter/WifiListAdapter.kt @@ -1,9 +1,9 @@ -package com.example.defenseapplication.adapter +package com.ckkj.defense_device.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.databinding.ItemWifiBinding +import com.ckkj.defense_device.databinding.ItemWifiBinding class WifiListAdapter( wifiList: List, diff --git a/app/src/main/java/com/example/defenseapplication/base/BaseActivity.kt b/app/src/main/java/com/ckkj/defense_device/base/BaseActivity.kt similarity index 78% rename from app/src/main/java/com/example/defenseapplication/base/BaseActivity.kt rename to app/src/main/java/com/ckkj/defense_device/base/BaseActivity.kt index bb19a2a..9f9b237 100644 --- a/app/src/main/java/com/example/defenseapplication/base/BaseActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/base/BaseActivity.kt @@ -1,10 +1,10 @@ -package com.example.defenseapplication.base +package com.ckkj.defense_device.base import android.content.Context import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.utils.ActivityManager -import com.example.defenseapplication.utils.LanguageUtil +import com.ckkj.defense_device.utils.ActivityManager +import com.ckkj.defense_device.utils.LanguageUtil open class BaseActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/defenseapplication/bean/AddDeviceBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/AddDeviceBean.kt similarity index 91% rename from app/src/main/java/com/example/defenseapplication/bean/AddDeviceBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/AddDeviceBean.kt index 90c8b76..1f0f170 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/AddDeviceBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/AddDeviceBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class AddDeviceBean( val deviceEm: String? = null,//设备型号 diff --git a/app/src/main/java/com/example/defenseapplication/bean/AddDeviceUserRequest.kt b/app/src/main/java/com/ckkj/defense_device/bean/AddDeviceUserRequest.kt similarity index 77% rename from app/src/main/java/com/example/defenseapplication/bean/AddDeviceUserRequest.kt rename to app/src/main/java/com/ckkj/defense_device/bean/AddDeviceUserRequest.kt index 029ca04..839e412 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/AddDeviceUserRequest.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/AddDeviceUserRequest.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class AddDeviceUserRequest( val deviceId: String, diff --git a/app/src/main/java/com/example/defenseapplication/bean/BaseInfo.kt b/app/src/main/java/com/ckkj/defense_device/bean/BaseInfo.kt similarity index 80% rename from app/src/main/java/com/example/defenseapplication/bean/BaseInfo.kt rename to app/src/main/java/com/ckkj/defense_device/bean/BaseInfo.kt index 735e62f..c3ec8ea 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/BaseInfo.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/BaseInfo.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean /** * 统一返回数据基类(根据你的后端实际字段调整) diff --git a/app/src/main/java/com/example/defenseapplication/bean/DeleteBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/DeleteBean.kt similarity index 55% rename from app/src/main/java/com/example/defenseapplication/bean/DeleteBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/DeleteBean.kt index 593ce06..7c932ba 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/DeleteBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/DeleteBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean class DeleteBean { var deviceId: String? = null diff --git a/app/src/main/java/com/example/defenseapplication/bean/DeleteDeviceUserRequest.kt b/app/src/main/java/com/ckkj/defense_device/bean/DeleteDeviceUserRequest.kt similarity index 66% rename from app/src/main/java/com/example/defenseapplication/bean/DeleteDeviceUserRequest.kt rename to app/src/main/java/com/ckkj/defense_device/bean/DeleteDeviceUserRequest.kt index 1ecbade..7c41d0f 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/DeleteDeviceUserRequest.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/DeleteDeviceUserRequest.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class DeleteDeviceUserRequest( val userId: String, diff --git a/app/src/main/java/com/example/defenseapplication/bean/DeviceAlarmBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/DeviceAlarmBean.kt similarity index 97% rename from app/src/main/java/com/example/defenseapplication/bean/DeviceAlarmBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/DeviceAlarmBean.kt index dd7f161..1e14d8c 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/DeviceAlarmBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/DeviceAlarmBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean import android.os.Parcel import android.os.Parcelable diff --git a/app/src/main/java/com/example/defenseapplication/bean/DeviceAlarmResponse.kt b/app/src/main/java/com/ckkj/defense_device/bean/DeviceAlarmResponse.kt similarity index 67% rename from app/src/main/java/com/example/defenseapplication/bean/DeviceAlarmResponse.kt rename to app/src/main/java/com/ckkj/defense_device/bean/DeviceAlarmResponse.kt index abdfa21..6414776 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/DeviceAlarmResponse.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/DeviceAlarmResponse.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class DeviceAlarmResponse( val total: Int, diff --git a/app/src/main/java/com/example/defenseapplication/bean/DeviceBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/DeviceBean.kt similarity index 96% rename from app/src/main/java/com/example/defenseapplication/bean/DeviceBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/DeviceBean.kt index 8993a02..f2cf771 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/DeviceBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/DeviceBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class DeviceBean( val alertAudio: String? = null,//告警播放 diff --git a/app/src/main/java/com/example/defenseapplication/bean/DeviceUserBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/DeviceUserBean.kt similarity index 94% rename from app/src/main/java/com/example/defenseapplication/bean/DeviceUserBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/DeviceUserBean.kt index 35b57ad..6065574 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/DeviceUserBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/DeviceUserBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class DeviceUserBean( val createDept: Int ? = null, //创建部门 diff --git a/app/src/main/java/com/example/defenseapplication/bean/FamilyBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/FamilyBean.kt similarity index 87% rename from app/src/main/java/com/example/defenseapplication/bean/FamilyBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/FamilyBean.kt index 76e6940..a400026 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/FamilyBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/FamilyBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class FamilyBean( val id: String, diff --git a/app/src/main/java/com/example/defenseapplication/bean/FamilyMembersBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/FamilyMembersBean.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/bean/FamilyMembersBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/FamilyMembersBean.kt index 20e7e04..024ab55 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/FamilyMembersBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/FamilyMembersBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class FamilyMembersBean( val id: String? = null, // ID diff --git a/app/src/main/java/com/example/defenseapplication/bean/GetCodeBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/GetCodeBean.kt similarity index 65% rename from app/src/main/java/com/example/defenseapplication/bean/GetCodeBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/GetCodeBean.kt index 780cce5..e6aa320 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/GetCodeBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/GetCodeBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class GetCodeBean ( val code:Int, diff --git a/app/src/main/java/com/example/defenseapplication/bean/LoginBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/LoginBean.kt similarity index 100% rename from app/src/main/java/com/example/defenseapplication/bean/LoginBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/LoginBean.kt diff --git a/app/src/main/java/com/example/defenseapplication/bean/MessageBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/MessageBean.kt similarity index 97% rename from app/src/main/java/com/example/defenseapplication/bean/MessageBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/MessageBean.kt index 69665f6..9c88ee9 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/MessageBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/MessageBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean import android.os.Parcel import android.os.Parcelable diff --git a/app/src/main/java/com/example/defenseapplication/bean/MessageListResponse.kt b/app/src/main/java/com/ckkj/defense_device/bean/MessageListResponse.kt similarity index 66% rename from app/src/main/java/com/example/defenseapplication/bean/MessageListResponse.kt rename to app/src/main/java/com/ckkj/defense_device/bean/MessageListResponse.kt index 5b521ed..ff0a49e 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/MessageListResponse.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/MessageListResponse.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class MessageListResponse( val total: Int, diff --git a/app/src/main/java/com/example/defenseapplication/bean/ObtainInviterInformationBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/ObtainInviterInformationBean.kt similarity index 85% rename from app/src/main/java/com/example/defenseapplication/bean/ObtainInviterInformationBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/ObtainInviterInformationBean.kt index 7590bb5..360f335 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/ObtainInviterInformationBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/ObtainInviterInformationBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class ObtainInviterInformationBean( val nickName: String? = null, diff --git a/app/src/main/java/com/example/defenseapplication/bean/ObtainInviterInformationRequest.kt b/app/src/main/java/com/ckkj/defense_device/bean/ObtainInviterInformationRequest.kt similarity index 61% rename from app/src/main/java/com/example/defenseapplication/bean/ObtainInviterInformationRequest.kt rename to app/src/main/java/com/ckkj/defense_device/bean/ObtainInviterInformationRequest.kt index f08bf2c..94e75c7 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/ObtainInviterInformationRequest.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/ObtainInviterInformationRequest.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class ObtainInviterInformationRequest( val childId: String diff --git a/app/src/main/java/com/example/defenseapplication/bean/SwitchFamilyRequest.kt b/app/src/main/java/com/ckkj/defense_device/bean/SwitchFamilyRequest.kt similarity index 77% rename from app/src/main/java/com/example/defenseapplication/bean/SwitchFamilyRequest.kt rename to app/src/main/java/com/ckkj/defense_device/bean/SwitchFamilyRequest.kt index 757e4ae..5ce7a59 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/SwitchFamilyRequest.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/SwitchFamilyRequest.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class SwitchFamilyRequest( val clientId: String, diff --git a/app/src/main/java/com/example/defenseapplication/bean/UpdatePassword.kt b/app/src/main/java/com/ckkj/defense_device/bean/UpdatePassword.kt similarity index 65% rename from app/src/main/java/com/example/defenseapplication/bean/UpdatePassword.kt rename to app/src/main/java/com/ckkj/defense_device/bean/UpdatePassword.kt index cf5da5a..65735f0 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/UpdatePassword.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/UpdatePassword.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class UpdatePassword( val oldPassword: String, diff --git a/app/src/main/java/com/example/defenseapplication/bean/UpdateUserInfo.kt b/app/src/main/java/com/ckkj/defense_device/bean/UpdateUserInfo.kt similarity index 91% rename from app/src/main/java/com/example/defenseapplication/bean/UpdateUserInfo.kt rename to app/src/main/java/com/ckkj/defense_device/bean/UpdateUserInfo.kt index cfcdc5f..e82e160 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/UpdateUserInfo.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/UpdateUserInfo.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class UpdateUserInfo( val userId: String?=null, diff --git a/app/src/main/java/com/example/defenseapplication/bean/UploadResponse.kt b/app/src/main/java/com/ckkj/defense_device/bean/UploadResponse.kt similarity index 81% rename from app/src/main/java/com/example/defenseapplication/bean/UploadResponse.kt rename to app/src/main/java/com/ckkj/defense_device/bean/UploadResponse.kt index 8939fca..85f0377 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/UploadResponse.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/UploadResponse.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class UploadResponse( val code: Int, diff --git a/app/src/main/java/com/example/defenseapplication/bean/UserInfoBean.kt b/app/src/main/java/com/ckkj/defense_device/bean/UserInfoBean.kt similarity index 90% rename from app/src/main/java/com/example/defenseapplication/bean/UserInfoBean.kt rename to app/src/main/java/com/ckkj/defense_device/bean/UserInfoBean.kt index 8b4648a..f768438 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/UserInfoBean.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/UserInfoBean.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean import java.io.Serializable diff --git a/app/src/main/java/com/example/defenseapplication/bean/VerifyOptionPasswordRequest.kt b/app/src/main/java/com/ckkj/defense_device/bean/VerifyOptionPasswordRequest.kt similarity index 62% rename from app/src/main/java/com/example/defenseapplication/bean/VerifyOptionPasswordRequest.kt rename to app/src/main/java/com/ckkj/defense_device/bean/VerifyOptionPasswordRequest.kt index ca44665..13ae30b 100644 --- a/app/src/main/java/com/example/defenseapplication/bean/VerifyOptionPasswordRequest.kt +++ b/app/src/main/java/com/ckkj/defense_device/bean/VerifyOptionPasswordRequest.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.bean +package com.ckkj.defense_device.bean data class VerifyOptionPasswordRequest( val optionPassword: String diff --git a/app/src/main/java/com/example/defenseapplication/home/AddDeviceActivity.kt b/app/src/main/java/com/ckkj/defense_device/home/AddDeviceActivity.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/home/AddDeviceActivity.kt rename to app/src/main/java/com/ckkj/defense_device/home/AddDeviceActivity.kt index aecc6a4..6072142 100644 --- a/app/src/main/java/com/example/defenseapplication/home/AddDeviceActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/AddDeviceActivity.kt @@ -1,7 +1,6 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.Manifest -import android.app.Activity import android.content.Intent import android.content.pm.PackageManager import android.os.Build @@ -14,10 +13,10 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.recyclerview.widget.GridLayoutManager -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.AddDeviceAdapter -import com.example.defenseapplication.adapter.Device -import com.example.defenseapplication.databinding.AddDeviceActivityBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.AddDeviceAdapter +import com.ckkj.defense_device.adapter.Device +import com.ckkj.defense_device.databinding.AddDeviceActivityBinding import com.gyf.immersionbar.ImmersionBar import com.maning.mlkitscanner.scan.MNScanManager import com.maning.mlkitscanner.scan.callback.act.MNScanCallback diff --git a/app/src/main/java/com/example/defenseapplication/home/AddFamilyActivity.kt b/app/src/main/java/com/ckkj/defense_device/home/AddFamilyActivity.kt similarity index 96% rename from app/src/main/java/com/example/defenseapplication/home/AddFamilyActivity.kt rename to app/src/main/java/com/ckkj/defense_device/home/AddFamilyActivity.kt index 526590b..f2e140f 100644 --- a/app/src/main/java/com/example/defenseapplication/home/AddFamilyActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/AddFamilyActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.Manifest import android.content.BroadcastReceiver @@ -23,10 +23,10 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.WifiListAdapter -import com.example.defenseapplication.databinding.AddFamilyActivityBinding -import com.example.defenseapplication.databinding.DialogWifiListBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.WifiListAdapter +import com.ckkj.defense_device.databinding.AddFamilyActivityBinding +import com.ckkj.defense_device.databinding.DialogWifiListBinding import com.gyf.immersionbar.ImmersionBar //选择Wi-Fi class AddFamilyActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/defenseapplication/home/ConnectDeviceActivity.kt b/app/src/main/java/com/ckkj/defense_device/home/ConnectDeviceActivity.kt similarity index 91% rename from app/src/main/java/com/example/defenseapplication/home/ConnectDeviceActivity.kt rename to app/src/main/java/com/ckkj/defense_device/home/ConnectDeviceActivity.kt index 2e23c8d..8b665ad 100644 --- a/app/src/main/java/com/example/defenseapplication/home/ConnectDeviceActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/ConnectDeviceActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.content.Intent import android.graphics.drawable.AnimationDrawable @@ -6,14 +6,9 @@ import android.os.Bundle import android.os.Handler import android.os.Looper import android.view.View -import android.widget.Toast -import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.AddDeviceActivityBinding -import com.example.defenseapplication.databinding.ConnectDeviceActivityBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.ConnectDeviceActivityBinding import com.gyf.immersionbar.ImmersionBar //连接设备 class ConnectDeviceActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/defenseapplication/home/HomeActivity.kt b/app/src/main/java/com/ckkj/defense_device/home/HomeActivity.kt similarity index 84% rename from app/src/main/java/com/example/defenseapplication/home/HomeActivity.kt rename to app/src/main/java/com/ckkj/defense_device/home/HomeActivity.kt index 4a0d964..af0c949 100644 --- a/app/src/main/java/com/example/defenseapplication/home/HomeActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/HomeActivity.kt @@ -1,15 +1,10 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.fragment.app.Fragment -import com.example.defenseapplication.R -import com.example.defenseapplication.base.BaseActivity -import com.example.defenseapplication.databinding.HomeActivityBinding -import com.example.defenseapplication.databinding.HomeMenuFragmentBinding -import com.gyf.immersionbar.ImmersionBar +import com.ckkj.defense_device.R +import com.ckkj.defense_device.base.BaseActivity +import com.ckkj.defense_device.databinding.HomeActivityBinding class HomeActivity : BaseActivity() { // ViewBinding 核心对象 diff --git a/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt b/app/src/main/java/com/ckkj/defense_device/home/HomeMenuFragment.kt similarity index 94% rename from app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt rename to app/src/main/java/com/ckkj/defense_device/home/HomeMenuFragment.kt index c3a60cc..9e8e804 100644 --- a/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/HomeMenuFragment.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.Manifest import android.app.Activity @@ -21,23 +21,23 @@ import android.view.ViewGroup import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.DeviceAdapter -import com.example.defenseapplication.adapter.DeviceUi -import com.example.defenseapplication.adapter.FamilyAdapter -import com.example.defenseapplication.bean.DeviceBean -import com.example.defenseapplication.bean.FamilyBean -import com.example.defenseapplication.bean.SwitchFamilyRequest -import com.example.defenseapplication.databinding.HomeMenuFragmentBinding -import com.example.defenseapplication.liveVideo.LiveVideoActivity -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.DeviceUpdateEvent -import com.example.defenseapplication.utils.FamilySwitchEvent -import com.example.defenseapplication.utils.MessageStatusManager -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.utils.UserinfoUtil -import com.example.defenseapplication.view.DefenseDialogs -import com.example.defenseapplication.view.showDefenseDialog +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.DeviceAdapter +import com.ckkj.defense_device.adapter.DeviceUi +import com.ckkj.defense_device.adapter.FamilyAdapter +import com.ckkj.defense_device.bean.DeviceBean +import com.ckkj.defense_device.bean.FamilyBean +import com.ckkj.defense_device.bean.SwitchFamilyRequest +import com.ckkj.defense_device.databinding.HomeMenuFragmentBinding +import com.ckkj.defense_device.liveVideo.LiveVideoActivity +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.DeviceUpdateEvent +import com.ckkj.defense_device.utils.FamilySwitchEvent +import com.ckkj.defense_device.utils.MessageStatusManager +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.utils.UserinfoUtil +import com.ckkj.defense_device.view.DefenseDialogs +import com.ckkj.defense_device.view.showDefenseDialog import com.gyf.immersionbar.ImmersionBar import com.maning.mlkitscanner.scan.MNScanManager import com.maning.mlkitscanner.scan.callback.act.MNScanCallback diff --git a/app/src/main/java/com/example/defenseapplication/home/MessageActivity.kt b/app/src/main/java/com/ckkj/defense_device/home/MessageActivity.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/home/MessageActivity.kt rename to app/src/main/java/com/ckkj/defense_device/home/MessageActivity.kt index f904f2e..03df079 100644 --- a/app/src/main/java/com/example/defenseapplication/home/MessageActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/MessageActivity.kt @@ -1,15 +1,15 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.adapter.MessageListAdapter -import com.example.defenseapplication.adapter.MessageListItem -import com.example.defenseapplication.databinding.MessageActivityBinding -import com.example.defenseapplication.utils.MessageStatusManager -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.adapter.MessageListAdapter +import com.ckkj.defense_device.adapter.MessageListItem +import com.ckkj.defense_device.databinding.MessageActivityBinding +import com.ckkj.defense_device.utils.MessageStatusManager +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -24,7 +24,7 @@ class MessageActivity : AppCompatActivity() { private val pageSize = 10 private var isLoading = false private var hasMoreData = true - private val allMessages = mutableListOf() + private val allMessages = mutableListOf() private var lastLoadedCount = 0 override fun onCreate(savedInstanceState: Bundle?) { @@ -160,7 +160,7 @@ class MessageActivity : AppCompatActivity() { binding.tvNoMoreData.visibility = View.GONE } - private fun convertToMessageListItems(messages: List): List { + private fun convertToMessageListItems(messages: List): List { val items = mutableListOf() val groupedMessages = messages.groupBy { extractDate(it.createTime ?: "") } groupedMessages.forEach { (date, messageList) -> diff --git a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt b/app/src/main/java/com/ckkj/defense_device/home/PersonalFragment.kt similarity index 90% rename from app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt rename to app/src/main/java/com/ckkj/defense_device/home/PersonalFragment.kt index fdc900e..cdb342e 100644 --- a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/PersonalFragment.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.content.Intent import android.os.Bundle @@ -9,21 +9,20 @@ import android.view.ViewGroup import android.widget.Toast import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.example.defenseapplication.R -import com.example.defenseapplication.bean.UserInfoBean -import com.example.defenseapplication.databinding.PersonalFragmentBinding -import com.example.defenseapplication.liveVideo.LinkedUserActivity -import com.example.defenseapplication.personal.FaceManagementActivity -import com.example.defenseapplication.personal.PasswordManagementActivity -import com.example.defenseapplication.personal.PersonalProfileActivity -import com.example.defenseapplication.utils.AppLanguage -import com.example.defenseapplication.utils.LanguageUtil -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.utils.UserinfoUtil -import com.example.defenseapplication.utils.ActivityManager -import com.example.defenseapplication.view.FamilySwitchDialog -import com.example.defenseapplication.view.LanguageDialog -import com.example.defenseapplication.home.HomeActivity +import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.UserInfoBean +import com.ckkj.defense_device.databinding.PersonalFragmentBinding +import com.ckkj.defense_device.liveVideo.LinkedUserActivity +import com.ckkj.defense_device.personal.FaceManagementActivity +import com.ckkj.defense_device.personal.PasswordManagementActivity +import com.ckkj.defense_device.personal.PersonalProfileActivity +import com.ckkj.defense_device.utils.AppLanguage +import com.ckkj.defense_device.utils.LanguageUtil +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.utils.UserinfoUtil +import com.ckkj.defense_device.utils.ActivityManager +import com.ckkj.defense_device.view.FamilySwitchDialog +import com.ckkj.defense_device.view.LanguageDialog import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -107,7 +106,7 @@ class PersonalFragment : Fragment() { withContext(Dispatchers.Main) { if (response.code == 200) { UserinfoUtil.clearUserInfo() - val intent = Intent(requireContext(), com.example.defenseapplication.login.LoginActivity::class.java) + val intent = Intent(requireContext(), com.ckkj.defense_device.login.LoginActivity::class.java) intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK startActivity(intent) requireActivity().finish() diff --git a/app/src/main/java/com/example/defenseapplication/home/SetNameActivity.kt b/app/src/main/java/com/ckkj/defense_device/home/SetNameActivity.kt similarity index 88% rename from app/src/main/java/com/example/defenseapplication/home/SetNameActivity.kt rename to app/src/main/java/com/ckkj/defense_device/home/SetNameActivity.kt index 9ff24c1..0ae9bd2 100644 --- a/app/src/main/java/com/example/defenseapplication/home/SetNameActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/SetNameActivity.kt @@ -1,14 +1,13 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.content.Intent import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.bean.AddDeviceBean -import com.example.defenseapplication.bean.DeviceBean -import com.example.defenseapplication.databinding.SetNameActivityBinding -import com.example.defenseapplication.liveVideo.LiveVideoActivity -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.bean.AddDeviceBean +import com.ckkj.defense_device.databinding.SetNameActivityBinding +import com.ckkj.defense_device.liveVideo.LiveVideoActivity +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/home/StartActivity.kt b/app/src/main/java/com/ckkj/defense_device/home/StartActivity.kt similarity index 80% rename from app/src/main/java/com/example/defenseapplication/home/StartActivity.kt rename to app/src/main/java/com/ckkj/defense_device/home/StartActivity.kt index 5574de6..b6d261f 100644 --- a/app/src/main/java/com/example/defenseapplication/home/StartActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/home/StartActivity.kt @@ -1,14 +1,14 @@ -package com.example.defenseapplication.home +package com.ckkj.defense_device.home import android.content.Intent import android.os.Bundle import android.os.Handler import android.os.Looper import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.databinding.ActivityStartBinding -import com.example.defenseapplication.login.LoginActivity -import com.example.defenseapplication.utils.ApiConfig -import com.example.defenseapplication.utils.UserinfoUtil +import com.ckkj.defense_device.databinding.ActivityStartBinding +import com.ckkj.defense_device.login.LoginActivity +import com.ckkj.defense_device.utils.ApiConfig +import com.ckkj.defense_device.utils.UserinfoUtil import com.gyf.immersionbar.ImmersionBar class StartActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/AddLinkedUserActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/AddLinkedUserActivity.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/liveVideo/AddLinkedUserActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/AddLinkedUserActivity.kt index 72c8636..b3b106a 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/AddLinkedUserActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/AddLinkedUserActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.os.Bundle import android.text.Editable @@ -7,15 +7,15 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.AddLinkedUserAdapter -import com.example.defenseapplication.adapter.UserItem -import com.example.defenseapplication.bean.AddDeviceUserRequest -import com.example.defenseapplication.bean.FamilyMembersBean -import com.example.defenseapplication.databinding.AddLinkedUserActivityBinding -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.DeviceUserUpdateEvent -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.AddLinkedUserAdapter +import com.ckkj.defense_device.adapter.UserItem +import com.ckkj.defense_device.bean.AddDeviceUserRequest +import com.ckkj.defense_device.bean.FamilyMembersBean +import com.ckkj.defense_device.databinding.AddLinkedUserActivityBinding +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.DeviceUserUpdateEvent +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt index 658e3c4..4445899 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.content.Context import android.graphics.Color @@ -13,25 +13,21 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.lifecycle.lifecycleScope -import androidx.media3.exoplayer.offline.Download -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.AlarmLogAdapter -import com.example.defenseapplication.bean.DeviceAlarmBean -import com.example.defenseapplication.databinding.AlarmLogActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.AlarmLogAdapter +import com.ckkj.defense_device.bean.DeviceAlarmBean +import com.ckkj.defense_device.databinding.AlarmLogActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import com.shuyu.gsyvideoplayer.utils.OrientationUtils -import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer import com.bigkoo.pickerview.builder.TimePickerBuilder import com.bigkoo.pickerview.listener.OnTimeSelectListener -import com.chiclaim.android.downloader.Downloader -import com.example.defenseapplication.view.CustomDialogFragment -import com.example.defenseapplication.view.LoadingDialog -import com.example.defenseapplication.view.MyGSYVideoPlayer -import com.example.defenseapplication.view.showDefenseDialog +import com.ckkj.defense_device.view.CustomDialogFragment +import com.ckkj.defense_device.view.LoadingDialog +import com.ckkj.defense_device.view.MyGSYVideoPlayer +import com.ckkj.defense_device.view.showDefenseDialog import com.gyf.immersionbar.ImmersionBar -import com.shuyu.gsyvideoplayer.GSYVideoManager import kotlinx.coroutines.launch import java.io.File import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/AutoModeActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/AutoModeActivity.kt similarity index 94% rename from app/src/main/java/com/example/defenseapplication/liveVideo/AutoModeActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/AutoModeActivity.kt index 23da731..2d4bde1 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/AutoModeActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/AutoModeActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.content.Intent import android.graphics.Color @@ -8,12 +8,12 @@ import java.util.Calendar import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.AutoModeActivityBinding -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.DeviceUpdateEvent -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.view.AutoModeNoticeDialog +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.AutoModeActivityBinding +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.DeviceUpdateEvent +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.AutoModeNoticeDialog import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -173,7 +173,7 @@ class AutoModeActivity : AppCompatActivity() { CoroutineScope(Dispatchers.IO).launch { try { - val deviceBean = com.example.defenseapplication.bean.DeviceBean( + val deviceBean = com.ckkj.defense_device.bean.DeviceBean( id = deviceId, workMode = selectedMode, startTime = startTime, diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/DeviceInfoActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/DeviceInfoActivity.kt similarity index 85% rename from app/src/main/java/com/example/defenseapplication/liveVideo/DeviceInfoActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/DeviceInfoActivity.kt index 3fe6198..5d332f8 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/DeviceInfoActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/DeviceInfoActivity.kt @@ -1,12 +1,11 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.os.Bundle -import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.databinding.DeviceInfoActivityBinding -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.databinding.DeviceInfoActivityBinding +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -55,7 +54,7 @@ class DeviceInfoActivity : AppCompatActivity() { } } - private fun updateDeviceInfo(device: com.example.defenseapplication.bean.DeviceBean) { + private fun updateDeviceInfo(device: com.ckkj.defense_device.bean.DeviceBean) { binding.tvDeviceModelValue.text = device.deviceNo.toString() binding.tvDeviceNoValue.text = device.deviceSn.toString() binding.tvFwVersionValue.text = device.fwVer.toString() diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/LinkedUserActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/LinkedUserActivity.kt similarity index 93% rename from app/src/main/java/com/example/defenseapplication/liveVideo/LinkedUserActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/LinkedUserActivity.kt index 64860f3..ecdb0bb 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/LinkedUserActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/LinkedUserActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.content.Intent import android.os.Bundle @@ -11,22 +11,21 @@ import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.LinkedUser -import com.example.defenseapplication.adapter.LinkedUserAdapter -import com.example.defenseapplication.bean.DeleteDeviceUserRequest -import com.example.defenseapplication.bean.DeviceUserBean -import com.example.defenseapplication.bean.FamilyMembersBean -import com.example.defenseapplication.bean.VerifyOptionPasswordRequest -import com.example.defenseapplication.databinding.LinkedUserActivityBinding -import com.example.defenseapplication.personal.PasswordInputDialog -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.DeviceUserUpdateEvent -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.view.CustomDialogFragmentText +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.LinkedUser +import com.ckkj.defense_device.adapter.LinkedUserAdapter +import com.ckkj.defense_device.bean.DeleteDeviceUserRequest +import com.ckkj.defense_device.bean.DeviceUserBean +import com.ckkj.defense_device.bean.FamilyMembersBean +import com.ckkj.defense_device.bean.VerifyOptionPasswordRequest +import com.ckkj.defense_device.databinding.LinkedUserActivityBinding +import com.ckkj.defense_device.personal.PasswordInputDialog +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.DeviceUserUpdateEvent +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.CustomDialogFragmentText import com.gyf.immersionbar.ImmersionBar import com.yanzhenjie.recyclerview.SwipeMenuItem -import com.yanzhenjie.recyclerview.SwipeRecyclerView import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -339,7 +338,7 @@ class LinkedUserActivity : AppCompatActivity() { binding.fabAdd.setOnClickListener { if (checkUserLimit()) { - val intent = Intent(this, com.example.defenseapplication.personal.InvitationCodeActivity::class.java) + val intent = Intent(this, com.ckkj.defense_device.personal.InvitationCodeActivity::class.java) startActivity(intent) } } diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt index 781f022..9d8d46d 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.content.Intent import android.content.res.Configuration @@ -9,13 +9,13 @@ import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.AlarmLogHorizontalAdapter -import com.example.defenseapplication.base.BaseActivity -import com.example.defenseapplication.bean.DeviceAlarmBean -import com.example.defenseapplication.databinding.LiveVideoActivityBinding -import com.example.defenseapplication.utils.ActivityManager -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.AlarmLogHorizontalAdapter +import com.ckkj.defense_device.base.BaseActivity +import com.ckkj.defense_device.bean.DeviceAlarmBean +import com.ckkj.defense_device.databinding.LiveVideoActivityBinding +import com.ckkj.defense_device.utils.ActivityManager +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack @@ -184,7 +184,7 @@ class LiveVideoActivity : BaseActivity() { private fun initListener() { binding.btnBack.setOnClickListener { ActivityManager.finishExceptHome() - val intent = Intent(this, com.example.defenseapplication.home.HomeActivity::class.java) + val intent = Intent(this, com.ckkj.defense_device.home.HomeActivity::class.java) intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP startActivity(intent) finish() @@ -200,9 +200,9 @@ class LiveVideoActivity : BaseActivity() { isLightOn = !isLightOn if (isLightOn) { - binding.ivLight.setImageResource(com.example.defenseapplication.R.mipmap.light_on_open) + binding.ivLight.setImageResource(com.ckkj.defense_device.R.mipmap.light_on_open) } else { - binding.ivLight.setImageResource(com.example.defenseapplication.R.mipmap.light_on) + binding.ivLight.setImageResource(com.ckkj.defense_device.R.mipmap.light_on) } } diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/SettingsActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/SettingsActivity.kt similarity index 94% rename from app/src/main/java/com/example/defenseapplication/liveVideo/SettingsActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/SettingsActivity.kt index 0109fd9..90dbec4 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/SettingsActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/SettingsActivity.kt @@ -1,19 +1,19 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.content.Context import android.content.Intent import android.os.Bundle import android.widget.Toast import androidx.lifecycle.lifecycleScope -import com.example.defenseapplication.R -import com.example.defenseapplication.base.BaseActivity -import com.example.defenseapplication.databinding.SettingsActivityBinding -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.view.CustomDialogFragmentText -import com.example.defenseapplication.view.RecognitionModeDialog -import com.example.defenseapplication.bean.VerifyOptionPasswordRequest -import com.example.defenseapplication.personal.PasswordInputDialog +import com.ckkj.defense_device.R +import com.ckkj.defense_device.base.BaseActivity +import com.ckkj.defense_device.databinding.SettingsActivityBinding +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.CustomDialogFragmentText +import com.ckkj.defense_device.view.RecognitionModeDialog +import com.ckkj.defense_device.bean.VerifyOptionPasswordRequest +import com.ckkj.defense_device.personal.PasswordInputDialog import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -183,7 +183,7 @@ class SettingsActivity : BaseActivity() { binding.tvRelatedUsers.text = "$count 人" } - private fun updateDeviceInfo(device: com.example.defenseapplication.bean.DeviceBean) { + private fun updateDeviceInfo(device: com.ckkj.defense_device.bean.DeviceBean) { binding.tvDeviceName.text = device.deviceName ?: "未设置" binding.tvWifiName.text = device.wifiName ?: "未设置" @@ -236,7 +236,7 @@ class SettingsActivity : BaseActivity() { CoroutineScope(Dispatchers.IO).launch { try { - val deviceBean = com.example.defenseapplication.bean.DeviceBean( + val deviceBean = com.ckkj.defense_device.bean.DeviceBean( id = deviceId, deviceName = name, ) @@ -273,7 +273,7 @@ class SettingsActivity : BaseActivity() { CoroutineScope(Dispatchers.IO).launch { try { - val deviceBean = com.example.defenseapplication.bean.DeviceBean( + val deviceBean = com.ckkj.defense_device.bean.DeviceBean( id = deviceId, patternPerception = patternPerception, ) @@ -305,13 +305,13 @@ class SettingsActivity : BaseActivity() { CoroutineScope(Dispatchers.IO).launch { try { - val deleteBean = com.example.defenseapplication.bean.DeleteBean() + val deleteBean = com.ckkj.defense_device.bean.DeleteBean() deleteBean.deviceId = deviceId val response = RetrofitNetwork.getNetworkService().deleteDevice(deleteBean) withContext(Dispatchers.Main) { if (response.code == 200) { Toast.makeText(this@SettingsActivity, "解绑成功", Toast.LENGTH_SHORT).show() - val intent = Intent(this@SettingsActivity, com.example.defenseapplication.home.HomeActivity::class.java) + val intent = Intent(this@SettingsActivity, com.ckkj.defense_device.home.HomeActivity::class.java) intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK startActivity(intent) finish() diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/StrikePositionActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/StrikePositionActivity.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/liveVideo/StrikePositionActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/StrikePositionActivity.kt index 1804cee..d5709e9 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/StrikePositionActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/StrikePositionActivity.kt @@ -1,17 +1,17 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.animation.ObjectAnimator import android.os.Bundle import android.widget.ImageView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.R -import com.example.defenseapplication.bean.DeviceBean -import com.example.defenseapplication.databinding.StrikePositionActivityBinding -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.view.CustomDialogFragment -import com.example.defenseapplication.view.showDefenseDialog +import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.DeviceBean +import com.ckkj.defense_device.databinding.StrikePositionActivityBinding +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.CustomDialogFragment +import com.ckkj.defense_device.view.showDefenseDialog import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/UserDetailsActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/UserDetailsActivity.kt similarity index 88% rename from app/src/main/java/com/example/defenseapplication/liveVideo/UserDetailsActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/UserDetailsActivity.kt index 11cb40d..0ce945c 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/UserDetailsActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/UserDetailsActivity.kt @@ -1,20 +1,19 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.os.Bundle -import android.util.Log import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope -import com.example.defenseapplication.R -import com.example.defenseapplication.bean.DeleteDeviceUserRequest -import com.example.defenseapplication.bean.ObtainInviterInformationRequest -import com.example.defenseapplication.bean.VerifyOptionPasswordRequest -import com.example.defenseapplication.personal.PasswordInputDialog -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.DeviceUserUpdateEvent -import com.example.defenseapplication.databinding.UserDetailsActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.view.CustomDialogFragmentText +import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.DeleteDeviceUserRequest +import com.ckkj.defense_device.bean.ObtainInviterInformationRequest +import com.ckkj.defense_device.bean.VerifyOptionPasswordRequest +import com.ckkj.defense_device.personal.PasswordInputDialog +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.DeviceUserUpdateEvent +import com.ckkj.defense_device.databinding.UserDetailsActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.CustomDialogFragmentText import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -73,7 +72,7 @@ class UserDetailsActivity : AppCompatActivity() { } } - private fun updateUI(data: com.example.defenseapplication.bean.ObtainInviterInformationBean) { + private fun updateUI(data: com.ckkj.defense_device.bean.ObtainInviterInformationBean) { binding.tvContactName.text = data.nickName ?: "未知用户" binding.tvPhone.text = data.phonenumber ?: "" binding.tvIdCard.text = data.idCard ?: "" diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/VoiceSettingsActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/VoiceSettingsActivity.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/liveVideo/VoiceSettingsActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/VoiceSettingsActivity.kt index 35ecc03..e07ecef 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/VoiceSettingsActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/VoiceSettingsActivity.kt @@ -1,15 +1,15 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.content.Intent import android.os.Bundle import android.util.Log import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.bean.DeviceBean -import com.example.defenseapplication.databinding.VoiceSettingsActivityBinding -import com.example.defenseapplication.utils.ApiService -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.bean.DeviceBean +import com.ckkj.defense_device.databinding.VoiceSettingsActivityBinding +import com.ckkj.defense_device.utils.ApiService +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/WarningVoiceContentActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/WarningVoiceContentActivity.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/liveVideo/WarningVoiceContentActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/WarningVoiceContentActivity.kt index 765be71..7900b9f 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/WarningVoiceContentActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/WarningVoiceContentActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.content.Intent import android.graphics.Color @@ -6,10 +6,10 @@ import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.widget.doAfterTextChanged -import com.example.defenseapplication.bean.DeviceBean -import com.example.defenseapplication.databinding.WarningVoiceContentActivityBinding -import com.example.defenseapplication.utils.ApiService -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.bean.DeviceBean +import com.ckkj.defense_device.databinding.WarningVoiceContentActivityBinding +import com.ckkj.defense_device.utils.ApiService +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/WaterGunSettingsActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/WaterGunSettingsActivity.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/liveVideo/WaterGunSettingsActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/WaterGunSettingsActivity.kt index ed7a90c..c7fe23d 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/WaterGunSettingsActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/WaterGunSettingsActivity.kt @@ -1,16 +1,15 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.os.Bundle import android.widget.Toast -import androidx.activity.enableEdgeToEdge -import com.example.defenseapplication.R -import com.example.defenseapplication.base.BaseActivity -import com.example.defenseapplication.bean.DeviceBean -import com.example.defenseapplication.databinding.WaterGunSettingsActivityBinding -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.view.ContainerSelectDialog -import com.example.defenseapplication.view.CustomDialogFragmentText +import com.ckkj.defense_device.R +import com.ckkj.defense_device.base.BaseActivity +import com.ckkj.defense_device.bean.DeviceBean +import com.ckkj.defense_device.databinding.WaterGunSettingsActivityBinding +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.ContainerSelectDialog +import com.ckkj.defense_device.view.CustomDialogFragmentText import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/WiFiManagementActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/WiFiManagementActivity.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/liveVideo/WiFiManagementActivity.kt rename to app/src/main/java/com/ckkj/defense_device/liveVideo/WiFiManagementActivity.kt index 220a161..104ed19 100644 --- a/app/src/main/java/com/example/defenseapplication/liveVideo/WiFiManagementActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/WiFiManagementActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.liveVideo +package com.ckkj.defense_device.liveVideo import android.Manifest import android.content.BroadcastReceiver @@ -18,13 +18,13 @@ import android.widget.PopupWindow import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat import androidx.recyclerview.widget.LinearLayoutManager -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.WifiListAdapter -import com.example.defenseapplication.bean.DeviceBean -import com.example.defenseapplication.databinding.DialogWifiListBinding -import com.example.defenseapplication.databinding.WifiManagementActivityBinding -import com.example.defenseapplication.utils.DeviceIdEvent -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.WifiListAdapter +import com.ckkj.defense_device.bean.DeviceBean +import com.ckkj.defense_device.databinding.DialogWifiListBinding +import com.ckkj.defense_device.databinding.WifiManagementActivityBinding +import com.ckkj.defense_device.utils.DeviceIdEvent +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/login/FaceLoginActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/FaceLoginActivity.kt similarity index 75% rename from app/src/main/java/com/example/defenseapplication/login/FaceLoginActivity.kt rename to app/src/main/java/com/ckkj/defense_device/login/FaceLoginActivity.kt index 64b92f5..412c523 100644 --- a/app/src/main/java/com/example/defenseapplication/login/FaceLoginActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/login/FaceLoginActivity.kt @@ -1,14 +1,9 @@ -package com.example.defenseapplication.login +package com.ckkj.defense_device.login import android.content.Intent import android.os.Bundle -import android.widget.Toast -import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.FaceLoginActivityBinding +import com.ckkj.defense_device.databinding.FaceLoginActivityBinding import com.gyf.immersionbar.ImmersionBar //人脸识别 class FaceLoginActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/defenseapplication/login/FaceVerificationActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/FaceVerificationActivity.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/login/FaceVerificationActivity.kt rename to app/src/main/java/com/ckkj/defense_device/login/FaceVerificationActivity.kt index 9a07839..199c1c7 100644 --- a/app/src/main/java/com/example/defenseapplication/login/FaceVerificationActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/login/FaceVerificationActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.login +package com.ckkj.defense_device.login import android.Manifest import android.content.pm.PackageManager @@ -13,8 +13,8 @@ import androidx.camera.core.Preview import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat -import com.example.defenseapplication.databinding.FaceVerificationActivityBinding -import com.example.defenseapplication.view.FaceAnalyzer +import com.ckkj.defense_device.databinding.FaceVerificationActivityBinding +import com.ckkj.defense_device.view.FaceAnalyzer import com.google.mlkit.vision.face.FaceDetection import com.google.mlkit.vision.face.FaceDetectorOptions import com.gyf.immersionbar.ImmersionBar diff --git a/app/src/main/java/com/example/defenseapplication/login/ForgetPasswordActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/ForgetPasswordActivity.kt similarity index 97% rename from app/src/main/java/com/example/defenseapplication/login/ForgetPasswordActivity.kt rename to app/src/main/java/com/ckkj/defense_device/login/ForgetPasswordActivity.kt index 90efbe6..59d5029 100644 --- a/app/src/main/java/com/example/defenseapplication/login/ForgetPasswordActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/login/ForgetPasswordActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.login +package com.ckkj.defense_device.login import android.graphics.Color import android.graphics.drawable.GradientDrawable @@ -7,9 +7,9 @@ import android.os.CountDownTimer import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import bean.ForgotRequest -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.ForgetPasswordActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.ForgetPasswordActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork import com.google.firebase.crashlytics.buildtools.reloc.org.apache.http.util.TextUtils import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt similarity index 97% rename from app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt rename to app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt index 88da86d..a3deaad 100644 --- a/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.login +package com.ckkj.defense_device.login import android.content.Intent import android.graphics.Color @@ -11,11 +11,11 @@ import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import bean.LoginRequest -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.ActivityLoginBinding -import com.example.defenseapplication.home.HomeActivity -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.utils.UserinfoUtil +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.ActivityLoginBinding +import com.ckkj.defense_device.home.HomeActivity +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.utils.UserinfoUtil import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/login/RegisterActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt similarity index 97% rename from app/src/main/java/com/example/defenseapplication/login/RegisterActivity.kt rename to app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt index 9e28388..4f2768f 100644 --- a/app/src/main/java/com/example/defenseapplication/login/RegisterActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.login +package com.ckkj.defense_device.login import android.content.Intent import android.graphics.Color @@ -8,9 +8,9 @@ import android.os.CountDownTimer import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import bean.RegisterRequest -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.RegisterActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.RegisterActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/login/RegisterSuccessActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/RegisterSuccessActivity.kt similarity index 84% rename from app/src/main/java/com/example/defenseapplication/login/RegisterSuccessActivity.kt rename to app/src/main/java/com/ckkj/defense_device/login/RegisterSuccessActivity.kt index 4ff245a..f8686d1 100644 --- a/app/src/main/java/com/example/defenseapplication/login/RegisterSuccessActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/login/RegisterSuccessActivity.kt @@ -1,15 +1,11 @@ -package com.example.defenseapplication.login +package com.ckkj.defense_device.login import android.content.Intent import android.os.Bundle import android.os.CountDownTimer -import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.RegisterSuccessActivityBinding -import com.example.defenseapplication.home.HomeActivity +import com.ckkj.defense_device.databinding.RegisterSuccessActivityBinding +import com.ckkj.defense_device.home.HomeActivity import com.gyf.immersionbar.ImmersionBar //注册成功界面 class RegisterSuccessActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/defenseapplication/model/FamilyItem.kt b/app/src/main/java/com/ckkj/defense_device/model/FamilyItem.kt similarity index 66% rename from app/src/main/java/com/example/defenseapplication/model/FamilyItem.kt rename to app/src/main/java/com/ckkj/defense_device/model/FamilyItem.kt index 0f6b532..b155f68 100644 --- a/app/src/main/java/com/example/defenseapplication/model/FamilyItem.kt +++ b/app/src/main/java/com/ckkj/defense_device/model/FamilyItem.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.model +package com.ckkj.defense_device.model data class FamilyItem( val id: String, diff --git a/app/src/main/java/com/example/defenseapplication/personal/ChangePasswordActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/ChangePasswordActivity.kt similarity index 90% rename from app/src/main/java/com/example/defenseapplication/personal/ChangePasswordActivity.kt rename to app/src/main/java/com/ckkj/defense_device/personal/ChangePasswordActivity.kt index 871bfb4..5e5a7b2 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/ChangePasswordActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/ChangePasswordActivity.kt @@ -1,12 +1,12 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.R -import com.example.defenseapplication.bean.UpdatePassword -import com.example.defenseapplication.databinding.ChangePasswordActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.UpdatePassword +import com.ckkj.defense_device.databinding.ChangePasswordActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/personal/FaceManagementActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/FaceManagementActivity.kt similarity index 81% rename from app/src/main/java/com/example/defenseapplication/personal/FaceManagementActivity.kt rename to app/src/main/java/com/ckkj/defense_device/personal/FaceManagementActivity.kt index e4a60a8..92e121f 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/FaceManagementActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/FaceManagementActivity.kt @@ -1,10 +1,10 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.databinding.FaceManagementActivityBinding -import com.example.defenseapplication.login.FaceLoginActivity +import com.ckkj.defense_device.databinding.FaceManagementActivityBinding +import com.ckkj.defense_device.login.FaceLoginActivity import com.gyf.immersionbar.ImmersionBar //人脸管理页面 diff --git a/app/src/main/java/com/example/defenseapplication/personal/InvitationCodeActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/InvitationCodeActivity.kt similarity index 97% rename from app/src/main/java/com/example/defenseapplication/personal/InvitationCodeActivity.kt rename to app/src/main/java/com/ckkj/defense_device/personal/InvitationCodeActivity.kt index 76c9753..44fdf4c 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/InvitationCodeActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/InvitationCodeActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.content.Intent import android.content.pm.PackageManager @@ -13,11 +13,11 @@ import android.view.View import androidx.appcompat.app.AppCompatActivity import com.google.android.material.bottomsheet.BottomSheetDialog import androidx.core.content.ContextCompat -import com.example.defenseapplication.R -import com.example.defenseapplication.bean.VerifyOptionPasswordRequest -import com.example.defenseapplication.databinding.DialogExpireTimeBinding -import com.example.defenseapplication.databinding.InvitationCodeActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.VerifyOptionPasswordRequest +import com.ckkj.defense_device.databinding.DialogExpireTimeBinding +import com.ckkj.defense_device.databinding.InvitationCodeActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork import com.google.zxing.BarcodeFormat import com.google.zxing.EncodeHintType import com.google.zxing.qrcode.QRCodeWriter diff --git a/app/src/main/java/com/example/defenseapplication/personal/LoginPasswordActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/LoginPasswordActivity.kt similarity index 72% rename from app/src/main/java/com/example/defenseapplication/personal/LoginPasswordActivity.kt rename to app/src/main/java/com/ckkj/defense_device/personal/LoginPasswordActivity.kt index 5ff35d8..d2ae500 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/LoginPasswordActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/LoginPasswordActivity.kt @@ -1,14 +1,9 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.content.Intent import android.os.Bundle -import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.LoginPasswordActivityBinding -import com.example.defenseapplication.databinding.PasswordManagementActivityBinding +import com.ckkj.defense_device.databinding.LoginPasswordActivityBinding import com.gyf.immersionbar.ImmersionBar //登录密码 diff --git a/app/src/main/java/com/example/defenseapplication/personal/OperationPasswordActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/OperationPasswordActivity.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/personal/OperationPasswordActivity.kt rename to app/src/main/java/com/ckkj/defense_device/personal/OperationPasswordActivity.kt index 8e77874..b637933 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/OperationPasswordActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/OperationPasswordActivity.kt @@ -1,16 +1,16 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.R -import com.example.defenseapplication.bean.UpdateUserInfo -import com.example.defenseapplication.bean.VerifyOptionPasswordRequest -import com.example.defenseapplication.databinding.OperationPasswordActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.view.CustomDialogFragment -import com.example.defenseapplication.view.LoadingDialog -import com.example.defenseapplication.view.showDefenseDialog +import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.UpdateUserInfo +import com.ckkj.defense_device.bean.VerifyOptionPasswordRequest +import com.ckkj.defense_device.databinding.OperationPasswordActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.CustomDialogFragment +import com.ckkj.defense_device.view.LoadingDialog +import com.ckkj.defense_device.view.showDefenseDialog import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/personal/PasswordManagementActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/PasswordManagementActivity.kt similarity index 88% rename from app/src/main/java/com/example/defenseapplication/personal/PasswordManagementActivity.kt rename to app/src/main/java/com/ckkj/defense_device/personal/PasswordManagementActivity.kt index 191244d..ea23aba 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/PasswordManagementActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/PasswordManagementActivity.kt @@ -1,9 +1,9 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.example.defenseapplication.databinding.PasswordManagementActivityBinding +import com.ckkj.defense_device.databinding.PasswordManagementActivityBinding import com.gyf.immersionbar.ImmersionBar //密码管理 class PasswordManagementActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/PersonalProfileActivity.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt rename to app/src/main/java/com/ckkj/defense_device/personal/PersonalProfileActivity.kt index 90ff934..6909057 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/PersonalProfileActivity.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.Manifest import android.content.ContentResolver @@ -11,24 +11,21 @@ import android.os.Environment import android.provider.MediaStore import android.util.Log import android.widget.Toast -import androidx.activity.enableEdgeToEdge import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.content.FileProvider -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.example.defenseapplication.R -import com.example.defenseapplication.bean.UpdateUserInfo -import com.example.defenseapplication.bean.UserInfoBean -import com.example.defenseapplication.databinding.PersonalProfileActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.view.AvatarSelectDialog -import com.example.defenseapplication.view.CustomDialogFragmentText -import com.example.defenseapplication.view.LoadingDialog -import com.example.defenseapplication.view.PhoneModifyDialogFragment +import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.UpdateUserInfo +import com.ckkj.defense_device.bean.UserInfoBean +import com.ckkj.defense_device.databinding.PersonalProfileActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.AvatarSelectDialog +import com.ckkj.defense_device.view.CustomDialogFragmentText +import com.ckkj.defense_device.view.LoadingDialog +import com.ckkj.defense_device.view.PhoneModifyDialogFragment import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/personal/RetrievePasswordActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/RetrievePasswordActivity.kt similarity index 96% rename from app/src/main/java/com/example/defenseapplication/personal/RetrievePasswordActivity.kt rename to app/src/main/java/com/ckkj/defense_device/personal/RetrievePasswordActivity.kt index dd5dbe6..577fa2c 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/RetrievePasswordActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/RetrievePasswordActivity.kt @@ -1,13 +1,13 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.os.Bundle import android.os.CountDownTimer import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import bean.ForgotRequest -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.RetrievePasswordActivityBinding -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.RetrievePasswordActivityBinding +import com.ckkj.defense_device.utils.RetrofitNetwork import com.gyf.immersionbar.ImmersionBar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/defenseapplication/utils/ActivityManager.kt b/app/src/main/java/com/ckkj/defense_device/utils/ActivityManager.kt similarity index 98% rename from app/src/main/java/com/example/defenseapplication/utils/ActivityManager.kt rename to app/src/main/java/com/ckkj/defense_device/utils/ActivityManager.kt index 13e501c..f4561da 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/ActivityManager.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/ActivityManager.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils import android.app.Activity import java.lang.ref.WeakReference diff --git a/app/src/main/java/com/example/defenseapplication/utils/ApiConfig.kt b/app/src/main/java/com/ckkj/defense_device/utils/ApiConfig.kt similarity index 98% rename from app/src/main/java/com/example/defenseapplication/utils/ApiConfig.kt rename to app/src/main/java/com/ckkj/defense_device/utils/ApiConfig.kt index c640cb4..165fc2c 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/ApiConfig.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/ApiConfig.kt @@ -1,8 +1,8 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils import android.annotation.SuppressLint import android.util.Log -import com.example.defenseapplication.bean.BaseInfo +import com.ckkj.defense_device.bean.BaseInfo import com.google.gson.Gson import com.google.gson.JsonParser import okhttp3.Interceptor diff --git a/app/src/main/java/com/example/defenseapplication/utils/ApiService.kt b/app/src/main/java/com/ckkj/defense_device/utils/ApiService.kt similarity index 83% rename from app/src/main/java/com/example/defenseapplication/utils/ApiService.kt rename to app/src/main/java/com/ckkj/defense_device/utils/ApiService.kt index 180b7d4..58c228c 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/ApiService.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/ApiService.kt @@ -1,30 +1,29 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils -import android.R import bean.ForgotRequest -import com.example.defenseapplication.bean.DeviceBean -import com.example.defenseapplication.bean.DeviceUserBean -import com.example.defenseapplication.bean.FamilyBean -import com.example.defenseapplication.bean.GetCodeBean +import com.ckkj.defense_device.bean.DeviceBean +import com.ckkj.defense_device.bean.DeviceUserBean +import com.ckkj.defense_device.bean.FamilyBean +import com.ckkj.defense_device.bean.GetCodeBean import bean.LoginBean import bean.LoginRequest import bean.RegisterRequest -import com.example.defenseapplication.bean.AddDeviceBean -import com.example.defenseapplication.bean.AddDeviceUserRequest -import com.example.defenseapplication.bean.DeleteBean -import com.example.defenseapplication.bean.DeleteDeviceUserRequest -import com.example.defenseapplication.bean.DeviceAlarmResponse -import com.example.defenseapplication.bean.FamilyMembersBean -import com.example.defenseapplication.bean.MessageBean -import com.example.defenseapplication.bean.MessageListResponse -import com.example.defenseapplication.bean.ObtainInviterInformationBean -import com.example.defenseapplication.bean.ObtainInviterInformationRequest -import com.example.defenseapplication.bean.SwitchFamilyRequest -import com.example.defenseapplication.bean.UpdatePassword -import com.example.defenseapplication.bean.UpdateUserInfo -import com.example.defenseapplication.bean.UploadResponse -import com.example.defenseapplication.bean.UserInfoBean -import com.example.defenseapplication.bean.VerifyOptionPasswordRequest +import com.ckkj.defense_device.bean.AddDeviceBean +import com.ckkj.defense_device.bean.AddDeviceUserRequest +import com.ckkj.defense_device.bean.DeleteBean +import com.ckkj.defense_device.bean.DeleteDeviceUserRequest +import com.ckkj.defense_device.bean.DeviceAlarmResponse +import com.ckkj.defense_device.bean.FamilyMembersBean +import com.ckkj.defense_device.bean.MessageBean +import com.ckkj.defense_device.bean.MessageListResponse +import com.ckkj.defense_device.bean.ObtainInviterInformationBean +import com.ckkj.defense_device.bean.ObtainInviterInformationRequest +import com.ckkj.defense_device.bean.SwitchFamilyRequest +import com.ckkj.defense_device.bean.UpdatePassword +import com.ckkj.defense_device.bean.UpdateUserInfo +import com.ckkj.defense_device.bean.UploadResponse +import com.ckkj.defense_device.bean.UserInfoBean +import com.ckkj.defense_device.bean.VerifyOptionPasswordRequest import okhttp3.MultipartBody import retrofit2.http.Body import retrofit2.http.DELETE diff --git a/app/src/main/java/com/example/defenseapplication/utils/DeviceIdEvent.kt b/app/src/main/java/com/ckkj/defense_device/utils/DeviceIdEvent.kt similarity index 94% rename from app/src/main/java/com/example/defenseapplication/utils/DeviceIdEvent.kt rename to app/src/main/java/com/ckkj/defense_device/utils/DeviceIdEvent.kt index a75affe..91337ec 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/DeviceIdEvent.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/DeviceIdEvent.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils object DeviceIdEvent { private val listeners = mutableListOf() diff --git a/app/src/main/java/com/example/defenseapplication/utils/DeviceUpdateEvent.kt b/app/src/main/java/com/ckkj/defense_device/utils/DeviceUpdateEvent.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/utils/DeviceUpdateEvent.kt rename to app/src/main/java/com/ckkj/defense_device/utils/DeviceUpdateEvent.kt index 486214f..dc007a0 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/DeviceUpdateEvent.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/DeviceUpdateEvent.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils object DeviceUpdateEvent { private val listeners = mutableListOf() diff --git a/app/src/main/java/com/example/defenseapplication/utils/DeviceUserUpdateEvent.kt b/app/src/main/java/com/ckkj/defense_device/utils/DeviceUserUpdateEvent.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/utils/DeviceUserUpdateEvent.kt rename to app/src/main/java/com/ckkj/defense_device/utils/DeviceUserUpdateEvent.kt index 2c2ea55..fbc489f 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/DeviceUserUpdateEvent.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/DeviceUserUpdateEvent.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils object DeviceUserUpdateEvent { private val listeners = mutableListOf() diff --git a/app/src/main/java/com/example/defenseapplication/utils/FamilySwitchEvent.kt b/app/src/main/java/com/ckkj/defense_device/utils/FamilySwitchEvent.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/utils/FamilySwitchEvent.kt rename to app/src/main/java/com/ckkj/defense_device/utils/FamilySwitchEvent.kt index cf8aa4a..a4be4f0 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/FamilySwitchEvent.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/FamilySwitchEvent.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils object FamilySwitchEvent { private val listeners = mutableListOf() diff --git a/app/src/main/java/com/example/defenseapplication/utils/LanguageHeaderManager.kt b/app/src/main/java/com/ckkj/defense_device/utils/LanguageHeaderManager.kt similarity index 83% rename from app/src/main/java/com/example/defenseapplication/utils/LanguageHeaderManager.kt rename to app/src/main/java/com/ckkj/defense_device/utils/LanguageHeaderManager.kt index 79ef604..8f2093b 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/LanguageHeaderManager.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/LanguageHeaderManager.kt @@ -1,6 +1,4 @@ -package com.example.defenseapplication.utils - -import android.content.Context +package com.ckkj.defense_device.utils /** * HTTP 请求头的语言值管理,统一由 LanguageUtil 提供 diff --git a/app/src/main/java/com/example/defenseapplication/utils/LanguageUtil.kt b/app/src/main/java/com/ckkj/defense_device/utils/LanguageUtil.kt similarity index 97% rename from app/src/main/java/com/example/defenseapplication/utils/LanguageUtil.kt rename to app/src/main/java/com/ckkj/defense_device/utils/LanguageUtil.kt index 231a0c3..a70786c 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/LanguageUtil.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/LanguageUtil.kt @@ -1,8 +1,6 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils import android.content.Context -import android.content.SharedPreferences -import android.content.res.Configuration import android.os.Build import android.os.LocaleList import java.util.Locale diff --git a/app/src/main/java/com/example/defenseapplication/utils/MainRepository.kt b/app/src/main/java/com/ckkj/defense_device/utils/MainRepository.kt similarity index 79% rename from app/src/main/java/com/example/defenseapplication/utils/MainRepository.kt rename to app/src/main/java/com/ckkj/defense_device/utils/MainRepository.kt index 51128e3..33437bb 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/MainRepository.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/MainRepository.kt @@ -1,7 +1,7 @@ package com.smart.data.repository -import com.example.defenseapplication.utils.ApiService -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.utils.ApiService +import com.ckkj.defense_device.utils.RetrofitNetwork class MainRepository(val apiService: ApiService = RetrofitNetwork.getNetworkService()) { diff --git a/app/src/main/java/com/example/defenseapplication/utils/MessageStatusManager.kt b/app/src/main/java/com/ckkj/defense_device/utils/MessageStatusManager.kt similarity index 95% rename from app/src/main/java/com/example/defenseapplication/utils/MessageStatusManager.kt rename to app/src/main/java/com/ckkj/defense_device/utils/MessageStatusManager.kt index 18e532d..c7fd874 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/MessageStatusManager.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/MessageStatusManager.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils object MessageStatusManager { private var unreadCount = 0 diff --git a/app/src/main/java/com/example/defenseapplication/utils/RetrofitNetwork.kt b/app/src/main/java/com/ckkj/defense_device/utils/RetrofitNetwork.kt similarity index 98% rename from app/src/main/java/com/example/defenseapplication/utils/RetrofitNetwork.kt rename to app/src/main/java/com/ckkj/defense_device/utils/RetrofitNetwork.kt index dbbac15..766d1eb 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/RetrofitNetwork.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/RetrofitNetwork.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils import com.google.gson.Gson import okhttp3.OkHttpClient diff --git a/app/src/main/java/com/example/defenseapplication/utils/UserinfoUtil.kt b/app/src/main/java/com/ckkj/defense_device/utils/UserinfoUtil.kt similarity index 94% rename from app/src/main/java/com/example/defenseapplication/utils/UserinfoUtil.kt rename to app/src/main/java/com/ckkj/defense_device/utils/UserinfoUtil.kt index 271f4ac..806b1f1 100644 --- a/app/src/main/java/com/example/defenseapplication/utils/UserinfoUtil.kt +++ b/app/src/main/java/com/ckkj/defense_device/utils/UserinfoUtil.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.utils +package com.ckkj.defense_device.utils import bean.LoginBean import com.blankj.utilcode.util.SPUtils diff --git a/app/src/main/java/com/example/defenseapplication/view/AutoModeNoticeDialog.kt b/app/src/main/java/com/ckkj/defense_device/view/AutoModeNoticeDialog.kt similarity index 92% rename from app/src/main/java/com/example/defenseapplication/view/AutoModeNoticeDialog.kt rename to app/src/main/java/com/ckkj/defense_device/view/AutoModeNoticeDialog.kt index 138c07f..a798aa0 100644 --- a/app/src/main/java/com/example/defenseapplication/view/AutoModeNoticeDialog.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/AutoModeNoticeDialog.kt @@ -1,12 +1,12 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.Context import android.os.Bundle import android.view.Gravity import android.view.WindowManager -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.DialogAutoModeNoticeBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.DialogAutoModeNoticeBinding import java.util.Calendar class AutoModeNoticeDialog(context: Context) : Dialog(context) { diff --git a/app/src/main/java/com/example/defenseapplication/view/AvatarSelectDialog.kt b/app/src/main/java/com/ckkj/defense_device/view/AvatarSelectDialog.kt similarity index 90% rename from app/src/main/java/com/example/defenseapplication/view/AvatarSelectDialog.kt rename to app/src/main/java/com/ckkj/defense_device/view/AvatarSelectDialog.kt index 1a95209..03391f5 100644 --- a/app/src/main/java/com/example/defenseapplication/view/AvatarSelectDialog.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/AvatarSelectDialog.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.Context @@ -6,10 +6,8 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.view.Gravity import android.view.LayoutInflater -import android.view.View import android.view.WindowManager -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.DialogAvatarSelectBinding +import com.ckkj.defense_device.databinding.DialogAvatarSelectBinding class AvatarSelectDialog(context: Context) { diff --git a/app/src/main/java/com/example/defenseapplication/view/ContainerSelectDialog.kt b/app/src/main/java/com/ckkj/defense_device/view/ContainerSelectDialog.kt similarity index 94% rename from app/src/main/java/com/example/defenseapplication/view/ContainerSelectDialog.kt rename to app/src/main/java/com/ckkj/defense_device/view/ContainerSelectDialog.kt index 25c4a9d..96093b9 100644 --- a/app/src/main/java/com/example/defenseapplication/view/ContainerSelectDialog.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/ContainerSelectDialog.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.Context @@ -6,10 +6,9 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.view.Gravity import android.view.LayoutInflater -import android.view.View import android.view.WindowManager -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.DialogContainerSelectBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.DialogContainerSelectBinding class ContainerSelectDialog(context: Context) { diff --git a/app/src/main/java/com/example/defenseapplication/view/CustomDialogFragment.kt b/app/src/main/java/com/ckkj/defense_device/view/CustomDialogFragment.kt similarity index 96% rename from app/src/main/java/com/example/defenseapplication/view/CustomDialogFragment.kt rename to app/src/main/java/com/ckkj/defense_device/view/CustomDialogFragment.kt index 1f2a83f..6978f8c 100644 --- a/app/src/main/java/com/example/defenseapplication/view/CustomDialogFragment.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/CustomDialogFragment.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.DialogInterface @@ -9,8 +9,8 @@ import android.view.View import android.view.ViewGroup import android.view.WindowManager import androidx.fragment.app.DialogFragment -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.DialogCustomBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.DialogCustomBinding class CustomDialogFragmentText : DialogFragment() { diff --git a/app/src/main/java/com/example/defenseapplication/view/DialogFragment.kt b/app/src/main/java/com/ckkj/defense_device/view/DialogFragment.kt similarity index 99% rename from app/src/main/java/com/example/defenseapplication/view/DialogFragment.kt rename to app/src/main/java/com/ckkj/defense_device/view/DialogFragment.kt index 739b39a..efc918a 100644 --- a/app/src/main/java/com/example/defenseapplication/view/DialogFragment.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/DialogFragment.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.os.Bundle @@ -14,7 +14,7 @@ import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentManager -import com.example.defenseapplication.R +import com.ckkj.defense_device.R class CustomDialogFragment : androidx.fragment.app.DialogFragment() { diff --git a/app/src/main/java/com/example/defenseapplication/view/FaceAnalyzer.kt b/app/src/main/java/com/ckkj/defense_device/view/FaceAnalyzer.kt similarity index 96% rename from app/src/main/java/com/example/defenseapplication/view/FaceAnalyzer.kt rename to app/src/main/java/com/ckkj/defense_device/view/FaceAnalyzer.kt index d64d385..b2d0905 100644 --- a/app/src/main/java/com/example/defenseapplication/view/FaceAnalyzer.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/FaceAnalyzer.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.os.Handler import android.os.Looper diff --git a/app/src/main/java/com/example/defenseapplication/view/FaceOverlayView.kt b/app/src/main/java/com/ckkj/defense_device/view/FaceOverlayView.kt similarity index 98% rename from app/src/main/java/com/example/defenseapplication/view/FaceOverlayView.kt rename to app/src/main/java/com/ckkj/defense_device/view/FaceOverlayView.kt index 87c2d56..dddb3f5 100644 --- a/app/src/main/java/com/example/defenseapplication/view/FaceOverlayView.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/FaceOverlayView.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.content.Context import android.graphics.* diff --git a/app/src/main/java/com/example/defenseapplication/view/FamilySwitchDialog.kt b/app/src/main/java/com/ckkj/defense_device/view/FamilySwitchDialog.kt similarity index 90% rename from app/src/main/java/com/example/defenseapplication/view/FamilySwitchDialog.kt rename to app/src/main/java/com/ckkj/defense_device/view/FamilySwitchDialog.kt index f6c791f..f3f9e83 100644 --- a/app/src/main/java/com/example/defenseapplication/view/FamilySwitchDialog.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/FamilySwitchDialog.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.Context @@ -10,14 +10,14 @@ import android.widget.TextView import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.defenseapplication.R -import com.example.defenseapplication.adapter.FamilySwitchAdapter -import com.example.defenseapplication.bean.FamilyBean -import com.example.defenseapplication.bean.SwitchFamilyRequest -import com.example.defenseapplication.model.FamilyItem -import com.example.defenseapplication.utils.FamilySwitchEvent -import com.example.defenseapplication.utils.RetrofitNetwork -import com.example.defenseapplication.utils.UserinfoUtil +import com.ckkj.defense_device.R +import com.ckkj.defense_device.adapter.FamilySwitchAdapter +import com.ckkj.defense_device.bean.FamilyBean +import com.ckkj.defense_device.bean.SwitchFamilyRequest +import com.ckkj.defense_device.model.FamilyItem +import com.ckkj.defense_device.utils.FamilySwitchEvent +import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.utils.UserinfoUtil import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/defenseapplication/view/LanguageDialog.kt b/app/src/main/java/com/ckkj/defense_device/view/LanguageDialog.kt similarity index 91% rename from app/src/main/java/com/example/defenseapplication/view/LanguageDialog.kt rename to app/src/main/java/com/ckkj/defense_device/view/LanguageDialog.kt index d5d5cba..ef98a14 100644 --- a/app/src/main/java/com/example/defenseapplication/view/LanguageDialog.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/LanguageDialog.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.Context @@ -8,9 +8,9 @@ import android.view.Window import android.view.WindowManager import android.widget.LinearLayout import android.widget.TextView -import com.example.defenseapplication.R -import com.example.defenseapplication.utils.AppLanguage -import com.example.defenseapplication.utils.LanguageUtil +import com.ckkj.defense_device.R +import com.ckkj.defense_device.utils.AppLanguage +import com.ckkj.defense_device.utils.LanguageUtil /** * 语言选择对话框 diff --git a/app/src/main/java/com/example/defenseapplication/view/LoadingDialog.kt b/app/src/main/java/com/ckkj/defense_device/view/LoadingDialog.kt similarity index 91% rename from app/src/main/java/com/example/defenseapplication/view/LoadingDialog.kt rename to app/src/main/java/com/ckkj/defense_device/view/LoadingDialog.kt index 785c9cc..4436af5 100644 --- a/app/src/main/java/com/example/defenseapplication/view/LoadingDialog.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/LoadingDialog.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.Context @@ -7,7 +7,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Gravity import android.view.LayoutInflater import android.view.WindowManager -import com.example.defenseapplication.databinding.DialogLoadingBinding +import com.ckkj.defense_device.databinding.DialogLoadingBinding class LoadingDialog(context: Context) { diff --git a/app/src/main/java/com/example/defenseapplication/view/MyGSYVideoPlayer.kt b/app/src/main/java/com/ckkj/defense_device/view/MyGSYVideoPlayer.kt similarity index 97% rename from app/src/main/java/com/example/defenseapplication/view/MyGSYVideoPlayer.kt rename to app/src/main/java/com/ckkj/defense_device/view/MyGSYVideoPlayer.kt index f97ec11..fbfc32d 100644 --- a/app/src/main/java/com/example/defenseapplication/view/MyGSYVideoPlayer.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/MyGSYVideoPlayer.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/example/defenseapplication/view/MyGSYVideoPlayerLive.kt b/app/src/main/java/com/ckkj/defense_device/view/MyGSYVideoPlayerLive.kt similarity index 96% rename from app/src/main/java/com/example/defenseapplication/view/MyGSYVideoPlayerLive.kt rename to app/src/main/java/com/ckkj/defense_device/view/MyGSYVideoPlayerLive.kt index 39c1f27..c93972f 100644 --- a/app/src/main/java/com/example/defenseapplication/view/MyGSYVideoPlayerLive.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/MyGSYVideoPlayerLive.kt @@ -1,10 +1,10 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.view.View -import com.example.defenseapplication.R +import com.ckkj.defense_device.R import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer diff --git a/app/src/main/java/com/example/defenseapplication/view/PasswordInputDialog.kt b/app/src/main/java/com/ckkj/defense_device/view/PasswordInputDialog.kt similarity index 98% rename from app/src/main/java/com/example/defenseapplication/view/PasswordInputDialog.kt rename to app/src/main/java/com/ckkj/defense_device/view/PasswordInputDialog.kt index 225beab..563bbbe 100644 --- a/app/src/main/java/com/example/defenseapplication/view/PasswordInputDialog.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/PasswordInputDialog.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.personal +package com.ckkj.defense_device.personal import android.app.Dialog import android.content.Context @@ -14,8 +14,8 @@ import android.view.WindowManager import android.view.animation.AnimationUtils import android.view.inputmethod.InputMethodManager import android.widget.EditText -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.DialogPasswordInputBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.DialogPasswordInputBinding class PasswordInputDialog(context: Context) : Dialog(context) { diff --git a/app/src/main/java/com/example/defenseapplication/view/PhoneModifyDialogFragment.kt b/app/src/main/java/com/ckkj/defense_device/view/PhoneModifyDialogFragment.kt similarity index 96% rename from app/src/main/java/com/example/defenseapplication/view/PhoneModifyDialogFragment.kt rename to app/src/main/java/com/ckkj/defense_device/view/PhoneModifyDialogFragment.kt index 9b2d65a..0cd0e0f 100644 --- a/app/src/main/java/com/example/defenseapplication/view/PhoneModifyDialogFragment.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/PhoneModifyDialogFragment.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.DialogInterface @@ -10,9 +10,9 @@ import android.view.View import android.view.ViewGroup import android.view.WindowManager import androidx.fragment.app.DialogFragment -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.DialogPhoneModifyBinding -import com.example.defenseapplication.utils.RetrofitNetwork +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.DialogPhoneModifyBinding +import com.ckkj.defense_device.utils.RetrofitNetwork import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/defenseapplication/view/RecognitionModeDialog.kt b/app/src/main/java/com/ckkj/defense_device/view/RecognitionModeDialog.kt similarity index 93% rename from app/src/main/java/com/example/defenseapplication/view/RecognitionModeDialog.kt rename to app/src/main/java/com/ckkj/defense_device/view/RecognitionModeDialog.kt index 3cfc170..3d801be 100644 --- a/app/src/main/java/com/example/defenseapplication/view/RecognitionModeDialog.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/RecognitionModeDialog.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication.view +package com.ckkj.defense_device.view import android.app.Dialog import android.content.Context @@ -6,8 +6,8 @@ import android.os.Bundle import android.view.Gravity import android.view.WindowManager import android.widget.LinearLayout -import com.example.defenseapplication.R -import com.example.defenseapplication.databinding.DialogRecognitionModeBinding +import com.ckkj.defense_device.R +import com.ckkj.defense_device.databinding.DialogRecognitionModeBinding class RecognitionModeDialog(context: Context) : Dialog(context) { diff --git a/app/src/main/java/com/example/defenseapplication/view/TimePickerFragment.kt b/app/src/main/java/com/ckkj/defense_device/view/TimePickerFragment.kt similarity index 100% rename from app/src/main/java/com/example/defenseapplication/view/TimePickerFragment.kt rename to app/src/main/java/com/ckkj/defense_device/view/TimePickerFragment.kt diff --git a/app/src/main/java/com/example/defenseapplication/view/ToastUtils.kt b/app/src/main/java/com/ckkj/defense_device/view/ToastUtils.kt similarity index 98% rename from app/src/main/java/com/example/defenseapplication/view/ToastUtils.kt rename to app/src/main/java/com/ckkj/defense_device/view/ToastUtils.kt index 11ae826..16eda5d 100644 --- a/app/src/main/java/com/example/defenseapplication/view/ToastUtils.kt +++ b/app/src/main/java/com/ckkj/defense_device/view/ToastUtils.kt @@ -4,7 +4,7 @@ import android.view.LayoutInflater import android.widget.ImageView import android.widget.TextView import android.widget.Toast -import com.example.defenseapplication.R +import com.ckkj.defense_device.R object ToastUtils { diff --git a/app/src/main/res/layout/alarm_log_activity.xml b/app/src/main/res/layout/alarm_log_activity.xml index cfcc8b9..feb4fe3 100644 --- a/app/src/main/res/layout/alarm_log_activity.xml +++ b/app/src/main/res/layout/alarm_log_activity.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content"> - - - diff --git a/app/src/test/java/com/example/defenseapplication/ExampleUnitTest.kt b/app/src/test/java/com/ckkj/defense_device/ExampleUnitTest.kt similarity index 88% rename from app/src/test/java/com/example/defenseapplication/ExampleUnitTest.kt rename to app/src/test/java/com/ckkj/defense_device/ExampleUnitTest.kt index ac5f1ca..81288c1 100644 --- a/app/src/test/java/com/example/defenseapplication/ExampleUnitTest.kt +++ b/app/src/test/java/com/ckkj/defense_device/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.example.defenseapplication +package com.ckkj.defense_device import org.junit.Test