tt/XiaoxintongSystemOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.7.5

Browse Source 
fix:
update:去掉多sim卡选择
This commit is contained in:
tongtongstudio
2026-03-26 22:55:50 +08:00
parent dc3c87b2f9
commit 4b25c6ba72
6 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -17,8 +17,8 @@ android {
applicationId "com.xxpatx.os" applicationId "com.xxpatx.os"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 29
versionCode 1074 versionCode 1075
versionName "1.7.4" versionName "1.7.5"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

14
app/src/main/java/com/xxpatx/os/adapter/CallRecordAdapter.java
View File

@@ -17,12 +17,10 @@ import androidx.recyclerview.widget.RecyclerView;
import com.shehuan.niv.NiceImageView; import com.shehuan.niv.NiceImageView;
import com.xxpatx.os.R; import com.xxpatx.os.R;
import com.xxpatx.os.activity.selectnumber.SelectNumberActivity;
import com.xxpatx.os.bean.Contact; import com.xxpatx.os.bean.Contact;
import com.xxpatx.os.bean.RecordsInfo; import com.xxpatx.os.bean.RecordsInfo;
import com.xxpatx.os.dialog.CallPhoneDialog; import com.xxpatx.os.dialog.CallPhoneDialog;
import com.xxpatx.os.utils.GlideLoadUtils; import com.xxpatx.os.utils.GlideLoadUtils;
import com.xxpatx.os.utils.Utils;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@@ -138,11 +136,11 @@ public class CallRecordAdapter extends RecyclerView.Adapter<CallRecordAdapter.Ho
} }
private void call(String phone) { private void call(String phone) {
if (Utils.isMultiSim(mContext)) { // if (Utils.isMultiSim(mContext)) {
Intent intent = new Intent(mContext, SelectNumberActivity.class); // Intent intent = new Intent(mContext, SelectNumberActivity.class);
intent.putExtra("phone_number", phone); // intent.putExtra("phone_number", phone);
mContext.startActivity(intent); // mContext.startActivity(intent);
} else { // } else {
try { try {
Intent dialIntent = new Intent(Intent.ACTION_CALL); Intent dialIntent = new Intent(Intent.ACTION_CALL);
Uri data = Uri.parse("tel:" + phone); Uri data = Uri.parse("tel:" + phone);
@@ -152,7 +150,7 @@ public class CallRecordAdapter extends RecyclerView.Adapter<CallRecordAdapter.Ho
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "callNumber: " + e.getMessage()); Log.e(TAG, "callNumber: " + e.getMessage());
} }
} // }
} }
private String getName(String phone) { private String getName(String phone) {

14
app/src/main/java/com/xxpatx/os/adapter/ContactAdapter.java
View File

@@ -20,10 +20,8 @@ import com.hjq.toast.Toaster;
import com.shehuan.niv.NiceImageView; import com.shehuan.niv.NiceImageView;
import com.xxpatx.os.R; import com.xxpatx.os.R;
import com.xxpatx.os.activity.contact.AddContactActivity; import com.xxpatx.os.activity.contact.AddContactActivity;
import com.xxpatx.os.activity.selectnumber.SelectNumberActivity;
import com.xxpatx.os.bean.Contact; import com.xxpatx.os.bean.Contact;
import com.xxpatx.os.utils.GlideLoadUtils; import com.xxpatx.os.utils.GlideLoadUtils;
import com.xxpatx.os.utils.Utils;
import java.util.List; import java.util.List;
@@ -86,11 +84,11 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactH
Intent intent = new Intent(mContext, AddContactActivity.class); Intent intent = new Intent(mContext, AddContactActivity.class);
mContext.startActivity(intent); mContext.startActivity(intent);
} else if (!TextUtils.isEmpty(phone)) { } else if (!TextUtils.isEmpty(phone)) {
if (Utils.isMultiSim(mContext)) { // if (Utils.isMultiSim(mContext)) {
Intent intent = new Intent(mContext, SelectNumberActivity.class); // Intent intent = new Intent(mContext, SelectNumberActivity.class);
intent.putExtra("phone_number", phone); // intent.putExtra("phone_number", phone);
mContext.startActivity(intent); // mContext.startActivity(intent);
} else { // } else {
try { try {
Intent dialIntent = new Intent(Intent.ACTION_CALL); Intent dialIntent = new Intent(Intent.ACTION_CALL);
Uri data = Uri.parse("tel:" + phone); Uri data = Uri.parse("tel:" + phone);
@@ -100,7 +98,7 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactH
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "callNumber: " + e.getMessage()); Log.e(TAG, "callNumber: " + e.getMessage());
} }
} // }
} }
} }
}); });

14
app/src/main/java/com/xxpatx/os/fragment/phone/dialer/DialerFragment.java
View File

