Skip to content

Commit 7a042c1

Browse files
committed
ю
1 parent 366b7ff commit 7a042c1

6 files changed

Lines changed: 36 additions & 3 deletions

File tree

mobile/src/main/assets/ffmpeg

-48.1 MB
Binary file not shown.

mobile/src/main/java/com/iokreal/myapplication/MainActivity.kt

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.util.Base64
99
import android.util.Log
1010
import android.view.View
1111
import android.widget.LinearLayout
12+
import android.widget.Toast
1213
import androidx.activity.enableEdgeToEdge
1314
import androidx.media3.common.MediaItem
1415
import androidx.media3.exoplayer.ExoPlayer
@@ -17,6 +18,7 @@ import androidx.core.content.edit
1718
import androidx.core.view.WindowCompat
1819
import androidx.core.view.WindowInsetsCompat
1920
import androidx.core.view.WindowInsetsControllerCompat
21+
import com.iokreal.myapplication.AppPreferences.sharedPref
2022
import org.json.JSONObject
2123
import java.io.File
2224
import java.lang.Long.min
@@ -96,6 +98,7 @@ class MainActivity : AppCompatActivity() {
9698
val intent = Intent(this, Login::class.java)
9799
startActivity(intent)
98100
}
101+
99102
private fun nukewebviewtData() {
100103
if (AppPreferences.webInited){
101104
val dataDir = File(applicationInfo.dataDir)
@@ -105,20 +108,23 @@ class MainActivity : AppCompatActivity() {
105108
}
106109

107110
private fun setStreamsUser(){
111+
val LinearLayout = findViewById<LinearLayout>(R.id.LinearLayoutVideoView6)
108112
val playerView = findViewById<PlayerView>(R.id.videoView6)
109113
Log.d("setStreamsUser", AppPreferences.urlCam)
110114
if (AppPreferences.urlCam != "" ) {
111115
initPlayer(playerView, AppPreferences.urlCam)
116+
LinearLayout.visibility = View.VISIBLE
117+
playerView.visibility = View.VISIBLE
112118
}else{
113-
val LinearLayout = findViewById<LinearLayout>(R.id.LinearLayoutVideoView6)
114119
LinearLayout.visibility = View.GONE
115120
playerView.visibility = View.GONE
116121
}
117122
}
118123
private fun setStreamsRTC(){
119124
var minTime = 100000000000
120125
try {
121-
val connection = URL("https://vc.key.rt.ru/api/v1/cameras?limit=100&offset=0").openConnection() as HttpURLConnection // thx https://github.com/artgl/hass_rtkey/blob/master/custom_components/rtkey/__init__.py
126+
val connection = URL("https://vc.key.rt.ru/api/v1/cameras?limit=100&offset=0").openConnection() as HttpURLConnection
127+
// thx https://github.com/artgl/hass_rtkey/blob/master/custom_components/rtkey/__init__.py
122128
connection.requestMethod = "GET"
123129
connection.connectTimeout = 5000
124130
connection.readTimeout = 5000
@@ -204,7 +210,30 @@ class MainActivity : AppCompatActivity() {
204210
}
205211
fun openDoor(view: View) {
206212
Thread{
207-
setStreamsRTC()
213+
var status = ""
214+
try {
215+
val connection = URL("https://household.key.rt.ru/api/v2/app/devices/${AppPreferences.idDoor}/open").openConnection() as HttpURLConnection
216+
connection.requestMethod = "POST"
217+
connection.connectTimeout = 4000
218+
connection.readTimeout = 4000
219+
connection.setRequestProperty("Authorization", AppPreferences.key)
220+
221+
val code = connection.responseCode
222+
if (code == 200) {
223+
status = "Открыто"
224+
} else if (code == 401) {
225+
status = "Ключ устарел, требуется повторный вход"
226+
AppPreferences.key = ""
227+
} else {
228+
status = "Ошибка: $code"
229+
}
230+
connection.disconnect()
231+
} catch (e: Exception) {
232+
status = "Ошибка сети"
233+
}
234+
runOnUiThread {
235+
Toast.makeText(this@MainActivity, status, Toast.LENGTH_SHORT).show()
236+
}
208237
}.start()
209238
}
210239
}

mobile/src/main/java/com/iokreal/myapplication/Settings.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class Settings : AppCompatActivity() {
5555
connection.requestMethod = "GET"
5656
connection.connectTimeout = 5000
5757
connection.readTimeout = 5000
58+
//TUDO: нужна обработка отсутствия интернета
5859
connection.setRequestProperty("Authorization", AppPreferences.key)
5960
Log.d("setStreamsRTC", connection.responseCode.toString())
6061
val jsonString = connection.inputStream.bufferedReader().use { it.readText() }

mobile/src/main/res/layout/activity_login.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:keepScreenOn="true"
45
xmlns:tools="http://schemas.android.com/tools"
56
android:id="@+id/main"
67
android:layout_width="match_parent"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout
3+
android:keepScreenOn="true"
34
xmlns:android="http://schemas.android.com/apk/res/android"
45
xmlns:app="http://schemas.android.com/apk/res-auto"
56
xmlns:tools="http://schemas.android.com/tools"

mobile/src/main/res/layout/activity_settings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout
3+
android:keepScreenOn="true"
34
xmlns:android="http://schemas.android.com/apk/res/android"
45
xmlns:app="http://schemas.android.com/apk/res-auto"
56
xmlns:tools="http://schemas.android.com/tools"

0 commit comments

Comments
 (0)