diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 30920313..fe816c46 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ - + @@ -57,11 +57,21 @@ + + + + diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt new file mode 100644 index 00000000..efa45cf5 --- /dev/null +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt @@ -0,0 +1,137 @@ +package com.navinfo.omqs.ui.activity.console + +import android.os.Bundle +import android.util.Log +import android.view.View +import android.view.View.OnClickListener +import androidx.core.view.WindowCompat +import androidx.fragment.app.Fragment +import androidx.navigation.findNavController +import androidx.transition.AutoTransition +import androidx.transition.Scene +import androidx.transition.TransitionManager +import com.navinfo.omqs.R +import com.navinfo.omqs.databinding.ActivityConsoleBinding +import com.navinfo.omqs.ui.activity.BaseActivity +import com.navinfo.omqs.ui.fragment.offlinemap.OfflineMapFragment + + +class ConsoleActivity : BaseActivity(), OnClickListener { + + private var _binding: ActivityConsoleBinding? = null + private val binding get() = _binding!! + private var sceneFlag = true + private val aTransition = AutoTransition() + private val bTransition = AutoTransition() + private var mFragment: Fragment? = null + + // 创建a场景 + private val aScene by lazy { + Scene.getSceneForLayout( + binding.consoleRoot, R.layout.console_on, this + ) + } + + // 创建b场景 + private val bScene by lazy { + Scene.getSceneForLayout( + binding.consoleRoot, R.layout.console_off, this + ) + } + +// private val mTransitionAManager: TransitionManager by lazy { +// TransitionInflater.from(this) +// .inflateTransitionManager(R.transition.transitionmanager_console, binding.consoleRoot) +// } + + + override fun onCreate(savedInstanceState: Bundle?) { + WindowCompat.setDecorFitsSystemWindows(window, false) + super.onCreate(savedInstanceState) + _binding = ActivityConsoleBinding.inflate(layoutInflater) + setContentView(_binding!!.root) +// mTransitionAManager.setTransition(bScene, transition) + + aTransition.addListener(object : androidx.transition.Transition.TransitionListener { + override fun onTransitionStart(transition: androidx.transition.Transition) { + Log.e("jingo", "动画开始") + } + + override fun onTransitionEnd(transition: androidx.transition.Transition) { + initOnClickListener() + } + + override fun onTransitionCancel(transition: androidx.transition.Transition) { + } + + override fun onTransitionPause(transition: androidx.transition.Transition) { + } + + override fun onTransitionResume(transition: androidx.transition.Transition) { + } + + }) + bTransition.addListener(object : androidx.transition.Transition.TransitionListener { + override fun onTransitionStart(transition: androidx.transition.Transition) { + } + + override fun onTransitionEnd(transition: androidx.transition.Transition) { + initOnClickListener() + } + + override fun onTransitionCancel(transition: androidx.transition.Transition) { + } + + override fun onTransitionPause(transition: androidx.transition.Transition) { + } + + override fun onTransitionResume(transition: androidx.transition.Transition) { + } + + }) + initOnClickListener() + } + + /** + * 设置点击事件 + */ + private fun initOnClickListener() { + // 添加点击事件,切换不同的场景 + binding.consoleRoot.findViewById(R.id.console_map_icon_bg)?.setOnClickListener( + this + ) + // 添加点击事件,切换不同的场景 + binding.consoleRoot.findViewById(R.id.console_on_map_icon_bg) + ?.setOnClickListener(this) + binding.consoleRoot.findViewById(R.id.console_map_bg)?.setOnClickListener(this) + } + + override fun onDestroy() { + super.onDestroy() + _binding = null + } + + override fun onClick(v: View?) { + v?.let { + when (it.id) { + R.id.console_map_bg, R.id.console_map_icon_bg -> { + sceneFlag = if (sceneFlag) { + TransitionManager.go(bScene, bTransition) + false + } else { + TransitionManager.go(aScene, aTransition) + true + } + } + R.id.console_offline_map_bg -> { + if (sceneFlag) { + mFragment = OfflineMapFragment() + sceneFlag = false + TransitionManager.go(bScene, bTransition) + } + } + } + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-xxhdpi/console_bg.jpg b/app/src/main/res/drawable-xxhdpi/console_bg.jpg new file mode 100644 index 00000000..a7b0e3d7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/console_bg.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_camera.png b/app/src/main/res/drawable-xxhdpi/icon_console_camera.png new file mode 100644 index 00000000..ed8a404f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_camera.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_evaluation.png b/app/src/main/res/drawable-xxhdpi/icon_console_evaluation.png new file mode 100644 index 00000000..9caa89d0 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_evaluation.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_layer_setting.png b/app/src/main/res/drawable-xxhdpi/icon_console_layer_setting.png new file mode 100644 index 00000000..506a2a59 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_layer_setting.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_location.png b/app/src/main/res/drawable-xxhdpi/icon_console_location.png new file mode 100644 index 00000000..5fdc0d86 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_location.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_map.png b/app/src/main/res/drawable-xxhdpi/icon_console_map.png new file mode 100644 index 00000000..b1c8c23d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_map.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_offline_map.png b/app/src/main/res/drawable-xxhdpi/icon_console_offline_map.png new file mode 100644 index 00000000..0d5dafb1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_offline_map.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_personal_center.png b/app/src/main/res/drawable-xxhdpi/icon_console_personal_center.png new file mode 100644 index 00000000..49256d4c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_personal_center.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_route.png b/app/src/main/res/drawable-xxhdpi/icon_console_route.png new file mode 100644 index 00000000..024a8c98 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_route.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_task.png b/app/src/main/res/drawable-xxhdpi/icon_console_task.png new file mode 100644 index 00000000..b7465a5f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_task.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_console_track.png b/app/src/main/res/drawable-xxhdpi/icon_console_track.png new file mode 100644 index 00000000..376503ee Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_console_track.png differ diff --git a/app/src/main/res/drawable/shape_btn_video_normal.xml b/app/src/main/res/drawable/shape_btn_video_normal.xml index 6dcd6f1a..7e3588a7 100644 --- a/app/src/main/res/drawable/shape_btn_video_normal.xml +++ b/app/src/main/res/drawable/shape_btn_video_normal.xml @@ -3,7 +3,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_console_track_bg.xml b/app/src/main/res/drawable/shape_console_track_bg.xml new file mode 100644 index 00000000..a99ddb17 --- /dev/null +++ b/app/src/main/res/drawable/shape_console_track_bg.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_oval_black_bg.xml b/app/src/main/res/drawable/shape_oval_black_bg.xml new file mode 100644 index 00000000..cefe3e3a --- /dev/null +++ b/app/src/main/res/drawable/shape_oval_black_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_oval_gray_bg.xml b/app/src/main/res/drawable/shape_oval_gray_bg.xml new file mode 100644 index 00000000..810d4a21 --- /dev/null +++ b/app/src/main/res/drawable/shape_oval_gray_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_oval_gray_hex_bg.xml b/app/src/main/res/drawable/shape_oval_gray_hex_bg.xml new file mode 100644 index 00000000..67b436d1 --- /dev/null +++ b/app/src/main/res/drawable/shape_oval_gray_hex_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rect_black_8dp_bg.xml b/app/src/main/res/drawable/shape_rect_black_8dp_bg.xml new file mode 100644 index 00000000..9e391212 --- /dev/null +++ b/app/src/main/res/drawable/shape_rect_black_8dp_bg.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_console.xml b/app/src/main/res/layout/activity_console.xml new file mode 100644 index 00000000..0befc3e1 --- /dev/null +++ b/app/src/main/res/layout/activity_console.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_top_sign.xml b/app/src/main/res/layout/adapter_top_sign.xml index e2a492ed..fbfcdf86 100644 --- a/app/src/main/res/layout/adapter_top_sign.xml +++ b/app/src/main/res/layout/adapter_top_sign.xml @@ -16,7 +16,7 @@ android:paddingBottom="5dp" android:text="名称" android:textColor="@color/white" - android:textSize="14sp" /> + android:textSize="12sp" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/console_on.xml b/app/src/main/res/layout/console_on.xml new file mode 100644 index 00000000..e9f657e6 --- /dev/null +++ b/app/src/main/res/layout/console_on.xml @@ -0,0 +1,495 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/console_nav_graph.xml b/app/src/main/res/navigation/console_nav_graph.xml new file mode 100644 index 00000000..cc3bfaff --- /dev/null +++ b/app/src/main/res/navigation/console_nav_graph.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/transition/transitionmanager_console.xml b/app/src/main/res/transition/transitionmanager_console.xml new file mode 100644 index 00000000..5a4b72c6 --- /dev/null +++ b/app/src/main/res/transition/transitionmanager_console.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/transition/transitionset_console_on.xml b/app/src/main/res/transition/transitionset_console_on.xml new file mode 100644 index 00000000..b2c18be1 --- /dev/null +++ b/app/src/main/res/transition/transitionset_console_on.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ad37daa4..d8672f37 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,5 +1,27 @@ + + + + + +