enhance screen off cpu settings enable

Author: sufadi

app/src/main/java/com/fadisu/cpurun/fragment/CpuSettingsFragment.java

@@ -13,6 +13,7 @@
 import com.fadisu.cpurun.R;
 import com.fadisu.cpurun.util.CpuSettingsUtils;
 import com.fadisu.cpurun.util.CpuUtils;
+import com.mediatek.perfservice.IPerfServiceWrapper;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -141,14 +142,16 @@ private void startCpuSettings() {
         int freqMax = (int) sp_cpu_freq_max.getSelectedItem();
 
         String screenOffStr = (String) sp_screenof_enable.getSelectedItem();
-        boolean isScreenOffEnable = false;
+        int screenOffVaule = 0;
         if (mContext.getString(R.string.settings_screenoff_enable_yes).equals(screenOffStr)) {
-            isScreenOffEnable = true;
-        } else {
-            isScreenOffEnable = false;
+            screenOffVaule = IPerfServiceWrapper.SCREEN_OFF_ENABLE;
+        } else if (mContext.getString(R.string.settings_screenoff_enable_no).equals(screenOffStr)) {
+            screenOffVaule = IPerfServiceWrapper.SCREEN_OFF_DISABLE;
+        } else if (mContext.getString(R.string.settings_screenoff_enable_batter).equals(screenOffStr)) {
+            screenOffVaule = IPerfServiceWrapper.SCREEN_OFF_WAIT_RESTORE;
         }
 
-        mCpuSettingsUtils.setCpu(coreMax, freqMax, vcoreMode, freqMin, freqMax, coreMin, coreMax, isScreenOffEnable);
+        mCpuSettingsUtils.setCpu(coreMax, freqMax, vcoreMode, freqMin, freqMax, coreMin, coreMax, screenOffVaule);
     }
 
     private void stopCpuSettings() {
@@ -157,6 +160,7 @@ private void stopCpuSettings() {
 
     private ArrayList<String> getScreenOffEnableList(Context mContext) {
         ArrayList<String> result = new ArrayList<>();
+        result.add(mContext.getString(R.string.settings_screenoff_enable_batter));
         result.add(mContext.getString(R.string.settings_screenoff_enable_no));
         result.add(mContext.getString(R.string.settings_screenoff_enable_yes));
         return result;

app/src/main/java/com/fadisu/cpurun/util/CpuSettingsUtils.java

@@ -86,7 +86,6 @@ public void setCpuVcoreMode(int minCpuNumber, int maxCpuFreq, int mode) {
 
             if (PERFHANDLE_ERROR_CODE != mCurPerfHandle) {
                 mPerfServiceWrapper.userRegScnConfig(mCurPerfHandle, mPerfServiceWrapper.CMD_SET_VCORE, mode, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE);
-                // screenOffEnable();
                 mPerfServiceWrapper.userEnable(mCurPerfHandle);
 
                 Log.d(TAG, "setCpuVcoreMode mode = " + mode + ", minCpuNumber = " + minCpuNumber + ", maxCpuFreq = " + maxCpuFreq + ", mCurPerfHandle = " + mCurPerfHandle);
@@ -110,7 +109,6 @@ public void setCpuFreq(int minCpuNumber, int maxCpuFreq, int freq) {
 
             if (PERFHANDLE_ERROR_CODE != mCurPerfHandle) {
                 mPerfServiceWrapper.userRegScnConfig(mCurPerfHandle, mPerfServiceWrapper.CMD_SET_CPU_FREQ_MAX, freq, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE);
-                // screenOffEnable();
                 mPerfServiceWrapper.userEnable(mCurPerfHandle);
 
                 Log.d(TAG, "setCpuFreq freq = " + freq + ", minCpuNumber = " + minCpuNumber + ", maxCpuFreq = " + maxCpuFreq + ", mCurPerfHandle = " + mCurPerfHandle);
@@ -129,7 +127,7 @@ public void setCpuFreq(int minCpuNumber, int maxCpuFreq, int freq) {
      * @param coreMin
      * @param coreMax
      */
-    public void setCpu(int minCpuNumber, int maxCpuFreq, int mode, int freqMin, int freqMax, int coreMin, int coreMax, boolean screenOffEnable) {
+    public void setCpu(int minCpuNumber, int maxCpuFreq, int mode, int freqMin, int freqMax, int coreMin, int coreMax, int screenOffVaule) {
         userDisableIfNeed();
         if (null != mPerfServiceWrapper) {
             mCurPerfHandle = mPerfServiceWrapper.userReg(minCpuNumber, maxCpuFreq);
@@ -143,9 +141,7 @@ public void setCpu(int minCpuNumber, int maxCpuFreq, int mode, int freqMin, int
                 mPerfServiceWrapper.userRegScnConfig(mCurPerfHandle, mPerfServiceWrapper.CMD_SET_CPU_FREQ_MIN, freqMin, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE);
                 mPerfServiceWrapper.userRegScnConfig(mCurPerfHandle, mPerfServiceWrapper.CMD_SET_CPU_FREQ_MAX, freqMax, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE);
 
-                if (screenOffEnable) {
-                    mPerfServiceWrapper.userRegScnConfig(mCurPerfHandle, mPerfServiceWrapper.CMD_SET_SCREEN_OFF_STATE, mPerfServiceWrapper.SCREEN_OFF_ENABLE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE);
-                }
+                mPerfServiceWrapper.userRegScnConfig(mCurPerfHandle, mPerfServiceWrapper.CMD_SET_SCREEN_OFF_STATE, screenOffVaule, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE);
 
                 mPerfServiceWrapper.userEnable(mCurPerfHandle);
 
@@ -154,13 +150,6 @@ public void setCpu(int minCpuNumber, int maxCpuFreq, int mode, int freqMin, int
         }
     }
 
-    /**
-     * 默认灭屏持续生效
-     */
-    public void screenOffEnable() {
-        mPerfServiceWrapper.userRegScnConfig(mCurPerfHandle, mPerfServiceWrapper.CMD_SET_SCREEN_OFF_STATE, mPerfServiceWrapper.SCREEN_OFF_ENABLE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE, PARAM_DEFAULT_VALUE);
-    }
-
     /**
      * 取消之前的设置
      */

app/src/main/res/values-zh/strings.xml

@@ -89,6 +89,8 @@
     <string name="settings_ok">CPU 启用设置</string>
     <string name="settings_no">CPU 取消设置</string>
     <string name="settings_screenoff_enable">息屏后CPU设置是否失效</string>
-    <string name="settings_screenoff_enable_yes">不失效</string>
-    <string name="settings_screenoff_enable_no">失效</string>
+    <string name="settings_screenoff_enable_yes">灭屏后依旧生效</string>
+    <string name="settings_screenoff_enable_no">灭屏后就会不生效</string>
+    <string name="settings_screenoff_enable_batter"> 灭屏不生效，亮屏可以恢复</string>
+
 </resources>

app/src/main/res/values/strings.xml

@@ -89,6 +89,7 @@
     <string name="settings_ok">CPU Enable Settings</string>
     <string name="settings_no">CPU Disable Settings</string>
     <string name="settings_screenoff_enable">CPU Settings Enable When Screen Off </string>
-    <string name="settings_screenoff_enable_yes">Enable</string>
-    <string name="settings_screenoff_enable_no">Disable</string>
+    <string name="settings_screenoff_enable_yes">After the screen is still effective</string>
+    <string name="settings_screenoff_enable_no">After the screen will not take effect</string>
+    <string name="settings_screenoff_enable_batter">Off screen does not take effect, bright screen can be restored</string>
 </resources>