liuzhenxing 3 年 前
コミット
496ea1f474

+ 2 - 2
.idea/deploymentTargetDropDown.xml

@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/xp_watch_400_API_33.avd" />
+            <value value="$USER_HOME$/.android/avd/xplora_watch_400.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-06-25T22:54:37.286138Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-06-28T02:31:20.856030Z" />
   </component>
 </project>

+ 1 - 0
.idea/gradle.xml

@@ -13,6 +13,7 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

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

@@ -9,6 +9,7 @@ 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;
@@ -44,6 +45,7 @@ public class ScreenTimeActivity extends BaseActivity {
         for (String s : stringList) {
             BaseModel model = new BaseModel();
             model.title = s.trim();
+            model.cellType = Constant.CellType.CHECKBOX;
             mData.add(model);
         }
     }

+ 6 - 8
app/src/main/res/values/arrays.xml

@@ -58,11 +58,10 @@
     </string-array>
 
     <string-array name="screen_time_value_array">
-        <item>5s</item>
-        <item>15s</item>
-        <item>30s</item>
-        <item>1min</item>
-        <item>5min</item>
+        <item>10 seconds</item>
+        <item>30 seconds</item>
+        <item>1 minute</item>
+        <item>Never</item>
     </string-array>
 
     <string-array name="about_titls_array">
@@ -77,11 +76,10 @@
     </string-array>
 
     <array name="screen_time_set_array">
-        <item>5</item>
-        <item>15</item>
+        <item>10</item>
         <item>30</item>
         <item>60</item>
-        <item>300</item>
+        <item>100000000</item>
     </array>
 
     <array name="test_tool">