<contacts>APK 1.0.2 release Publish.

contacts/build.gradle

@@ -18,13 +18,13 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 30
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.contacts"
-        minSdkVersion 21
+        minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 25 00:17:29 HKT 2025
+#Wed Feb 26 04:37:17 HKT 2025
-stageCount=2
+stageCount=3
 libraryProject=
 baseVersion=1.0
-publishVersion=1.0.1
+publishVersion=1.0.2
 buildCount=0
-baseBetaVersion=1.0.2
+baseBetaVersion=1.0.3

contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java

@@ -47,6 +47,8 @@ import java.util.ArrayList;
 import java.util.List;
 import android.content.DialogInterface;
 import cc.winboll.studio.contacts.activities.SettingsActivity;
+import cc.winboll.studio.contacts.beans.MainServiceBean; 
+import cc.winboll.studio.contacts.services.MainService;
 
 final public class MainActivity extends AppCompatActivity implements IWinBollActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
 
@@ -140,7 +142,15 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //                    }
 //                }
 //            });
-        MainService.startMainService(MainActivity.this);
+
+        MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (mMainServiceBean == null) {
+            mMainServiceBean = new MainServiceBean();
+            MainServiceBean.saveBean(this, mMainServiceBean);
+        }
+        if (mMainServiceBean.isEnable()) {
+            MainService.startMainService(this);
+        }
     }
 
     //初始化view，即显示的图片

contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java

@@ -26,6 +26,10 @@ import cc.winboll.studio.libappbase.IWinBollActivity;
 import cc.winboll.studio.libappbase.bean.APPInfo;
 import com.hjq.toast.ToastUtils;
 import java.lang.reflect.Field;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import cc.winboll.studio.contacts.beans.MainServiceBean; 
