losion.liu@sikey.com.cn 6 月之前
父节点
当前提交
0803a16252

+ 7 - 4
app/src/main/java/com/xplora/xpsettings/Activity/SoundModeActivity.java

@@ -44,7 +44,7 @@ public class SoundModeActivity extends BaseActivity {
 
     private void initData() {
         Ringtone ringTone = DataManager.getDefaultRingTone();
-        String[] stringList = ResUtils.getStringArray("soundmode_title_array_", 3);
+        String[] stringList = ResUtils.getStringArray("soundmode_title_array_", 2);
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
             model.title = stringList[i].trim();
@@ -53,7 +53,7 @@ public class SoundModeActivity extends BaseActivity {
             } else if (i == 1){
                 int isVibrate = DataManager.getIsVibrate();
                 model.isOn = isVibrate >= 1;
-                model.cellType = Constant.CellType.SWITCH_RIGHT;
+                model.cellType = Constant.CellType.TITLE;
             } else if (i == 2){
                 model.cellType = Constant.CellType.TITLE_SUBTITLE;
                 model.subTitle = ringTone != null ? ringTone.getTitle(this) : "";
@@ -90,10 +90,13 @@ public class SoundModeActivity extends BaseActivity {
     public void clickItem(int position) {
         switch (position) {
             case 0:
-                Intent intent1 = new Intent(SoundModeActivity.this, VolumeActivity.class);
-                startActivity(intent1);
+                Intent intent = new Intent(this, ChangeProgressActivity.class);
+                intent.putExtra(Constant.INTENT_VIEW_TYPE, 0);
+                startActivityForResult(intent, 112);
                 break;
             case 1:
+                intent = new Intent(this, OpenCloseActivity.class);
+                startActivity(intent);
                 break;
             case 2:
                 Intent intent2 = new Intent(SoundModeActivity.this, RingToneActivity.class);

+ 8 - 5
app/src/main/res/layout/item_title.xml

@@ -2,25 +2,28 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp"
+    android:paddingStart="5dp"
+    android:paddingEnd="5dp">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="40dp"
+        android:background="@drawable/bg_gray"
         >
 
         <TextView
             android:id="@+id/item_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp"
+            android:layout_marginStart="10dp"
             android:layout_centerVertical="true"
             android:fontFamily="Roboto"
             android:textColor="@color/white"
-            android:textSize="13sp" />
+            android:textSize="17sp" />
 
         <TextView
             android:id="@+id/item_detail"