liuzhenxing 3 年之前
父节点
当前提交
a92871c0c6

+ 1 - 0
.idea/misc.xml

@@ -8,6 +8,7 @@
         <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" />
         <entry key="app/src/main/res/layout/activity_display.xml" value="0.25769927536231885" />
+        <entry key="app/src/main/res/layout/activity_list.xml" value="0.19300911854103345" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.3546195652173913" />
         <entry key="app/src/main/res/layout/bright_activity.xml" value="0.1889564336372847" />
         <entry key="app/src/main/res/layout/display_activity.xml" value="0.20199275362318841" />

+ 4 - 0
app/src/main/AndroidManifest.xml

@@ -127,6 +127,10 @@
             android:name=".Activity.LanguageActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="standard" />
+        <activity
+            android:name=".Activity.CameroActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="standard" />
     </application>
 
 </manifest>

+ 0 - 2
app/src/main/java/com/xplora/xpsettings/Activity/AboutActivity.java

@@ -81,7 +81,5 @@ public class AboutActivity extends BaseActivity {
                     break;
             }
         });
-
-
     }
 }

+ 3 - 1
app/src/main/java/com/xplora/xpsettings/Activity/BaseActivity.java

@@ -28,8 +28,10 @@ public class BaseActivity extends Activity {
 
     void setWatchTitle(String titleStr) {
         title = findViewById(R.id.title);
-        if (title != null)
+        if (title != null) {
             title.setText(titleStr);
+            title.setVisibility(View.VISIBLE);
+        }
     }
 
     private void setFullView() {

+ 69 - 0
app/src/main/java/com/xplora/xpsettings/Activity/CameroActivity.java

@@ -0,0 +1,69 @@
+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.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 CameroActivity 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((adapterView, view, i, l) -> {
+            Intent intent;
+            switch (i) {
+                case 0:
+                    intent = new Intent(this, SoftwareVersionActivity.class);
+                    startActivity(intent);
+                    break;
+                case 1:
+                    intent = new Intent(this, RestoreActivity.class);
+                    startActivity(intent);
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}

+ 4 - 1
app/src/main/java/com/xplora/xpsettings/Activity/SettingsActivity.java

@@ -21,7 +21,6 @@ public class SettingsActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_list);
-
         initData();
         initView();
     }
@@ -75,6 +74,10 @@ public class SettingsActivity extends BaseActivity {
                     intent = new Intent(this, ScreenTimeActivity.class);
                     startActivity(intent);
                     break;
+                case 11:
+                    intent = new Intent(this, CameroActivity.class);
+                    startActivity(intent);
+                    break;
                 default:
                     break;
             }

+ 33 - 0
app/src/main/java/com/xplora/xpsettings/SettingApplication.java

@@ -24,6 +24,8 @@ public class SettingApplication extends Application {
     public static int mAppNameType = 0;
     public static int mDataRoamingType = 0;
     public static String mLanguage = "en";
+    public static String mPhotoResolution;
+    public static String mVideoResolution;
 
 
     @Override
@@ -172,4 +174,35 @@ public class SettingApplication extends Application {
             //SystemProperties.set("", "");
         }
     }
+
+    public static String getPhotoResolution() {
+        if (Constant.DEBUG) {
+            return mPhotoResolution;
+        } else {
+            return mPhotoResolution;
+        }
+    }
+
+    public static void setPhotoResolution(String value) {
+        if (Constant.DEBUG) {
+            mPhotoResolution = value;
+        } else {
+
+        }
+    }
+
+    public static String getVideoResolution() {
+        if (Constant.DEBUG) {
+            return mVideoResolution;
+        } else {
+            return mVideoResolution;
+        }
+    }
+
+    public static void setVideoResolution(String value) {
+        if (Constant.DEBUG) {
+            mVideoResolution = value;
+        } else {
+        }
+    }
 }

+ 8 - 1
app/src/main/java/com/xplora/xpsettings/Utils/WatchUtils.java

@@ -1,5 +1,12 @@
 package com.xplora.xpsettings.Utils;
 
 public class WatchUtils {
-
+    public static int getIndexFromeArray(String[] dataArray, String value) {
+        for (int i = 0; i < dataArray.length; i++) {
+            if (dataArray[i].equals(value)) {
+                return i;
+            }
+        }
+        return -1;
+    }
 }

+ 7 - 7
app/src/main/res/layout/activity_list.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
-    android:orientation="vertical"
     >
 
     <TextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="20dp"
-        android:textSize="15sp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="25dp"
+        android:textSize="11sp"
+        android:textFontWeight="500"
         android:textColor="#FFFFFFFF"
         android:fontFamily="Roboto"
         android:visibility="gone"
@@ -22,7 +22,7 @@
         android:id="@+id/activity_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="45dp"
+        android:layout_marginTop="57dp"
         >
     </ListView>
-</LinearLayout>
+</RelativeLayout>

+ 17 - 0
app/src/main/res/values/arrays.xml

@@ -81,6 +81,11 @@
         <item>Wi-Fi mac</item>
     </string-array>
 
+    <string-array name="camero_titls_array">
+        <item>Photo resolution</item>
+        <item>Video resolution</item>
+    </string-array>
+
     <array name="screen_time_set_array">
         <item>10</item>
         <item>30</item>
@@ -103,6 +108,18 @@
         <item>GPS test tool</item>
     </array>
 
+    <array name="photo_resolution_set_array">
+        <item>2560 x 1944</item>
+        <item>1920 x 1080</item>
+        <item>1280 x 720</item>
+    </array>
+
+    <array name="video_resolution_set_array">
+        <item>1080p</item>
+        <item>720p</item>
+        <item>480p</item>
+    </array>
+
     <string-array name="software_wifi_error_array">
         <item>Please Connect To WiFi First</item>
         <item>Please Turn WiFi On First</item>