mirror of
https://github.com/gedoor/legado.git
synced 2024-07-02 23:17:32 +08:00
Compare commits
2 Commits
17416e06f6
...
c53e789762
Author | SHA1 | Date | |
---|---|---|---|
|
c53e789762 | ||
|
2e757ee105 |
|
@ -7,7 +7,6 @@ import android.net.wifi.WifiManager
|
|||
import android.os.Build
|
||||
import android.os.PowerManager
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.content.ContextCompat
|
||||
import io.legado.app.R
|
||||
import io.legado.app.base.BaseService
|
||||
import io.legado.app.constant.AppConst
|
||||
|
@ -23,6 +22,7 @@ import io.legado.app.utils.postEvent
|
|||
import io.legado.app.utils.printOnDebug
|
||||
import io.legado.app.utils.sendToClip
|
||||
import io.legado.app.utils.servicePendingIntent
|
||||
import io.legado.app.utils.startForegroundServiceCompat
|
||||
import io.legado.app.utils.startService
|
||||
import io.legado.app.utils.stopService
|
||||
import io.legado.app.utils.toastOnUi
|
||||
|
@ -45,7 +45,7 @@ class WebService : BaseService() {
|
|||
|
||||
fun startForeground(context: Context) {
|
||||
val intent = Intent(context, WebService::class.java)
|
||||
ContextCompat.startForegroundService(context, intent)
|
||||
context.startForegroundServiceCompat(intent)
|
||||
}
|
||||
|
||||
fun stop(context: Context) {
|
||||
|
@ -94,7 +94,13 @@ class WebService : BaseService() {
|
|||
val addressList = NetworkUtils.getLocalIPAddress()
|
||||
notificationList.clear()
|
||||
if (addressList.any()) {
|
||||
notificationList.addAll(addressList.map { address -> getString(R.string.http_ip, address.hostAddress, getPort()) })
|
||||
notificationList.addAll(addressList.map { address ->
|
||||
getString(
|
||||
R.string.http_ip,
|
||||
address.hostAddress,
|
||||
getPort()
|
||||
)
|
||||
})
|
||||
hostAddress = notificationList.first()
|
||||
} else {
|
||||
hostAddress = getString(R.string.network_connection_unavailable)
|
||||
|
@ -154,7 +160,13 @@ class WebService : BaseService() {
|
|||
httpServer?.start()
|
||||
webSocketServer?.start(1000 * 30) // 通信超时设置
|
||||
notificationList.clear()
|
||||
notificationList.addAll(addressList.map { address -> getString(R.string.http_ip, address.hostAddress, getPort()) })
|
||||
notificationList.addAll(addressList.map { address ->
|
||||
getString(
|
||||
R.string.http_ip,
|
||||
address.hostAddress,
|
||||
getPort()
|
||||
)
|
||||
})
|
||||
hostAddress = notificationList.first()
|
||||
isRun = true
|
||||
postEvent(EventBus.WEB_SERVICE, hostAddress)
|
||||
|
|
|
@ -13,6 +13,7 @@ import androidx.lifecycle.lifecycleScope
|
|||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import io.legado.app.R
|
||||
import io.legado.app.constant.PreferKey
|
||||
import io.legado.app.data.appDb
|
||||
import io.legado.app.databinding.DialogEditTextBinding
|
||||
import io.legado.app.help.config.AppConfig
|
||||
import io.legado.app.lib.dialogs.alert
|
||||
|
@ -22,7 +23,14 @@ import io.legado.app.lib.theme.backgroundColor
|
|||
import io.legado.app.ui.book.import.BaseImportBookActivity
|
||||
import io.legado.app.ui.file.HandleFileContract
|
||||
import io.legado.app.ui.widget.SelectActionBar
|
||||
import io.legado.app.utils.*
|
||||
import io.legado.app.utils.ArchiveUtils
|
||||
import io.legado.app.utils.FileDoc
|
||||
import io.legado.app.utils.gone
|
||||
import io.legado.app.utils.isContentScheme
|
||||
import io.legado.app.utils.isUri
|
||||
import io.legado.app.utils.launch
|
||||
import io.legado.app.utils.putPrefInt
|
||||
import io.legado.app.utils.visible
|
||||
import kotlinx.coroutines.Dispatchers.IO
|
||||
import kotlinx.coroutines.Dispatchers.Main
|
||||
import kotlinx.coroutines.Job
|
||||
|
@ -175,6 +183,7 @@ class ImportBookActivity : BaseImportBookActivity<ImportBookViewModel>(),
|
|||
selectFolder.launch()
|
||||
}
|
||||
}
|
||||
|
||||
else -> initRootPath(rootUri.path!!)
|
||||
}
|
||||
}
|
||||
|
@ -291,7 +300,9 @@ class ImportBookActivity : BaseImportBookActivity<ImportBookViewModel>(),
|
|||
|
||||
override fun startRead(fileDoc: FileDoc) {
|
||||
if (!ArchiveUtils.isArchive(fileDoc.name)) {
|
||||
startReadBook(fileDoc.toString())
|
||||
appDb.bookDao.getBookByFileName(fileDoc.name)?.let {
|
||||
startReadBook(it.bookUrl)
|
||||
}
|
||||
} else {
|
||||
onArchiveFileClick(fileDoc)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user