diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7ac5171..bb4ce33 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,13 +27,16 @@ + android:screenOrientation="landscape"> + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt new file mode 100644 index 0000000..4f88228 --- /dev/null +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/SettingActivity.kt @@ -0,0 +1,19 @@ +package com.yinuo.safetywatcher.watcher + +import android.view.View +import com.yinuo.safetywatcher.databinding.ActivitySettingBinding +import com.yinuo.safetywatcher.watcher.base.BaseActivity + +class SettingActivity: BaseActivity() { + + private val mBinding: ActivitySettingBinding by lazy { + ActivitySettingBinding.inflate(layoutInflater) + } + + override fun generateContentView(): View { + return mBinding.root + } + + override fun initView() { + } +} \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt index b6d61ae..c98efb8 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt @@ -1,9 +1,8 @@ package com.yinuo.safetywatcher.watcher.base -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.view.View -import com.yinuo.safetywatcher.R +import androidx.appcompat.app.AppCompatActivity import com.yinuo.safetywatcher.databinding.ActivityBaseBinding abstract class BaseActivity : AppCompatActivity() { @@ -16,7 +15,9 @@ abstract class BaseActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(baseBinding.root) baseBinding.container.addView(generateContentView()) + initView() } open abstract fun generateContentView(): View + abstract fun initView() } \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt index 8abd3d2..d581b1c 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/view/CommonTopBar.kt @@ -1,8 +1,21 @@ package com.yinuo.safetywatcher.watcher.view import android.content.Context +import android.graphics.Color +import android.util.AttributeSet import android.widget.LinearLayout -class CommonTopBar(context: Context) : LinearLayout(context) { +class CommonTopBar : LinearLayout { + constructor(context: Context?) : this(context, null) + constructor(context: Context?, attrs: AttributeSet?) : this(context, attrs, 0) + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super( + context, + attrs, + defStyleAttr + ) + init { + //初始化方法 + setBackgroundColor(Color.RED) + } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 24f3d6b..bd4cb7e 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -3,4 +3,130 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml new file mode 100644 index 0000000..b242cee --- /dev/null +++ b/app/src/main/res/layout/activity_setting.xml @@ -0,0 +1,30 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_query.png b/app/src/main/res/mipmap-hdpi/ic_query.png new file mode 100644 index 0000000..e5317a9 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_query.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_recovery.png b/app/src/main/res/mipmap-hdpi/ic_recovery.png new file mode 100644 index 0000000..f1e7dca Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_recovery.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_setting.png b/app/src/main/res/mipmap-hdpi/ic_setting.png new file mode 100644 index 0000000..0c426eb Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_setting.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_wraning.png b/app/src/main/res/mipmap-hdpi/ic_wraning.png new file mode 100644 index 0000000..76f27cc Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_wraning.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_query.png b/app/src/main/res/mipmap-mdpi/ic_query.png new file mode 100644 index 0000000..8c6753e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_query.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_recovery.png b/app/src/main/res/mipmap-mdpi/ic_recovery.png new file mode 100644 index 0000000..c68610c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_recovery.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_setting.png b/app/src/main/res/mipmap-mdpi/ic_setting.png new file mode 100644 index 0000000..e6be287 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_setting.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_wraning.png b/app/src/main/res/mipmap-mdpi/ic_wraning.png new file mode 100644 index 0000000..a07b84e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_wraning.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_query.png b/app/src/main/res/mipmap-xhdpi/ic_query.png new file mode 100644 index 0000000..0a6ce7c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_query.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_recovery.png b/app/src/main/res/mipmap-xhdpi/ic_recovery.png new file mode 100644 index 0000000..8b31f4f Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_recovery.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_setting.png b/app/src/main/res/mipmap-xhdpi/ic_setting.png new file mode 100644 index 0000000..3d60d34 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_setting.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_wraning.png b/app/src/main/res/mipmap-xhdpi/ic_wraning.png new file mode 100644 index 0000000..704d4ae Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_wraning.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_query.png b/app/src/main/res/mipmap-xxhdpi/ic_query.png new file mode 100644 index 0000000..e91b196 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_query.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_recovery.png b/app/src/main/res/mipmap-xxhdpi/ic_recovery.png new file mode 100644 index 0000000..14b96ef Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_recovery.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_setting.png b/app/src/main/res/mipmap-xxhdpi/ic_setting.png new file mode 100644 index 0000000..1b29f36 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_setting.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_wraning.png b/app/src/main/res/mipmap-xxhdpi/ic_wraning.png new file mode 100644 index 0000000..9440834 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_wraning.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e779ff3..7fb04ba 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,8 @@ #ffffff #1ED5CA #66000000 + + + #242F4D + #4C242F4D diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 2a6f1db..16cf2af 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,4 +1,16 @@ - 87dp + 87px + 288px + 536px + 21px + 272px + 88px + 29px + 68px + 66px + 30px + 13px + 34px + 185px \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b5af190..1b69d07 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,10 @@ My Application + 设置 + 数据查询 + 报警记录 + 报警重置 + 摄像头