camora

.idea/misc.xml

@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="../../../.gradle/caches/transforms-3/dae954c5fd9608ef94a7528c5de015a2/transformed/xplibcommon/res/drawable/selector_switch_thumb.xml" value="0.12" />
+        <entry key="app/src/main/res/drawable-xhdpi/button_shape.xml" value="0.124" />
         <entry key="app/src/main/res/drawable/view_shape.xml" value="0.112" />
         <entry key="app/src/main/res/drawable/xp_checkbox.xml" value="0.112" />
         <entry key="app/src/main/res/layout/activity_change_progress.xml" value="0.1" />
@@ -26,6 +27,7 @@
         <entry key="app/src/main/res/layout/item_switch.xml" value="0.20199275362318841" />
         <entry key="app/src/main/res/layout/item_title.xml" value="0.25769927536231885" />
         <entry key="app/src/main/res/layout/item_title_about.xml" value="0.396875" />
+        <entry key="app/src/main/res/layout/item_title_center.xml" value="0.1286727456940223" />
         <entry key="app/src/main/res/layout/item_title_subtitle.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_wifi_switch.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_xpstyle.xml" value="0.20199275362318841" />

app/src/main/AndroidManifest.xml

@@ -128,7 +128,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="standard" />
         <activity
-            android:name=".Activity.CameroActivity"
+            android:name=".Activity.CameraActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="standard" />
+        <activity
+            android:name=".Activity.CameraResolutionActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="standard" />
     </application>

app/src/main/java/com/xplora/xpsettings/Activity/CameraActivity.java

@@ -0,0 +1,64 @@
+package com.xplora.xpsettings.Activity;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+//import android.os.SystemProperties;
+import android.os.SystemProperties;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+import com.xplora.xpsettings.Adapter.BaseListAdapter;
+import com.xplora.xpsettings.Adapter.ListAdapter;
+import com.xplora.xpsettings.Model.BaseModel;
+import com.xplora.xpsettings.R;
+import com.xplora.xpsettings.SettingApplication;
+import com.xplora.xpsettings.Utils.Constant;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class CameraActivity extends BaseActivity {
+    private final List<BaseModel> mData = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_list);
+        setWatchTitle(getResources().getStringArray(R.array.settings_title_array)[11]);
+        initData();
+        initView();
+    }
+
+    private void initData() {
+        String photo_resolution = SettingApplication.getPhotoResolution();
+        String video_resolution = SettingApplication.getVideoResolution();
+        String[] stringList = getResources().getStringArray(R.array.camero_titls_array);
+        String[] valueList = {photo_resolution, video_resolution};
+
+        for (int i = 0; i < stringList.length; i++) {
+            BaseModel model = new BaseModel();
+            model.title = stringList[i].trim();
+            model.subTitle = valueList[i];
+            model.isShowArrow = true;
+            model.cellType = Constant.CellType.TITLE_SUBTITLE;
+            mData.add(model);
+        }
+    }
+
+    private void initView() {
+        BaseListAdapter adapter = new BaseListAdapter(this, 0, mData);
+        ListView listView = findViewById(R.id.activity_listview);
+        listView.setAdapter(adapter);
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent(CameraActivity.this, CameraResolutionActivity.class);
+                intent.putExtra(Constant.INENT_VIEW_TYPE, position);
+                startActivity(intent);
+            }
+        });
+    }
+}

app/src/main/java/com/xplora/xpsettings/Activity/CameroActivity.java → app/src/main/java/com/xplora/xpsettings/Activity/CameraResolutionActivity.java

@@ -18,14 +18,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-public class CameroActivity extends BaseActivity {
+public class CameraResolutionActivity extends BaseActivity {
+    public int mViewType = 0;
     private final List<BaseModel> mData = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_list);
-        setWatchTitle(getResources().getStringArray(R.array.settings_title_array)[11]);
+
+        mViewType = getIntent().getIntExtra(Constant.INENT_VIEW_TYPE, 0);
+        setWatchTitle(getResources().getStringArray(R.array.camero_titls_array)[mViewType]);
         initData();
         initView();
     }
@@ -33,15 +36,14 @@ public class CameroActivity extends BaseActivity {
     private void initData() {
         String photo_resolution = SettingApplication.getPhotoResolution();
         String video_resolution = SettingApplication.getVideoResolution();
-        String[] stringList = getResources().getStringArray(R.array.camero_titls_array);
-        String[] valueList = {photo_resolution, video_resolution};
+
+        int titleId = mViewType == 0 ? R.array.photo_resolution_set_array : R.array.video_resolution_set_array;
+        String[] stringList = getResources().getStringArray(titleId);
 
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
             model.title = stringList[i].trim();
-            model.subTitle = valueList[i];
-            model.isShowArrow = true;
-            model.cellType = Constant.CellType.TITLE_SUBTITLE;
+            model.cellType = Constant.CellType.TITLE_CENTER;
             mData.add(model);
         }
     }

app/src/main/java/com/xplora/xpsettings/Activity/SettingsActivity.java

@@ -75,7 +75,7 @@ public class SettingsActivity extends BaseActivity {
                     startActivity(intent);
                     break;
                 case 11:
-                    intent = new Intent(this, CameroActivity.class);
+                    intent = new Intent(this, CameraActivity.class);
                     startActivity(intent);
                     break;
                 default:

app/src/main/java/com/xplora/xpsettings/Adapter/BaseListAdapter.java

@@ -50,6 +50,8 @@ public class BaseListAdapter extends ArrayAdapter<BaseModel> {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_title, null);
         } else if (model.cellType == Constant.CellType.TITLE_SUBTITLE) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_title_subtitle, null);
+        } else if (model.cellType == Constant.CellType.TITLE_CENTER) {
+            view = LayoutInflater.from(getContext()).inflate(R.layout.item_title_center, null);
         } else if (model.cellType == Constant.CellType.ICON_TITLE) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_icon_title, null);
         } else if (model.cellType == Constant.CellType.ICON_TITLE_SUBTITLE) {

app/src/main/java/com/xplora/xpsettings/Utils/Constant.java

@@ -16,6 +16,7 @@ public class Constant {
     public enum CellType {
         TITLE,
         TITLE_SUBTITLE,
+        TITLE_CENTER,
         ICON_TITLE,
         ICON_TITLE_SUBTITLE,
         PROGRESS_TITLE,

app/src/main/res/drawable-xhdpi/button_shape.xml

@@ -3,8 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 填充的颜色 -->
-    <solid android:color="#FF2B2B2B" />
+    <solid android:color="#FF262626" />
 
     <!-- 圆角的半径 -->
-    <corners android:radius="8dp" />
+    <corners android:radius="17dp" />
 </shape>

app/src/main/res/layout/item_title_center.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="34dp"
+    >
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="34dp"
+        android:layout_gravity="center"
+        android:layout_marginLeft="25dp"
+        android:layout_marginRight="25dp"
+        android:background="@drawable/button_shape"
+        >
+
+        <TextView
+            android:id="@+id/item_title"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:fontFamily="Roboto"
+            android:textFontWeight="700"
+            android:textColor="@color/white"
+            android:textSize="12sp" />
+
+    </FrameLayout>
+
+</LinearLayout>