@@ -17,12 +17,10 @@ import com.tencent.mmkv.MMKV;
import com.xxpatx.os.R; import com.xxpatx.os.R;
import com.xxpatx.os.activity.ImeiActivity; import com.xxpatx.os.activity.ImeiActivity;
import com.xxpatx.os.activity.contact.AddContactActivity; import com.xxpatx.os.activity.contact.AddContactActivity;
import com.xxpatx.os.activity.selectnumber.SelectNumberActivity;
import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment; import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment;
import com.xxpatx.os.config.CommonConfig; import com.xxpatx.os.config.CommonConfig;
import com.xxpatx.os.databinding.FragmentDialerNewBinding; import com.xxpatx.os.databinding.FragmentDialerNewBinding;
import com.xxpatx.os.utils.ApkUtils; import com.xxpatx.os.utils.ApkUtils;
import com.xxpatx.os.utils.Utils;
import java.util.HashMap; import java.util.HashMap;
@@ -163,11 +161,11 @@ public class DialerFragment extends BaseMvvmFragment<DialerViewModel, FragmentDi
if (TextUtils.isEmpty(phone)) { if (TextUtils.isEmpty(phone)) {
Toaster.show("请输入号码"); Toaster.show("请输入号码");
} else { } else {
if (Utils.isMultiSim(mContext)) { // if (Utils.isMultiSim(mContext)) {
Intent intent = new Intent(mContext, SelectNumberActivity.class); // Intent intent = new Intent(mContext, SelectNumberActivity.class);
intent.putExtra("phone_number", phone); // intent.putExtra("phone_number", phone);
startActivity(intent); // startActivity(intent);
} else { // } else {
try { try {
Intent dialIntent = new Intent(Intent.ACTION_CALL); Intent dialIntent = new Intent(Intent.ACTION_CALL);
Uri data = Uri.parse("tel:" + phone); Uri data = Uri.parse("tel:" + phone);
@@ -177,7 +175,7 @@ public class DialerFragment extends BaseMvvmFragment<DialerViewModel, FragmentDi
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "callNumber: " + e.getMessage()); Log.e(TAG, "callNumber: " + e.getMessage());
} }
} // }
} }
} }

14
app/src/main/java/com/xxpatx/os/fragment/phone/record/RecordFragment.java
View File

@@ -13,14 +13,12 @@ import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.xxpatx.os.R; import com.xxpatx.os.R;
import com.xxpatx.os.activity.selectnumber.SelectNumberActivity;
import com.xxpatx.os.adapter.CallRecordAdapter; import com.xxpatx.os.adapter.CallRecordAdapter;
import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment; import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment;
import com.xxpatx.os.bean.Contact; import com.xxpatx.os.bean.Contact;
import com.xxpatx.os.bean.RecordsInfo; import com.xxpatx.os.bean.RecordsInfo;
import com.xxpatx.os.databinding.FragmentRecordBinding; import com.xxpatx.os.databinding.FragmentRecordBinding;
import com.xxpatx.os.dialog.DeleteDialog; import com.xxpatx.os.dialog.DeleteDialog;
import com.xxpatx.os.utils.Utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -172,11 +170,11 @@ public class RecordFragment extends BaseMvvmFragment<RecordViewModel, FragmentRe
} }
private void call(String phone) { private void call(String phone) {
if (Utils.isMultiSim(mContext)) { // if (Utils.isMultiSim(mContext)) {
Intent intent = new Intent(mContext, SelectNumberActivity.class); // Intent intent = new Intent(mContext, SelectNumberActivity.class);
intent.putExtra("phone_number", phone); // intent.putExtra("phone_number", phone);
mContext.startActivity(intent); // mContext.startActivity(intent);
} else { // } else {
try { try {
Intent dialIntent = new Intent(Intent.ACTION_CALL); Intent dialIntent = new Intent(Intent.ACTION_CALL);
Uri data = Uri.parse("tel:" + phone); Uri data = Uri.parse("tel:" + phone);
@@ -186,7 +184,7 @@ public class RecordFragment extends BaseMvvmFragment<RecordViewModel, FragmentRe
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "callNumber: " + e.getMessage()); Log.e(TAG, "callNumber: " + e.getMessage());
} }
} // }
} }
private void showDialog() { private void showDialog() {

4
build.gradle
View File

@@ -4,7 +4,7 @@ buildscript {
repositories { repositories {
google() google()
mavenCentral() // mavenCentral()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url 'https://developer.huawei.com/repo/' } maven { url 'https://developer.huawei.com/repo/' }
maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/public/' }
@@ -26,7 +26,7 @@ allprojects {
} }
repositories { repositories {
google() google()
mavenCentral() // mavenCentral()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url 'https://developer.huawei.com/repo/' } maven { url 'https://developer.huawei.com/repo/' }
maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/public/' }