zhangxn
/
puwei
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desc:关机保存录像

Browse Source
main
xiaowusky 1 year ago
parent 2c4b453182
commit 100f5c03e6
8 changed files with 91 additions and 26 deletions
Show Stats Download Patch File Download Diff File

25
app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
Unescape Escape View File

@ -24,6 +24,7 @@ import com.yinuo.safetywatcher.watcher.constant.NAMESPACE_ANDROID
import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog
import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
import com.yinuo.safetywatcher.watcher.utils.PlatformUtils import com.yinuo.safetywatcher.watcher.utils.PlatformUtils
import com.yinuo.safetywatcher.watcher.utils.RecordHelper
import com.yinuo.safetywatcher.watcher.utils.SoundUtils import com.yinuo.safetywatcher.watcher.utils.SoundUtils
import com.yinuo.safetywatcher.watcher.utils.VolumeUtil import com.yinuo.safetywatcher.watcher.utils.VolumeUtil
import com.yinuo.safetywatcher.watcher.utils.trySetCommonBg import com.yinuo.safetywatcher.watcher.utils.trySetCommonBg
@ -51,6 +52,22 @@ abstract class BaseActivity : AppCompatActivity() {
setChildContent() setChildContent()
initView() initView()
setTopBar() setTopBar()
setForShutDown()
}
private fun setForShutDown() {
baseBinding.tvCancel.setOnClickListener {
baseBinding.layoutShutdown.visibility = View.GONE
}
baseBinding.tvConfirm.setOnClickListener {
onShutDown()
PlatformUtils.shutDown()
}
}
open fun onShutDown() {
// 暂停录制编码
RecordHelper.stopRecording()
} }
private fun initSound() { private fun initSound() {
@ -116,7 +133,7 @@ abstract class BaseActivity : AppCompatActivity() {
abstract fun getOptions(): List<CommonTopBar.Option>? abstract fun getOptions(): List<CommonTopBar.Option>?
open fun getTopBarTitle(): String?{ open fun getTopBarTitle(): String? {
return getString(R.string.back) return getString(R.string.back)
} }
@ -169,7 +186,7 @@ abstract class BaseActivity : AppCompatActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (!isHome){ if (!isHome) {
tryFocusBackArea() tryFocusBackArea()
} }
} }
@ -204,7 +221,9 @@ abstract class BaseActivity : AppCompatActivity() {
} }
} else if (keyCode == KeyEvent.KEYCODE_ENTER) { } else if (keyCode == KeyEvent.KEYCODE_ENTER) {
if (isHomeLongPress) { if (isHomeLongPress) {
PlatformUtils.shutDown() baseBinding.layoutShutdown.visibility = View.VISIBLE
lastFocusView = currentFocus
baseBinding.tvCancel.requestFocus()
return true return true
} }
} else if (keyCode == KeyEvent.KEYCODE_F1) { } else if (keyCode == KeyEvent.KEYCODE_F1) {

2
app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt
Unescape Escape View File

@ -63,7 +63,7 @@ object PlatformUtils {
fun shutDown() { fun shutDown() {
val intent = Intent("android.ido.intent.action.set.shutdown") val intent = Intent("android.ido.intent.action.set.shutdown")
intent.putExtra("confirm", true) intent.putExtra("confirm", false)
CommonApplication.getContext()?.sendBroadcast(intent) CommonApplication.getContext()?.sendBroadcast(intent)
} }

14
app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/InputWiFiPasswordDialog.kt
Unescape Escape View File

@ -72,13 +72,13 @@ class InputWiFiPasswordDialog : DialogFragment() {
} }
return@setOnKeyListener false return@setOnKeyListener false
} }
mBinding?.etPassword?.setOnFocusChangeListener { v, hasFocus -> // mBinding?.etPassword?.setOnFocusChangeListener { v, hasFocus ->
if (!hasFocus) { // if (!hasFocus) {
mBinding?.etPassword?.hideIme() // mBinding?.etPassword?.hideIme()
} else { // } else {
mBinding?.etPassword?.showIme() // mBinding?.etPassword?.showIme()
} // }
} // }
mBinding?.tvCancel?.setOnClickListener { mBinding?.tvCancel?.setOnClickListener {

6
app/src/main/res/drawable/bg_input.xml
Unescape Escape View File

@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#F4F4F4" /> <solid android:color="@color/_242f4d" />
<stroke android:color="@color/white" android:width="@dimen/_6dp"/>
<corners android:radius="8dp" /> <corners android:radius="@dimen/_20dp" />
</shape> </shape>

61
app/src/main/res/layout/activity_base.xml
Unescape Escape View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container" android:id="@+id/container"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/_303852"> android:background="@color/_303852"
android:orientation="vertical">
<com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar <com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
android:id="@+id/topBar" android:id="@+id/topBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/_120dp"/> android:layout_height="@dimen/_120dp" />
<RelativeLayout <RelativeLayout
android:id="@+id/area_sound" android:id="@+id/area_sound"
@ -25,19 +25,64 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:textSize="@dimen/_40dp" android:text="音量"
android:textColor="@color/white" android:textColor="@color/white"
android:text="音量"/> android:textSize="@dimen/_40dp" />
<SeekBar <SeekBar
android:id="@+id/sb_sound" android:id="@+id/sb_sound"
style="@style/LightSeekbarStyle" style="@style/LightSeekbarStyle"
android:focusable="true"
android:layout_width="@dimen/_630dp" android:layout_width="@dimen/_630dp"
android:layout_height="@dimen/_100dp" android:layout_height="@dimen/_100dp"
android:layout_marginTop="@dimen/_20dp"
android:layout_below="@+id/tv" android:layout_below="@+id/tv"
android:layout_marginTop="@dimen/_20dp"
android:focusable="true"
android:min="0" android:min="0"
android:padding="0dp"/> android:padding="0dp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/layout_shutdown"
android:layout_width="@dimen/_960dp"
android:layout_height="200px"
android:layout_centerInParent="true"
android:background="@drawable/warn_setting_btn_bg"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/_32dp"
android:layout_marginBottom="@dimen/_32dp"
android:text="您的设备将会关机！"
android:textColor="@color/white"
android:textSize="@dimen/_36dp" />
<TextView
android:id="@+id/tv_cancel"
android:layout_width="@dimen/_480dp"
android:layout_height="@dimen/_81dp"
android:layout_alignParentBottom="true"
android:background="@drawable/cancel_btn_bg"
android:focusable="true"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/white_30"
android:textSize="@dimen/_36dp" />
<TextView
android:id="@+id/tv_confirm"
android:layout_width="@dimen/_480dp"
android:layout_height="@dimen/_81dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:background="@drawable/confirm_btn_bg"
android:focusable="true"
android:gravity="center"
android:text="@string/confirm"
android:textColor="@color/white"
android:textSize="@dimen/_36dp" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

2
app/src/main/res/layout/activity_home.xml
Unescape Escape View File

@ -148,7 +148,7 @@
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/camera_switch" android:id="@+id/camera_switch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:checked="true" android:checked="false"
android:layout_height="@dimen/_34dp" android:layout_height="@dimen/_34dp"
android:layout_marginStart="@dimen/_13dp" /> android:layout_marginStart="@dimen/_13dp" />
</LinearLayout> </LinearLayout>

5
app/src/main/res/layout/dialog_input_wifi_password.xml
Unescape Escape View File

@ -36,10 +36,11 @@
android:layout_margin="12dp" android:layout_margin="12dp"
android:background="@drawable/bg_input" android:background="@drawable/bg_input"
android:inputType="textPassword" android:inputType="textPassword"
android:paddingLeft="16dp" android:paddingLeft="@dimen/_32dp"
android:paddingRight="16dp" android:paddingRight="@dimen/_32dp"
android:textCursorDrawable="@drawable/bg_cursor" android:textCursorDrawable="@drawable/bg_cursor"
android:textSize="@dimen/font_24dp" android:textSize="@dimen/font_24dp"
android:textColor="@color/white"
android:focusable="true" android:focusable="true"
android:focusedByDefault="true" android:focusedByDefault="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
library-push/src/main/java/org/easydarwin/PushHelper.kt
Unescape Escape View File

@ -89,7 +89,7 @@ object PushHelper {
LogUtils.e("PushHelper error, please setPushUrl first!!") LogUtils.e("PushHelper error, please setPushUrl first!!")
return return
} }
if (mPusher == null){ if (mPusher == null) {
mPusher = EasyPusher() mPusher = EasyPusher()
} }
mPusher?.initPush(mApplicationContext, callback) mPusher?.initPush(mApplicationContext, callback)

Write Preview
Loading…
Cancel
Save