|
@@ -116,6 +116,16 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
|
|
private fun initControlBarView() {
|
|
private fun initControlBarView() {
|
|
controlBarView.setBtnSelected(6)
|
|
controlBarView.setBtnSelected(6)
|
|
switchToPreViewLayer()
|
|
switchToPreViewLayer()
|
|
|
|
+ project.story?.let {
|
|
|
|
+ it.scenes?.let {
|
|
|
|
+ if (it[currentSceneIndex].record != null) {
|
|
|
|
+ controlBarView.visibility = View.INVISIBLE
|
|
|
|
+ sceneEditView.setOnTouchListener(null)
|
|
|
|
+ } else {
|
|
|
|
+ controlBarView.visibility = View.VISIBLE
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
controlBarView.setonClickSwipeLayerBtn(View.OnClickListener {
|
|
controlBarView.setonClickSwipeLayerBtn(View.OnClickListener {
|
|
switchToPreViewLayer()
|
|
switchToPreViewLayer()
|
|
})
|
|
})
|
|
@@ -147,7 +157,6 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
|
|
- //TFAT
|
|
|
|
private fun initNavigationBarView() {
|
|
private fun initNavigationBarView() {
|
|
project.story?.let {
|
|
project.story?.let {
|
|
it.scenes?.let {
|
|
it.scenes?.let {
|
|
@@ -347,6 +356,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
|
|
}
|
|
}
|
|
startRecord.setImageDrawable(resources.getDrawable(R.drawable.ic_btn_record))
|
|
startRecord.setImageDrawable(resources.getDrawable(R.drawable.ic_btn_record))
|
|
navigationBar.visibility = View.VISIBLE
|
|
navigationBar.visibility = View.VISIBLE
|
|
|
|
+ initControlBarView()
|
|
initControlSceneView()
|
|
initControlSceneView()
|
|
initRecordFinishView()
|
|
initRecordFinishView()
|
|
}
|
|
}
|
|
@@ -463,7 +473,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
|
|
private fun addScene(position: Int): View.OnClickListener {
|
|
private fun addScene(position: Int): View.OnClickListener {
|
|
return View.OnClickListener {
|
|
return View.OnClickListener {
|
|
var scene = Scene()
|
|
var scene = Scene()
|
|
- for (i in 0 until 5){
|
|
|
|
|
|
+ for (i in 5 until 0){
|
|
val layer = Layer()
|
|
val layer = Layer()
|
|
layer.id = i
|
|
layer.id = i
|
|
scene.layers.add(layer)
|
|
scene.layers.add(layer)
|