+import cc.winboll.studio.contacts.services.MainService;
 
 public class SettingsActivity extends AppCompatActivity implements IWinBollActivity {
 
@@ -33,6 +37,12 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
 
     Toolbar mToolbar;
     Switch swSilent;
+    SeekBar msbVolume;
+    TextView mtvVolume;
+    int mnStreamMaxVolume;
+    int mnStreamVolume;
+    Switch mswMainService;
+
 
     @Override
     public APPInfo getAppInfo() {
@@ -77,6 +87,69 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
         getSupportActionBar().setSubtitle(getTag());
+
+        mswMainService = findViewById(R.id.sw_mainservice);
+        MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        mswMainService.setChecked(mMainServiceBean.isEnable());
+        mswMainService.setOnClickListener(new View.OnClickListener(){
+                @Override
+                public void onClick(View arg0) {
+                    // TODO: Implement this method
+                    if (mswMainService.isChecked()) {
+                        //ToastUtils.show("Is Checked");
+                        MainService.startMainService(SettingsActivity.this);
+                    } else {
+                        //ToastUtils.show("Not Checked");
+                        MainService.stopMainService(SettingsActivity.this);
+                    }
+                }
+            });
+
+        msbVolume = findViewById(R.id.bellvolume);
+        mtvVolume = findViewById(R.id.tv_volume);
+        final AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+
+        // 设置SeekBar的最大值为系统铃声音量的最大刻度
+        mnStreamMaxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_RING);
+        msbVolume.setMax(mnStreamMaxVolume);
+        // 获取当前铃声音量并设置为SeekBar的初始进度
+        mnStreamVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
+        msbVolume.setProgress(mnStreamVolume);
+
+        updateStreamVolumeTextView();
+
+        msbVolume.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+                @Override
+                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                    if (fromUser) {
+                        // 设置铃声音量
+                        audioManager.setStreamVolume(AudioManager.STREAM_RING, progress, 0);
+                        RingTongBean bean = RingTongBean.loadBean(SettingsActivity.this, RingTongBean.class);
+                        if (bean == null) {
+                            bean = new RingTongBean();
+                        }
+                        bean.setStreamVolume(progress);
+                        RingTongBean.saveBean(SettingsActivity.this, bean);
+                        mnStreamVolume = progress;
+                        updateStreamVolumeTextView();
+                        //Toast.makeText(SettingsActivity.this, "音量设置为: " + progress, Toast.LENGTH_SHORT).show();
+                    }
+                }
+
+                @Override
+                public void onStartTrackingTouch(SeekBar seekBar) {
+                    // 当开始拖动SeekBar时的操作
+                }
+
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) {
+                    // 当停止拖动SeekBar时的操作
+                }
+            });
+    }
+
+    void updateStreamVolumeTextView() {
+        mtvVolume.setText(String.format("%d/%d", mnStreamVolume, mnStreamMaxVolume));
     }
 
     public void onDefaultPhone(View view) {

contacts/src/main/java/cc/winboll/studio/contacts/beans/RingTongBean.java

@@ -15,23 +15,23 @@ public class RingTongBean extends BaseBean {
 
     public static final String TAG = "AudioRingTongBean";
 
-    // 模式
+    // 铃声音量
-    int ringerMode;
+    int streamVolume;
     
     public RingTongBean() {
-        this.ringerMode = AudioManager.RINGER_MODE_NORMAL;
+        this.streamVolume = 100;
     }
 
-    public RingTongBean(int ringerMode) {
+    public RingTongBean(int streamVolume) {
-        this.ringerMode = ringerMode;
+        this.streamVolume = streamVolume;
     }
 
-    public void setRingerMode(int ringerMode) {
+    public void setStreamVolume(int streamVolume) {
-        this.ringerMode = ringerMode;
+        this.streamVolume = streamVolume;
     }
 
-    public int getRingerMode() {
+    public int getStreamVolume() {
-        return ringerMode;
+        return streamVolume;
     }
 
     @Override
@@ -42,15 +42,15 @@ public class RingTongBean extends BaseBean {
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        jsonWriter.name("ringerMode").value(getRingerMode());
+        jsonWriter.name("streamVolume").value(getStreamVolume());
 
     }
 
     @Override
     public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("ringerMode")) {
+            if (name.equals("streamVolume")) {
-                setRingerMode(jsonReader.nextInt());
+                setStreamVolume(jsonReader.nextInt());
             } else {
                 return false;
             }

contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallService.java

@@ -22,8 +22,6 @@ public class PhoneCallService extends InCallService {
 
     public static final String TAG = "PhoneCallService";
 
-    private volatile int originalRingVolume;
-
     private final Call.Callback callback = new Call.Callback() {
         @Override
         public void onStateChanged(Call call, int state) {
@@ -61,39 +59,78 @@ public class PhoneCallService extends InCallService {
             String phoneNumber = details.getHandle().getSchemeSpecificPart();
 
             // 记录原始铃声音量
+            //
             AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
-            originalRingVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
+
+            // 恢复铃声音量，预防其他意外条件导致的音量变化问题
+            //
+
+            // 读取应用配置，未配置就初始化配置文件
+            RingTongBean bean = RingTongBean.loadBean(this, RingTongBean.class);
+            if (bean == null) {
+                // 初始化配置
+                bean = new RingTongBean();
+                RingTongBean.saveBean(this, bean);
+            }
+            // 如果当前音量和应用保存的不一致就恢复为应用设定值
+            // 恢复铃声音量
+            try {
+                audioManager.setStreamVolume(AudioManager.STREAM_RING, bean.getStreamVolume(), 0);
+                //audioManager.setMode(AudioManager.RINGER_MODE_NORMAL);
+            } catch (java.lang.SecurityException e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            }
+
             // 检查电话接收规则
             if (!Rules.getInstance(this).isAllowed(phoneNumber)) {
-                // 预先静音
+                // 调低音量
-                audioManager.setStreamVolume(AudioManager.STREAM_RING, 0, 0);
+                try {
+                    audioManager.setStreamVolume(AudioManager.STREAM_RING, 0, 0);
+                    //audioManager.setMode(AudioManager.RINGER_MODE_SILENT);
+                } catch (java.lang.SecurityException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                }
                 // 断开电话
                 call.disconnect();
                 // 停顿1秒，预防第一声铃声响动
                 try {
-                    Thread.sleep(1000);
+                    Thread.sleep(500);
                 } catch (InterruptedException e) {
                     LogUtils.d(TAG, "");
                 }
                 // 恢复铃声音量
-                audioManager.setStreamVolume(AudioManager.STREAM_RING, originalRingVolume, 0);
+                try {
+                    audioManager.setStreamVolume(AudioManager.STREAM_RING, bean.getStreamVolume(), 0);
+                    //audioManager.setMode(AudioManager.RINGER_MODE_NORMAL);
+                } catch (java.lang.SecurityException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                }
                 // 屏蔽电话结束
                 return;
             }
+
             // 正常接听电话
             PhoneCallActivity.actionStart(this, phoneNumber, callType);
         }
     }
 
+    void resumeStreamVolume(AudioManager audioManager, int originalRingVolume) {
+        // 如果当前音量和应用保存的不一致就恢复为应用设定值
+        RingTongBean bean = RingTongBean.loadBean(this, RingTongBean.class);
+        if (bean == null) {
+            bean = new RingTongBean();
+        }
+        if (originalRingVolume != bean.getStreamVolume()) {
+            // 恢复铃声音量
+            audioManager.setStreamVolume(AudioManager.STREAM_RING, bean.getStreamVolume(), 0);
+        }
+    }
+
     @Override
     public void onCallRemoved(Call call) {
         super.onCallRemoved(call);
-
         call.unregisterCallback(callback);
         PhoneCallManager.call = null;
-        AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
-        // 恢复铃声音量
-        audioManager.setStreamVolume(AudioManager.STREAM_RING, originalRingVolume, 0);
     }
 
     public enum CallType {

contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java

@@ -9,13 +9,11 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.media.RingtoneManager;
+import android.media.AudioManager;
-import android.net.Uri;
-import android.util.Log;
 import cc.winboll.studio.contacts.services.MainService;
+import cc.winboll.studio.libappbase.LogUtils;
 import com.hjq.toast.ToastUtils;
 import java.lang.ref.WeakReference;
-import cc.winboll.studio.libappbase.LogUtils;
 
 public class MainReceiver extends BroadcastReceiver {
 
@@ -43,7 +41,7 @@ public class MainReceiver extends BroadcastReceiver {
     public void registerAction(Context context) {
         IntentFilter filter=new IntentFilter();
         filter.addAction(ACTION_BOOT_COMPLETED);
-        //filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+        //filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
         context.registerReceiver(this, filter);
     }
 }

contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java

@@ -30,6 +30,9 @@ import cc.winboll.studio.libappbase.bean.APPSOSBean;
 import cc.winboll.studio.contacts.dun.Rules;
 import android.media.AudioManager;
 import com.hjq.toast.ToastUtils;
+import java.util.Timer;
+import java.util.TimerTask;
+import cc.winboll.studio.contacts.beans.RingTongBean;
 
 public class MainService extends Service {
 
@@ -48,7 +51,7 @@ public class MainService extends Service {
     AssistantService mAssistantService;
     boolean isBound = false;
     MainReceiver mMainReceiver;
-    
+    Timer mStreamVolumeCheckTimer;
 
     @Override
     public IBinder onBind(Intent intent) {
@@ -72,7 +75,33 @@ public class MainService extends Service {
         }
         mMainServiceHandler = new MainServiceHandler(this);
 
+        // 铃声检查定时器
+        mStreamVolumeCheckTimer = new Timer();
+        mStreamVolumeCheckTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
 
+                    // 恢复铃声音量，预防其他意外条件导致的音量变化问题
+                    //
+
+                    // 读取应用配置，未配置就初始化配置文件
+                    RingTongBean bean = RingTongBean.loadBean(MainService.this, RingTongBean.class);
+                    if (bean == null) {
+                        // 初始化配置
+                        bean = new RingTongBean();
+                        RingTongBean.saveBean(MainService.this, bean);
+                    }
+                    // 如果当前音量和应用保存的不一致就恢复为应用设定值
+                    // 恢复铃声音量
+                    try {
+                        audioManager.setStreamVolume(AudioManager.STREAM_RING, bean.getStreamVolume(), 0);
+                        //audioManager.setMode(AudioManager.RINGER_MODE_NORMAL);
+                    } catch (java.lang.SecurityException e) {
+                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                    }
+                }
+            }, 1000, 60000);
 
         // 运行服务内容
         mainService();

contacts/src/main/res/layout/activity_settings.xml

@@ -18,6 +18,25 @@
 		android:layout_height="0dp"
 		android:layout_weight="1.0">
 
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="服务设置："/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<Switch
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="主要服务"
+				android:id="@+id/sw_mainservice"
+				android:layout_margin="10dp"/>
+
+		</LinearLayout>
+
 		<TextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -45,6 +64,32 @@
 
 		</LinearLayout>
 
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="音量设置："/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="10dp"
+				android:id="@+id/tv_volume"/>
+
+			<SeekBar
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_margin="10dp"
+				android:max="100"
+				android:id="@+id/bellvolume"/>
+
+		</LinearLayout>
+
 	</LinearLayout>
 
 </LinearLayout>