2 Commits 066e3e2c65 ... f3d9089796

Author SHA1 Message Date
  LAPTOP-K69FCNBP\crius f3d9089796 Merge branch 'lwz_' of http://116.62.119.248:10082/cheng_zq/EffectDemo 2 years ago
  czq 1507e12d3e 单词泛红改横屏 2 years ago
3 changed files with 28 additions and 24 deletions
  1. 1 0
      .idea/misc.xml
  2. 2 1
      app/src/main/AndroidManifest.xml
  3. 25 23
      app/src/main/res/layout/activity_songe.xml

+ 1 - 0
.idea/misc.xml

@@ -17,6 +17,7 @@
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_map_challenge.xml" value="0.17604166666666668" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_progress.xml" value="0.22" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_quxian.xml" value="0.13645833333333332" />
+        <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_role_play.xml" value="0.128125" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_sequential_drag.xml" value="0.12092391304347826" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_songe.xml" value="0.20364583333333333" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_sound.xml" value="0.1234375" />

+ 2 - 1
app/src/main/AndroidManifest.xml

@@ -144,7 +144,8 @@
         <activity
             android:name=".activity.DragActivity"
             android:screenOrientation="landscape" />
-        <activity android:name=".activity.NewSongLyricActivity" />
+        <activity android:name=".activity.NewSongLyricActivity"
+            android:screenOrientation="landscape"/>
         <activity
             android:name=".activity.VideoPlayActivity"
             android:screenOrientation="landscape" />

+ 25 - 23
app/src/main/res/layout/activity_songe.xml

@@ -9,15 +9,11 @@
         android:id="@+id/text"
 
         android:layout_width="match_parent"
-        android:layout_height="400dp"
-
-        android:lineSpacingExtra="6dp"
+        android:layout_height="220dp"
+        android:layout_margin="15dp"
+        android:lineSpacingExtra="3dp"
         android:text="Hello World!"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textSize="16sp" />
     <ScrollView
         android:visibility="gone"
         android:layout_width="match_parent"
@@ -31,23 +27,29 @@
             zhy:max_select="-1"/>
     </ScrollView>
 
-    <Button
-        android:id="@+id/start"
-        android:layout_width="match_parent"
+    <LinearLayout
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="开始播放" />
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/start"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="开始播放" />
 
-    <Button
-        android:id="@+id/end"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="暂停播放" />
+        <Button
+            android:id="@+id/end"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="暂停播放" />
 
-    <Button
-        android:id="@+id/test"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="测试数据" />
+        <Button
+            android:id="@+id/test"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="测试数据" />
+    </LinearLayout>
 
 </LinearLayout>