From: SnickerSun Date: Fri, 13 Aug 2021 11:48:31 +0000 (+0800) Subject: release ICSer_V891_2108131748_release.apk X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=fbca3f2c3f930c1ac43bc6fe4770a1ba6616be88;p=protocol_srv.git release ICSer_V891_2108131748_release.apk 为AP00 添加 ICCID，IMSI --- diff --git a/app/release/ICSer_V890_2108121717_release.apk b/app/release/ICSer_V891_2108131748_release.apk similarity index 77% rename from app/release/ICSer_V890_2108121717_release.apk rename to app/release/ICSer_V891_2108131748_release.apk index 3d5c86f2..01c62190 100644 Binary files a/app/release/ICSer_V890_2108121717_release.apk and b/app/release/ICSer_V891_2108131748_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 3d626c30..0afda80b 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":890,"versionName":"2108121717","enabled":true,"outputFile":"ICSer_V890_2108121717_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V890_2108121717_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":891,"versionName":"2108131748","enabled":true,"outputFile":"ICSer_V891_2108131748_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V891_2108131748_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java index 32f775b5..f4bccbce 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java @@ -1,11 +1,14 @@ package com.enqualcomm.support.utils; +import android.Manifest; import android.content.Context; +import android.content.pm.PackageManager; import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.PowerManager; import android.provider.ContactsContract; +import android.support.v4.app.ActivityCompat; import android.telephony.CellInfo; import android.telephony.CellInfoCdma; import android.telephony.CellInfoGsm; @@ -43,7 +46,30 @@ import rx.functions.Action1; public class CellInfoUtil { - + public static String getPhoneStatus(Runtime mRuntime) { + TelephonyManager tm = (TelephonyManager) mRuntime + .getContextProxy().context.getSystemService(Context.TELEPHONY_SERVICE); + String str = ""; + //noinspection ConstantConditions + str += "DeviceId(IMEI) = " + tm.getDeviceId() + "\n"; + str += "DeviceSoftwareVersion = " + tm.getDeviceSoftwareVersion() + "\n"; + str += "Line1Number = " + tm.getLine1Number() + "\n"; + str += "NetworkCountryIso = " + tm.getNetworkCountryIso() + "\n"; + str += "NetworkOperator = " + tm.getNetworkOperator() + "\n"; + str += "NetworkOperatorName = " + tm.getNetworkOperatorName() + "\n"; + str += "NetworkType = " + tm.getNetworkType() + "\n"; + str += "PhoneType = " + tm.getPhoneType() + "\n"; + str += "SimCountryIso = " + tm.getSimCountryIso() + "\n"; + str += "SimOperator = " + tm.getSimOperator() + "\n"; + str += "SimOperatorName = " + tm.getSimOperatorName() + "\n"; + str += "SimSerialNumber = " + tm.getSimSerialNumber() + "\n"; + mRuntime.setIccid(tm.getSimSerialNumber()); + str += "SimState = " + tm.getSimState() + "\n"; + str += "SubscriberId(IMSI) = " + tm.getSubscriberId() + "\n"; + mRuntime.setImsi(tm.getSubscriberId()); + str += "VoiceMailNumber = " + tm.getVoiceMailNumber(); + return str; + } public static void dialSilent(Context context,String dialnumber){ // Single.just(null).observeOn(AndroidSchedulers.mainThread()).subscribe(new Action1() { // public void call(Object param1Object) { diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java index a0f1899a..0ff2199e 100644 --- a/app/src/main/java/com/ic/protocols/protocol_anan.java +++ b/app/src/main/java/com/ic/protocols/protocol_anan.java @@ -13,6 +13,7 @@ import android.media.AudioManager; import android.net.Uri; import android.os.Environment; import android.support.v4.app.ActivityCompat; +import android.telephony.CellInfoLte; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.view.Gravity; @@ -35,6 +36,7 @@ import com.enqualcomm.support.provider.FZDDatabaseHelper; import com.enqualcomm.support.provider.FZDMembersProvider; import com.enqualcomm.support.provider.FZDSettingsProvider; import com.enqualcomm.support.service.HeartRateManager; +import com.enqualcomm.support.utils.CellInfoUtil; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.ProfileManager; @@ -79,7 +81,7 @@ public class protocol_anan { public protocol_anan(Connection connect, Runtime runtime) { mConnection = connect; mRuntime = runtime; - getPhoneStatus(runtime); + CellInfoUtil.getPhoneStatus(runtime); //注册佩戴状态改变的监听 registerWearStateReceiver(); } @@ -381,7 +383,7 @@ public class protocol_anan { /*登录*/ public static StringMessage AP00(Runtime runTime) { if (TextUtils.isEmpty(runTime.getIccid()) || TextUtils.isEmpty(runTime.getImsi())) { - String phoneStatus = getPhoneStatus(runTime); + String phoneStatus = CellInfoUtil.getPhoneStatus(runTime); ICLogger.d("phoneStatus == > " + phoneStatus); return null; } @@ -585,30 +587,7 @@ public class protocol_anan { .append(CMDEND).toString()); } - public static String getPhoneStatus(Runtime mRuntime) { - TelephonyManager tm = (TelephonyManager) mRuntime - .getContextProxy().context.getSystemService(Context.TELEPHONY_SERVICE); - String str = ""; - //noinspection ConstantConditions - str += "DeviceId(IMEI) = " + tm.getDeviceId() + "\n"; - str += "DeviceSoftwareVersion = " + tm.getDeviceSoftwareVersion() + "\n"; - str += "Line1Number = " + tm.getLine1Number() + "\n"; - str += "NetworkCountryIso = " + tm.getNetworkCountryIso() + "\n"; - str += "NetworkOperator = " + tm.getNetworkOperator() + "\n"; - str += "NetworkOperatorName = " + tm.getNetworkOperatorName() + "\n"; - str += "NetworkType = " + tm.getNetworkType() + "\n"; - str += "PhoneType = " + tm.getPhoneType() + "\n"; - str += "SimCountryIso = " + tm.getSimCountryIso() + "\n"; - str += "SimOperator = " + tm.getSimOperator() + "\n"; - str += "SimOperatorName = " + tm.getSimOperatorName() + "\n"; - str += "SimSerialNumber = " + tm.getSimSerialNumber() + "\n"; - mRuntime.setIccid(tm.getSimSerialNumber()); - str += "SimState = " + tm.getSimState() + "\n"; - str += "SubscriberId(IMSI) = " + tm.getSubscriberId() + "\n"; - mRuntime.setImsi(tm.getSubscriberId()); - str += "VoiceMailNumber = " + tm.getVoiceMailNumber(); - return str; - } + /** * 展示本地安装和提示框 diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java index 5aa15300..c69f96ce 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -16,6 +16,7 @@ import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.bean.VoiceContent; import com.enqualcomm.support.bean.voicePacket; import com.enqualcomm.support.service.HeartRateManager; +import com.enqualcomm.support.utils.CellInfoUtil; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.enqualcomm.support.utils.ICLogger; @@ -365,7 +366,14 @@ public class protocol_beehome { /*登录*/ public static StringMessage AP00(Runtime ds) { //示例数据：IWAP00867155030001063# - return genStringMessage(cmdMap.get(CMD_TYPE.AP00), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP00)).append(ds.IMEI()).append(CMDEND).toString()); +// IWAP00860315002003375,12345678901234567890,9466970701492096# 三个参数分别是IMEI，ICCID，IMSI + CellInfoUtil.getPhoneStatus(ds);//获取IMSI，ICCID + StringBuffer cmdbuf=new StringBuffer(CMDHEADER); + cmdbuf.append(cmdMap.get(CMD_TYPE.AP00)).append(ds.IMEI()) + .append(CMDSPLIT).append(ds.getIccid()) + .append(CMDSPLIT).append(ds.getImsi()) + .append(CMDEND); + return genStringMessage(cmdMap.get(CMD_TYPE.AP00), cmdbuf.toString()); } //处理 登录 BP00 diff --git a/app/version_code.properties b/app/version_code.properties index 6e2cee13..d165b4e1 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Thu Aug 12 17:17:53 CST 2021 -VERSION_CODE=890 +#Fri Aug 13 17:48:49 CST 2021 +VERSION_CODE=891