From: TrillGates Date: Thu, 8 Jul 2021 12:37:56 +0000 (+0800) Subject: rename some files. X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=a19f9b85dc6899b26bcd4389da98f0d782177289;p=protocol_srv.git rename some files. --- diff --git a/app/release/ICSer_V882_2107021046_release.apk b/app/release/ICSer_V882_2107021046_release.apk new file mode 100644 index 00000000..4398b948 Binary files /dev/null and b/app/release/ICSer_V882_2107021046_release.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 74913071..1fc383e6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -187,27 +187,27 @@ diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 0abf2d67..b9b69589 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -31,9 +31,9 @@ import com.enqualcomm.support.bean.SleepInfo; import com.enqualcomm.support.bean.SleepRecord; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.bean.heartRateStatus; -import com.enqualcomm.support.provider.FZDDatabaseHelper; -import com.enqualcomm.support.provider.FZDMessageProvider; -import com.enqualcomm.support.provider.FZDSettingsProvider; +import com.enqualcomm.support.provider.ICDatabaseHelper; +import com.enqualcomm.support.provider.WeTalkMessageProvider; +import com.enqualcomm.support.provider.ICGlobalSettingsProvider; import com.enqualcomm.support.service.AntiMonitorService; import com.enqualcomm.support.service.CheckSIM; import com.enqualcomm.support.service.Deliver; @@ -893,7 +893,7 @@ public class CoreService extends Service { ContentResolver resolver = runtime.getContextProxy().getResolver(); WeTalkMsgObserver weTalkMsgObserver = new WeTalkMsgObserver(mHandler, resolver); resolver.registerContentObserver( - Uri.parse(FZDMessageProvider.MESSAGES_SEND), true, weTalkMsgObserver + Uri.parse(WeTalkMessageProvider.MESSAGES_SEND), true, weTalkMsgObserver ); //启动结束设置标志位，让心率和体温检测可以正常执行。 server_starting = false; @@ -1118,9 +1118,9 @@ public class CoreService extends Service { } else if (ACTION_LOCATION_ALARM.equals(paramIntent.getAction())) { ICLogger.d("收到定位闹钟..."); //如果设置项是关的，那么就return掉，如果设置项开了，直接去设置闹钟 - Cursor query = runtime.getContextProxy().getResolver().query(Uri.parse(FZDSettingsProvider.SETTINGS), - new String[]{FZDDatabaseHelper.sValue}, - FZDDatabaseHelper.sKey + "=?", + Cursor query = runtime.getContextProxy().getResolver().query(Uri.parse(ICGlobalSettingsProvider.SETTINGS), + new String[]{ICDatabaseHelper.sValue}, + ICDatabaseHelper.sKey + "=?", new String[]{"BPSW"}, null); if (query != null && query.moveToNext()) { //1表示打开，0表示关闭 diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java index b5160d80..26b9e401 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java +++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java @@ -9,8 +9,8 @@ import android.os.RemoteCallbackList; import com.enqualcomm.support.Config; import com.enqualcomm.support.IFZDCallback; import com.enqualcomm.support.adapter.LBSHelper; -import com.enqualcomm.support.provider.FZDDatabaseHelper; -import com.enqualcomm.support.provider.FZDSettingsProvider; +import com.enqualcomm.support.provider.ICDatabaseHelper; +import com.enqualcomm.support.provider.ICGlobalSettingsProvider; import com.enqualcomm.support.utils.ContextProxy; import com.enqualcomm.support.utils.DBHelper; import com.enqualcomm.support.utils.DnsUtil; @@ -449,9 +449,9 @@ public class Runtime { private String getSettingsValue(String key) { - Cursor query = contextProxy.getResolver().query(Uri.parse(FZDSettingsProvider.SETTINGS), - new String[]{FZDDatabaseHelper.sValue}, - FZDDatabaseHelper.sKey + "=?", new String[]{ + Cursor query = contextProxy.getResolver().query(Uri.parse(ICGlobalSettingsProvider.SETTINGS), + new String[]{ICDatabaseHelper.sValue}, + ICDatabaseHelper.sKey + "=?", new String[]{ key }, null); if (query != null) { diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDAlarmProvider.java b/app/src/main/java/com/enqualcomm/support/provider/ICAlarmProvider.java similarity index 84% rename from app/src/main/java/com/enqualcomm/support/provider/FZDAlarmProvider.java rename to app/src/main/java/com/enqualcomm/support/provider/ICAlarmProvider.java index 416064b0..414adbb9 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDAlarmProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/ICAlarmProvider.java @@ -13,7 +13,7 @@ import android.text.TextUtils; import static com.enqualcomm.support.Constants.ACTION_ALARM_ALARM_CHANGE; -public class FZDAlarmProvider extends ContentProvider { +public class ICAlarmProvider extends ContentProvider { private static UriMatcher sUriMatcher; private static final int MATH_CODE_TABLE = 1; @@ -27,11 +27,11 @@ public class FZDAlarmProvider extends ContentProvider { sUriMatcher.addURI(AUTHORITY, PATH, MATH_CODE_TABLE); } - private FZDDatabaseHelper mDatabase; + private ICDatabaseHelper mDatabase; @Override public boolean onCreate() { - mDatabase = new FZDDatabaseHelper(getContext()); + mDatabase = new ICDatabaseHelper(getContext()); return false; } @@ -56,7 +56,7 @@ public class FZDAlarmProvider extends ContentProvider { int match = sUriMatcher.match(uri); SQLiteDatabase readableDatabase = mDatabase.getReadableDatabase(); if (match == MATH_CODE_TABLE) { - return readableDatabase.query(FZDDatabaseHelper.tb_alarm, + return readableDatabase.query(ICDatabaseHelper.tb_alarm, projection, selection, selectionArgs, @@ -79,14 +79,14 @@ public class FZDAlarmProvider extends ContentProvider { if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); //判断是否有存在吧,确保唯一，删除再添加吧，否则也是添加不进去的 - String alarmId = values.getAsString(FZDDatabaseHelper.alarm_id); + String alarmId = values.getAsString(ICDatabaseHelper.alarm_id); if (!TextUtils.isEmpty(alarmId)) { - writableDatabase.delete(FZDDatabaseHelper.tb_alarm, - FZDDatabaseHelper.alarm_id + "=?", new String[]{ + writableDatabase.delete(ICDatabaseHelper.tb_alarm, + ICDatabaseHelper.alarm_id + "=?", new String[]{ values.getAsString(alarmId) }); } - long insert = writableDatabase.insert(FZDDatabaseHelper.tb_alarm, null, values); + long insert = writableDatabase.insert(ICDatabaseHelper.tb_alarm, null, values); //设置闹钟 if (getContext() != null) { getContext().getContentResolver().notifyChange(uri, null); @@ -104,7 +104,7 @@ public class FZDAlarmProvider extends ContentProvider { int match = sUriMatcher.match(uri); if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - int delete = writableDatabase.delete(FZDDatabaseHelper.tb_alarm, selection, selectionArgs); + int delete = writableDatabase.delete(ICDatabaseHelper.tb_alarm, selection, selectionArgs); //删除闹钟 if (getContext() != null) { getContext().sendBroadcast(new Intent(ACTION_ALARM_ALARM_CHANGE)); @@ -123,7 +123,7 @@ public class FZDAlarmProvider extends ContentProvider { int match = sUriMatcher.match(uri); if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - int update = writableDatabase.update(FZDDatabaseHelper.tb_alarm, values, selection, selectionArgs); + int update = writableDatabase.update(ICDatabaseHelper.tb_alarm, values, selection, selectionArgs); //更新闹钟 if (getContext() != null) { getContext().sendBroadcast(new Intent(ACTION_ALARM_ALARM_CHANGE)); diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDDatabaseHelper.java b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java similarity index 98% rename from app/src/main/java/com/enqualcomm/support/provider/FZDDatabaseHelper.java rename to app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java index 1cb395b6..31a417be 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDDatabaseHelper.java +++ b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java @@ -8,13 +8,13 @@ import android.support.annotation.Nullable; import com.enqualcomm.support.utils.ICLogger; -public class FZDDatabaseHelper extends SQLiteOpenHelper { +public class ICDatabaseHelper extends SQLiteOpenHelper { public static final String DB_NAME = "fzd_db"; private static final int DEFAULT_VERSION = 1; - public FZDDatabaseHelper(@Nullable Context context) { + public ICDatabaseHelper(@Nullable Context context) { super(context, DB_NAME, null, DEFAULT_VERSION); } diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDFollowProvider.java b/app/src/main/java/com/enqualcomm/support/provider/ICFollowProvider.java similarity index 84% rename from app/src/main/java/com/enqualcomm/support/provider/FZDFollowProvider.java rename to app/src/main/java/com/enqualcomm/support/provider/ICFollowProvider.java index 29d7c332..15c46bb1 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDFollowProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/ICFollowProvider.java @@ -9,14 +9,17 @@ import android.net.Uri; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -public class FZDFollowProvider extends ContentProvider { +/** + * 小红花奖励记录 + */ +public class ICFollowProvider extends ContentProvider { public static final String PATH = "follow"; public static final String AUTHORITY = "com.ic.fzd.follow"; public static final String FOLLOW = "content://" + AUTHORITY + "/" + PATH; public static final String FOLLOW_ITEM = "content://" + AUTHORITY + ".item" + "/" + PATH; - private FZDDatabaseHelper mDatabase; + private ICDatabaseHelper mDatabase; private static final UriMatcher sUriMatcher; @@ -29,7 +32,7 @@ public class FZDFollowProvider extends ContentProvider { @Override public boolean onCreate() { - mDatabase = new FZDDatabaseHelper(getContext()); + mDatabase = new ICDatabaseHelper(getContext()); return false; } @@ -43,7 +46,7 @@ public class FZDFollowProvider extends ContentProvider { //规则匹配 if (sUriMatcher.match(uri) == MATH_CODE_TABLE) { SQLiteDatabase readableDatabase = mDatabase.getReadableDatabase(); - return readableDatabase.query(FZDDatabaseHelper.tFollow, projection, + return readableDatabase.query(ICDatabaseHelper.tFollow, projection, selection, selectionArgs, null, null, sortOrder); } return null; @@ -61,7 +64,7 @@ public class FZDFollowProvider extends ContentProvider { if (sUriMatcher.match(uri) == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); //插入的时候通知更新 - long id = writableDatabase.insert(FZDDatabaseHelper.tFollow, null, values); + long id = writableDatabase.insert(ICDatabaseHelper.tFollow, null, values); if (getContext() != null) { getContext().getContentResolver().notifyChange( Uri.parse(FOLLOW_ITEM), null @@ -76,7 +79,7 @@ public class FZDFollowProvider extends ContentProvider { public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) { if (sUriMatcher.match(uri) == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - return writableDatabase.delete(FZDDatabaseHelper.tFollow, selection, selectionArgs); + return writableDatabase.delete(ICDatabaseHelper.tFollow, selection, selectionArgs); } return 0; } @@ -92,7 +95,7 @@ public class FZDFollowProvider extends ContentProvider { Uri.parse(FOLLOW_ITEM), null ); } - return writableDatabase.update(FZDDatabaseHelper.tFollow, values, selection, selectionArgs); + return writableDatabase.update(ICDatabaseHelper.tFollow, values, selection, selectionArgs); } return 0; } diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDSettingsProvider.java b/app/src/main/java/com/enqualcomm/support/provider/ICGlobalSettingsProvider.java similarity index 80% rename from app/src/main/java/com/enqualcomm/support/provider/FZDSettingsProvider.java rename to app/src/main/java/com/enqualcomm/support/provider/ICGlobalSettingsProvider.java index cc286db9..436e561e 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDSettingsProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/ICGlobalSettingsProvider.java @@ -13,17 +13,17 @@ import android.text.TextUtils; import com.enqualcomm.support.utils.ICLogger; /** - * 防走丢设置的内容提供者 + * 全局配置的内容提供者 * 保存数据keyValue的形式 * path代表table,.key表示key的内容 * 需要监听设置项变化为："content://" + AUTHORITY + "/" + PATH+"."+KEY */ -public class FZDSettingsProvider extends ContentProvider { +public class ICGlobalSettingsProvider extends ContentProvider { public static final String PATH = "settings"; public static final String AUTHORITY = "com.ic.fzd.settings"; public static final String SETTINGS = "content://" + AUTHORITY + "/" + PATH; - private FZDDatabaseHelper mDatabase; + private ICDatabaseHelper mDatabase; private static final UriMatcher sUriMatcher; @@ -37,7 +37,7 @@ public class FZDSettingsProvider extends ContentProvider { @Override public boolean onCreate() { - mDatabase = new FZDDatabaseHelper(getContext()); + mDatabase = new ICDatabaseHelper(getContext()); return false; } @@ -49,7 +49,7 @@ public class FZDSettingsProvider extends ContentProvider { int match = sUriMatcher.match(uri); if (match == MATH_CODE_TABLE) { SQLiteDatabase readableDatabase = mDatabase.getReadableDatabase(); - return readableDatabase.query(FZDDatabaseHelper.tSettings, projection, + return readableDatabase.query(ICDatabaseHelper.tSettings, projection, selection, selectionArgs, null, null, sortOrder); @@ -69,25 +69,25 @@ public class FZDSettingsProvider extends ContentProvider { int match = sUriMatcher.match(uri); ICLogger.d("match code == > " + match); if (match == MATH_CODE_TABLE && values != null) { - String key = (String) values.get(FZDDatabaseHelper.sKey); + String key = (String) values.get(ICDatabaseHelper.sKey); ICLogger.d("key == > " + key); SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); if (!TextUtils.isEmpty(key)) { - Cursor query = writableDatabase.query(FZDDatabaseHelper.tSettings, - null, FZDDatabaseHelper.sKey + "=?", new String[]{key}, + Cursor query = writableDatabase.query(ICDatabaseHelper.tSettings, + null, ICDatabaseHelper.sKey + "=?", new String[]{key}, null, null, null); Uri targetUri; if (query != null && query.moveToNext()) { ICLogger.d("do update == > " + key); - writableDatabase.update(FZDDatabaseHelper.tSettings, - values, FZDDatabaseHelper.sKey + "=?", + writableDatabase.update(ICDatabaseHelper.tSettings, + values, ICDatabaseHelper.sKey + "=?", new String[]{key}); - targetUri = Uri.parse(SETTINGS + "/" + query.getInt(query.getColumnIndex(FZDDatabaseHelper.sId))); + targetUri = Uri.parse(SETTINGS + "/" + query.getInt(query.getColumnIndex(ICDatabaseHelper.sId))); query.close(); } else { ICLogger.d("do insert == > " + key); //为了确保key唯一，没有在sql上加约束，所以先查询一下吧。如果有就走更新 - long rowId = writableDatabase.insert(FZDDatabaseHelper.tSettings, + long rowId = writableDatabase.insert(ICDatabaseHelper.tSettings, null, values); //插入的时候，会返回这个，同时会通知监听者 targetUri = Uri.parse(SETTINGS + "/" + rowId); @@ -109,7 +109,7 @@ public class FZDSettingsProvider extends ContentProvider { int match = sUriMatcher.match(uri); if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - return writableDatabase.delete(FZDDatabaseHelper.tSettings, selection, selectionArgs); + return writableDatabase.delete(ICDatabaseHelper.tSettings, selection, selectionArgs); } return 0; } @@ -119,11 +119,11 @@ public class FZDSettingsProvider extends ContentProvider { int match = sUriMatcher.match(uri); if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - int update = writableDatabase.update(FZDDatabaseHelper.tSettings, + int update = writableDatabase.update(ICDatabaseHelper.tSettings, values, selection, selectionArgs); //通知改变 if (values != null && getContext() != null) { - String key = (String) values.get(FZDDatabaseHelper.sKey); + String key = (String) values.get(ICDatabaseHelper.sKey); if (key != null) { getContext().getContentResolver().notifyChange( Uri.parse(SETTINGS + "." + key), null diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java b/app/src/main/java/com/enqualcomm/support/provider/ICMembersProvider.java similarity index 82% rename from app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java rename to app/src/main/java/com/enqualcomm/support/provider/ICMembersProvider.java index 4559205e..f7d5a05e 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/ICMembersProvider.java @@ -11,7 +11,10 @@ import android.support.annotation.Nullable; import com.enqualcomm.support.utils.ICLogger; -public class FZDMembersProvider extends ContentProvider { +/** + * 音视频通话，通讯录列表 + */ +public class ICMembersProvider extends ContentProvider { private static UriMatcher sUriMatcher; private static final int MATH_CODE_TABLE = 1; @@ -26,11 +29,11 @@ public class FZDMembersProvider extends ContentProvider { sUriMatcher.addURI(AUTHORITY, PATH, MATH_CODE_TABLE); } - private FZDDatabaseHelper mDatabase; + private ICDatabaseHelper mDatabase; @Override public boolean onCreate() { - mDatabase = new FZDDatabaseHelper(getContext()); + mDatabase = new ICDatabaseHelper(getContext()); return false; } @@ -55,7 +58,7 @@ public class FZDMembersProvider extends ContentProvider { int match = sUriMatcher.match(uri); SQLiteDatabase readableDatabase = mDatabase.getReadableDatabase(); if (match == MATH_CODE_TABLE) { - return readableDatabase.query(FZDDatabaseHelper.tMembers, + return readableDatabase.query(ICDatabaseHelper.tMembers, projection, selection, selectionArgs, @@ -78,12 +81,12 @@ public class FZDMembersProvider extends ContentProvider { if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); //判断是否有存在吧,确保唯一，删除再添加吧，否则也是添加不进去的 - writableDatabase.delete(FZDDatabaseHelper.tMembers, FZDDatabaseHelper.mId + "=?", new String[]{ - values.getAsString(FZDDatabaseHelper.mId) + writableDatabase.delete(ICDatabaseHelper.tMembers, ICDatabaseHelper.mId + "=?", new String[]{ + values.getAsString(ICDatabaseHelper.mId) }); ICLogger.d("values == > " + values.size()); int size = values.size(); - long insert = writableDatabase.insert(FZDDatabaseHelper.tMembers, null, values); + long insert = writableDatabase.insert(ICDatabaseHelper.tMembers, null, values); writableDatabase.close(); getContext().getContentResolver().notifyChange(uri, null); return Uri.parse(AUTHORITY + "/" + PATH + "/" + insert); @@ -98,7 +101,7 @@ public class FZDMembersProvider extends ContentProvider { int match = sUriMatcher.match(uri); if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - int delete = writableDatabase.delete(FZDDatabaseHelper.tMembers, selection, selectionArgs); + int delete = writableDatabase.delete(ICDatabaseHelper.tMembers, selection, selectionArgs); writableDatabase.close(); return delete; } @@ -113,7 +116,7 @@ public class FZDMembersProvider extends ContentProvider { int match = sUriMatcher.match(uri); if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - int update = writableDatabase.update(FZDDatabaseHelper.tMembers, values, selection, selectionArgs); + int update = writableDatabase.update(ICDatabaseHelper.tMembers, values, selection, selectionArgs); writableDatabase.close(); return update; } diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDMessageProvider.java b/app/src/main/java/com/enqualcomm/support/provider/WeTalkMessageProvider.java similarity index 88% rename from app/src/main/java/com/enqualcomm/support/provider/FZDMessageProvider.java rename to app/src/main/java/com/enqualcomm/support/provider/WeTalkMessageProvider.java index 1172344c..4b0864f3 100644 --- a/app/src/main/java/com/enqualcomm/support/provider/FZDMessageProvider.java +++ b/app/src/main/java/com/enqualcomm/support/provider/WeTalkMessageProvider.java @@ -13,7 +13,10 @@ import com.enqualcomm.support.utils.ICLogger; import java.util.Objects; -public class FZDMessageProvider extends ContentProvider { +/** + * 微聊消息内容提供者 + */ +public class WeTalkMessageProvider extends ContentProvider { //添加规则 public static final String PATH = "message"; @@ -23,7 +26,7 @@ public class FZDMessageProvider extends ContentProvider { //一个Item添加/更新的时候，可以通过这个来通知UI public static final String MESSAGES_ITEM = "content://" + AUTHORITY + ".item" + "/" + PATH; - private FZDDatabaseHelper mDatabase; + private ICDatabaseHelper mDatabase; private static final int MATH_CODE_TABLE = 1; @@ -40,7 +43,7 @@ public class FZDMessageProvider extends ContentProvider { @Override public boolean onCreate() { - mDatabase = new FZDDatabaseHelper(getContext()); + mDatabase = new ICDatabaseHelper(getContext()); return false; } @@ -55,7 +58,7 @@ public class FZDMessageProvider extends ContentProvider { if (match == MATH_CODE_TABLE) { //处理查询 SQLiteDatabase readableDatabase = mDatabase.getReadableDatabase(); - return readableDatabase.query(FZDDatabaseHelper.tMessage, projection, + return readableDatabase.query(ICDatabaseHelper.tMessage, projection, selection, selectionArgs, null, null, sortOrder); } return null; @@ -78,7 +81,7 @@ public class FZDMessageProvider extends ContentProvider { //如果是发送的地方则观察来源是发送的信息 SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); //处理插入 - long id = writableDatabase.insert(FZDDatabaseHelper.tMessage, null, values); + long id = writableDatabase.insert(ICDatabaseHelper.tMessage, null, values); //通知观察者数据更新了 Uri parse = Uri.parse(MESSAGES + "/" + id); //如果是发送的，那么就发出此条通知 @@ -87,7 +90,7 @@ public class FZDMessageProvider extends ContentProvider { ////状态：0表示未读，1表示未读，2表示未发送，3表示发送中，4表示发送失败，5表示发送成功 int state = values.getAsInteger("state"); //往外发送 - if (out == FZDDatabaseHelper.InOrOut.out && state == FZDDatabaseHelper.MessageState.NO_SEND) { + if (out == ICDatabaseHelper.InOrOut.out && state == ICDatabaseHelper.MessageState.NO_SEND) { Uri sendNotify = Uri.parse(MESSAGES_SEND + "/" + id); //发出通知 Objects.requireNonNull(getContext()).getContentResolver().notifyChange(sendNotify, null); @@ -112,7 +115,7 @@ public class FZDMessageProvider extends ContentProvider { if (match == MATH_CODE_TABLE) { //删除数据 SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - return writableDatabase.delete(FZDDatabaseHelper.tMessage, selection, selectionArgs); + return writableDatabase.delete(ICDatabaseHelper.tMessage, selection, selectionArgs); } return 0; } @@ -125,7 +128,7 @@ public class FZDMessageProvider extends ContentProvider { int match = sUriMatcher.match(uri); if (match == MATH_CODE_TABLE) { SQLiteDatabase writableDatabase = mDatabase.getWritableDatabase(); - int update = writableDatabase.update(FZDDatabaseHelper.tMessage, values, selection, selectionArgs); + int update = writableDatabase.update(ICDatabaseHelper.tMessage, values, selection, selectionArgs); //如果是状态变化的话通知UI监听的地方 //让UI查询一下新的状态 if (values != null) { diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index f44f4540..a59985c0 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -25,8 +25,8 @@ import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.bean.VoiceContent; import com.enqualcomm.support.bean.voicePacket; -import com.enqualcomm.support.provider.FZDDatabaseHelper; -import com.enqualcomm.support.provider.FZDMessageProvider; +import com.enqualcomm.support.provider.ICDatabaseHelper; +import com.enqualcomm.support.provider.WeTalkMessageProvider; import com.enqualcomm.support.service.base.AbstractConnectionService; import com.enqualcomm.support.utils.AESCipher; import com.enqualcomm.support.utils.Connection; @@ -469,18 +469,18 @@ public class Deliver extends AbstractConnectionService { //路径 contentValues.put("content", msgUrl); //类型为声音 - contentValues.put("type", FZDDatabaseHelper.MessageType.PIC); + contentValues.put("type", ICDatabaseHelper.MessageType.PIC); //状态：0表示未读 - contentValues.put("state", FZDDatabaseHelper.MessageState.NO_SEND); + contentValues.put("state", ICDatabaseHelper.MessageState.NO_SEND); //文件时长 contentValues.put("duration", 0); //接受还是发送,1表示来信 - contentValues.put("in_or_out", FZDDatabaseHelper.InOrOut.out); + contentValues.put("in_or_out", ICDatabaseHelper.InOrOut.out); //对方号码是没有的 contentValues.put("remote_num", ""); contentValues.put("create_time", System.currentTimeMillis()); contentValues.put("update_time", System.currentTimeMillis()); - mRuntime.getContextProxy().getResolver().insert(Uri.parse(FZDMessageProvider.MESSAGES), + mRuntime.getContextProxy().getResolver().insert(Uri.parse(WeTalkMessageProvider.MESSAGES), contentValues); ICLogger.i("receive taken photo to send " + msgUrl); //保存到防走丢的数据库里 diff --git a/app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java b/app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java index 9838bb09..a746a78f 100644 --- a/app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java +++ b/app/src/main/java/com/enqualcomm/support/service/WeTalkMsgObserver.java @@ -6,11 +6,10 @@ import android.database.Cursor; import android.net.Uri; import android.os.Handler; -import com.enqualcomm.support.provider.FZDDatabaseHelper; -import com.enqualcomm.support.provider.FZDMessageProvider; +import com.enqualcomm.support.provider.ICDatabaseHelper; +import com.enqualcomm.support.provider.WeTalkMessageProvider; import com.enqualcomm.support.utils.ICLogger; import com.ic.protocols.protocolAPIHelper; -import com.ic.protocols.protocol_fzd; public class WeTalkMsgObserver extends ContentObserver { private final ContentResolver mResolver; @@ -36,7 +35,7 @@ public class WeTalkMsgObserver extends ContentObserver { //查询到数据，给到fzd协议上传数据 String lastPathSegment = uri.getLastPathSegment(); ICLogger.d("lastPathSegment == > " + lastPathSegment); - Cursor query = mResolver.query(Uri.parse(FZDMessageProvider.MESSAGES), null, "_id=?", + Cursor query = mResolver.query(Uri.parse(WeTalkMessageProvider.MESSAGES), null, "_id=?", new String[]{lastPathSegment}, null, null); if (query != null && query.moveToNext()) { String content = query.getString(query.getColumnIndex("content")); @@ -49,9 +48,9 @@ public class WeTalkMsgObserver extends ContentObserver { int type = query.getInt(query.getColumnIndex("type")); query.close(); - if (type == FZDDatabaseHelper.MessageType.VOICE) { + if (type == ICDatabaseHelper.MessageType.VOICE) { protocolAPIHelper.sendVoice(duration, remoteNum, content, lastPathSegment); - } else if (type == FZDDatabaseHelper.MessageType.PIC) { + } else if (type == ICDatabaseHelper.MessageType.PIC) { //图片数据 protocolAPIHelper.sendPicture(remoteNum, content, lastPathSegment); } diff --git a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java index 0bf3b042..7ce76e3a 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java @@ -29,7 +29,7 @@ import com.enqualcomm.support.bean.SleepRecord; import com.enqualcomm.support.bean.StheartRate; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.bean.Weather; -import com.enqualcomm.support.provider.FZDAlarmProvider; +import com.enqualcomm.support.provider.ICAlarmProvider; import com.enqualcomm.support.provider.ICContentProvider; import com.ic.protocols.protocolAPIHelper; @@ -466,7 +466,7 @@ public class DBHelper { public List queryIcAlarm() { ArrayList alarms = new ArrayList<>(); - Cursor query = this.cr.query(Uri.parse(FZDAlarmProvider.ALARMS), null, null, null, null); + Cursor query = this.cr.query(Uri.parse(ICAlarmProvider.ALARMS), null, null, null, null); if (query != null) { while (query.moveToNext()) { Alarm item = new Alarm(); 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..36c96207 100644 --- a/app/src/main/java/com/ic/protocols/protocol_anan.java +++ b/app/src/main/java/com/ic/protocols/protocol_anan.java @@ -31,9 +31,9 @@ import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.bean.VoiceContent; import com.enqualcomm.support.bean.voicePacket; -import com.enqualcomm.support.provider.FZDDatabaseHelper; -import com.enqualcomm.support.provider.FZDMembersProvider; -import com.enqualcomm.support.provider.FZDSettingsProvider; +import com.enqualcomm.support.provider.ICDatabaseHelper; +import com.enqualcomm.support.provider.ICMembersProvider; +import com.enqualcomm.support.provider.ICGlobalSettingsProvider; import com.enqualcomm.support.service.HeartRateManager; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.ICLogger; @@ -496,9 +496,9 @@ public class protocol_anan { if (targetStep == -1) { //读取数据库数据 Cursor query = ds.getContextProxy().getResolver().query( - Uri.parse(FZDSettingsProvider.SETTINGS), - new String[]{FZDDatabaseHelper.sValue}, - FZDDatabaseHelper.sKey + "=?", + Uri.parse(ICGlobalSettingsProvider.SETTINGS), + new String[]{ICDatabaseHelper.sValue}, + ICDatabaseHelper.sKey + "=?", new String[]{cmdMap.get(CMD_TYPE.BP98)}, null ); @@ -966,16 +966,16 @@ public class protocol_anan { //插入天气当前温度 GenericWeatherInfo genericWeatherInfo = weatherInfo.get(0); ContentValues tempValues = new ContentValues(); - tempValues.put(FZDDatabaseHelper.sKey, "weather_temp"); - tempValues.put(FZDDatabaseHelper.sValue, genericWeatherInfo.getCurrentTemp()); + tempValues.put(ICDatabaseHelper.sKey, "weather_temp"); + tempValues.put(ICDatabaseHelper.sValue, genericWeatherInfo.getCurrentTemp()); mRuntime.getContextProxy().getResolver().insert( - Uri.parse(FZDSettingsProvider.SETTINGS), + Uri.parse(ICGlobalSettingsProvider.SETTINGS), tempValues); ContentValues wtCodeValues = new ContentValues(); - wtCodeValues.put(FZDDatabaseHelper.sKey, "weather_type"); - wtCodeValues.put(FZDDatabaseHelper.sValue, genericWeatherInfo.getWeatherCode()); + wtCodeValues.put(ICDatabaseHelper.sKey, "weather_type"); + wtCodeValues.put(ICDatabaseHelper.sValue, genericWeatherInfo.getWeatherCode()); mRuntime.getContextProxy().getResolver().insert( - Uri.parse(FZDSettingsProvider.SETTINGS), + Uri.parse(ICGlobalSettingsProvider.SETTINGS), wtCodeValues); } else { ICLogger.i(" BPTQ Format error！"); @@ -1108,10 +1108,10 @@ public class protocol_anan { "show_sport_target_flag", ""); ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.sKey, cmdMap.get(CMD_TYPE.BP98)); - contentValues.put(FZDDatabaseHelper.sValue, value); + contentValues.put(ICDatabaseHelper.sKey, cmdMap.get(CMD_TYPE.BP98)); + contentValues.put(ICDatabaseHelper.sValue, value); //放到数据库里，需要的进行读取即可 - mRuntime.getContextProxy().getResolver().insert(Uri.parse(FZDSettingsProvider.SETTINGS), contentValues); + mRuntime.getContextProxy().getResolver().insert(Uri.parse(ICGlobalSettingsProvider.SETTINGS), contentValues); mConnection.send( genStringMessage(cmdMap.get(CMD_TYPE.AP98), new StringBuilder(CMDHEADER).append( cmdMap.get(CMD_TYPE.AP98) @@ -1204,9 +1204,9 @@ public class protocol_anan { // 不取消定位闹钟，而是在定位闹钟广播的地方去判断 // 因为用户可能又开启了，所以闹钟还是需要的 ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.sKey, cmdMap.get(BPSW)); - contentValues.put(FZDDatabaseHelper.sValue, value); - mRuntime.getContextProxy().getResolver().insert(Uri.parse(FZDSettingsProvider.SETTINGS), + contentValues.put(ICDatabaseHelper.sKey, cmdMap.get(BPSW)); + contentValues.put(ICDatabaseHelper.sValue, value); + mRuntime.getContextProxy().getResolver().insert(Uri.parse(ICGlobalSettingsProvider.SETTINGS), contentValues); //回复IWAPSW,0808351,1# mConnection.send(APSW(responseCode, value)); @@ -1586,16 +1586,16 @@ public class protocol_anan { // contactArray.add(new Contact(Contact.CATEGORY_CARE,"CARE","666")); // contactArray.add(new Contact(Contact.CATEGORY_VOLTE,"VOLTE","666")); //保存一份到新的member数据库时 - runtime.getContextProxy().getResolver().delete(Uri.parse(FZDMembersProvider.MEMBERS), + runtime.getContextProxy().getResolver().delete(Uri.parse(ICMembersProvider.MEMBERS), null, null); for (Contact contact : contactArray) { ContentValues values = new ContentValues(); ICLogger.d("contact == > " + contact); - values.put(FZDDatabaseHelper.fID, contact.number); - values.put(FZDDatabaseHelper.fPhoneNum, contact.number); - values.put(FZDDatabaseHelper.fUserName, contact.name); + values.put(ICDatabaseHelper.fID, contact.number); + values.put(ICDatabaseHelper.fPhoneNum, contact.number); + values.put(ICDatabaseHelper.fUserName, contact.name); runtime.getContextProxy().getResolver().insert( - Uri.parse(FZDMembersProvider.MEMBERS), values); + Uri.parse(ICMembersProvider.MEMBERS), values); } runtime.getDbHelper().saveContacts(contactArray, false, false, true, false, false, false); diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java index ce374a29..43b124a3 100644 --- a/app/src/main/java/com/ic/protocols/protocol_fzd.java +++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java @@ -34,11 +34,11 @@ import com.enqualcomm.support.bean.HealthInfo; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.Silent; import com.enqualcomm.support.bean.StringMessage; -import com.enqualcomm.support.provider.FZDDatabaseHelper; -import com.enqualcomm.support.provider.FZDFollowProvider; -import com.enqualcomm.support.provider.FZDMembersProvider; -import com.enqualcomm.support.provider.FZDMessageProvider; -import com.enqualcomm.support.provider.FZDSettingsProvider; +import com.enqualcomm.support.provider.ICDatabaseHelper; +import com.enqualcomm.support.provider.ICFollowProvider; +import com.enqualcomm.support.provider.ICMembersProvider; +import com.enqualcomm.support.provider.WeTalkMessageProvider; +import com.enqualcomm.support.provider.ICGlobalSettingsProvider; import com.enqualcomm.support.service.HeartRateManager; import com.enqualcomm.support.utils.AlarmHelper; import com.enqualcomm.support.utils.CameraUtil; @@ -197,7 +197,7 @@ public class protocol_fzd { ContentValues contentValues = new ContentValues(); contentValues.put("state", 5); mRuntime.getContextProxy().getResolver().update( - Uri.parse(FZDMessageProvider.MESSAGES), + Uri.parse(WeTalkMessageProvider.MESSAGES), contentValues, "_id=?", new String[]{voiceId} @@ -207,7 +207,7 @@ public class protocol_fzd { ContentValues contentValues = new ContentValues(); contentValues.put("state", 4); mRuntime.getContextProxy().getResolver().update( - Uri.parse(FZDMessageProvider.MESSAGES), + Uri.parse(WeTalkMessageProvider.MESSAGES), contentValues, "_id=?", new String[]{voiceId} @@ -342,7 +342,7 @@ public class protocol_fzd { ContentValues contentValues = new ContentValues(); contentValues.put("state", 5); mRuntime.getContextProxy().getResolver().update( - Uri.parse(FZDMessageProvider.MESSAGES), + Uri.parse(WeTalkMessageProvider.MESSAGES), contentValues, "_id=?", new String[]{imageId} @@ -352,7 +352,7 @@ public class protocol_fzd { ContentValues contentValues = new ContentValues(); contentValues.put("state", 4); mRuntime.getContextProxy().getResolver().update( - Uri.parse(FZDMessageProvider.MESSAGES), + Uri.parse(WeTalkMessageProvider.MESSAGES), contentValues, "_id=?", new String[]{imageId} @@ -720,7 +720,7 @@ public class protocol_fzd { new File(dir), "receive_" + System.currentTimeMillis() + ".amr"); //插入到数据库中 - message2Db(remoteId, amrFilepath, FZDDatabaseHelper.MessageType.VOICE); + message2Db(remoteId, amrFilepath, ICDatabaseHelper.MessageType.VOICE); //返回结果 mConnection.send(TKOne("1")); } catch (Exception e) { @@ -780,7 +780,7 @@ public class protocol_fzd { //} //包存到数据库中,这是群聊的内容，没有联系人的 // 群聊没有remoteId - message2Db("", amrFilepath, FZDDatabaseHelper.MessageType.VOICE); + message2Db("", amrFilepath, ICDatabaseHelper.MessageType.VOICE); //回复服务器状态 mConnection.send(TK("1")); //下发的语音消息，弹窗显示 @@ -804,7 +804,7 @@ public class protocol_fzd { // } //计算文件时长 int amrDuration = 0; - if (type == FZDDatabaseHelper.MessageType.VOICE) { + if (type == ICDatabaseHelper.MessageType.VOICE) { try { File file = new File(amrFilepath); amrDuration = getAmrDuration(file); @@ -828,7 +828,7 @@ public class protocol_fzd { contentValues.put("remote_num", remoteId); contentValues.put("create_time", System.currentTimeMillis()); contentValues.put("update_time", System.currentTimeMillis()); - resolver.insert(Uri.parse(FZDMessageProvider.MESSAGES), contentValues); + resolver.insert(Uri.parse(WeTalkMessageProvider.MESSAGES), contentValues); } private static byte[] byteMerger(byte[]... byteList) { @@ -1052,10 +1052,10 @@ public class protocol_fzd { //把中心号码插入到手中机 ICLogger.d("phoneNum == > " + data); ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.sKey, cmdMap.get(cmd)); - contentValues.put(FZDDatabaseHelper.sValue, data); + contentValues.put(ICDatabaseHelper.sKey, cmdMap.get(cmd)); + contentValues.put(ICDatabaseHelper.sValue, data); mRuntime.getContextProxy().getResolver().insert( - Uri.parse(FZDSettingsProvider.SETTINGS), + Uri.parse(ICGlobalSettingsProvider.SETTINGS), contentValues ); } @@ -1363,50 +1363,50 @@ public class protocol_fzd { String[] list = data.split(CMD_SPLIT); ArrayList contactArray = new ArrayList<>(); ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.fType, FZDDatabaseHelper.MemberType.SOS); + contentValues.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.SOS); if (list.length == 1) { if (regexUtil.isMobileNumber(list[0]) || regexUtil.isPhoneNumber(list[0])) { contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", list[0])); ICLogger.i("find SOS1 number " + list[0]); - contentValues.put(FZDDatabaseHelper.fUserName, "sos1"); - contentValues.put(FZDDatabaseHelper.fPhoneNum, list[0]); + contentValues.put(ICDatabaseHelper.fUserName, "sos1"); + contentValues.put(ICDatabaseHelper.fPhoneNum, list[0]); //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); } } else if (list.length == 2) { if (regexUtil.isMobileNumber(list[0]) || regexUtil.isPhoneNumber(list[0])) { contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", list[0])); ICLogger.i("find SOS1 number " + list[0]); - contentValues.put(FZDDatabaseHelper.fUserName, "sos1"); - contentValues.put(FZDDatabaseHelper.fPhoneNum, list[0]); + contentValues.put(ICDatabaseHelper.fUserName, "sos1"); + contentValues.put(ICDatabaseHelper.fPhoneNum, list[0]); //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); } if (regexUtil.isMobileNumber(list[1]) || regexUtil.isPhoneNumber(list[1])) { contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", list[1])); ICLogger.i("find SOS2 number " + list[1]); - contentValues.put(FZDDatabaseHelper.fUserName, "sos2"); - contentValues.put(FZDDatabaseHelper.fPhoneNum, list[1]); + contentValues.put(ICDatabaseHelper.fUserName, "sos2"); + contentValues.put(ICDatabaseHelper.fPhoneNum, list[1]); //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); } } else if (list.length == 3) { if (regexUtil.isMobileNumber(list[0]) || regexUtil.isPhoneNumber(list[0])) { contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", list[0])); ICLogger.i("find SOS1 number " + list[0]); - contentValues.put(FZDDatabaseHelper.fUserName, "sos1"); - contentValues.put(FZDDatabaseHelper.fPhoneNum, list[0]); + contentValues.put(ICDatabaseHelper.fUserName, "sos1"); + contentValues.put(ICDatabaseHelper.fPhoneNum, list[0]); //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); } if (regexUtil.isMobileNumber(list[1]) || regexUtil.isPhoneNumber(list[1])) { contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", list[1])); ICLogger.i("find SOS2 number " + list[1]); - contentValues.put(FZDDatabaseHelper.fUserName, "sos2"); - contentValues.put(FZDDatabaseHelper.fPhoneNum, list[1]); + contentValues.put(ICDatabaseHelper.fUserName, "sos2"); + contentValues.put(ICDatabaseHelper.fPhoneNum, list[1]); //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); } if (regexUtil.isMobileNumber(list[2]) || regexUtil.isPhoneNumber(list[2])) { contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", list[2])); ICLogger.i("find SOS3 number " + list[2]); - contentValues.put(FZDDatabaseHelper.fUserName, "sos3"); - contentValues.put(FZDDatabaseHelper.fPhoneNum, list[2]); + contentValues.put(ICDatabaseHelper.fUserName, "sos3"); + contentValues.put(ICDatabaseHelper.fPhoneNum, list[2]); //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); } } @@ -1464,24 +1464,24 @@ public class protocol_fzd { ArrayList contactArray = new ArrayList<>(); ContentValues contentValues = new ContentValues(); ContentResolver resolver = runtime.getContextProxy().getResolver(); - resolver.delete(Uri.parse(FZDMembersProvider.MEMBERS), "type=?", new String[]{ - FZDDatabaseHelper.MemberType.WHITE_LIST + "" + resolver.delete(Uri.parse(ICMembersProvider.MEMBERS), "type=?", new String[]{ + ICDatabaseHelper.MemberType.WHITE_LIST + "" }); for (int i = 0; i < listLen; i += 2) { String phoneNum = list[i]; String name = Util.decodeUnicode2Utf8(list[i + 1]); ICLogger.i(i / 2 + " 姓名 " + name + ", 电话 " + phoneNum); contactArray.add(new Contact(Contact.CATEGORY_CALL, name, phoneNum)); - contentValues.put(FZDDatabaseHelper.fType, FZDDatabaseHelper.MemberType.WHITE_LIST); - contentValues.put(FZDDatabaseHelper.fPhoneNum, phoneNum); - contentValues.put(FZDDatabaseHelper.fID, phoneNum); - contentValues.put(FZDDatabaseHelper.fUserName, name); - contentValues.put(FZDDatabaseHelper.fCreateTime, System.currentTimeMillis()); - contentValues.put(FZDDatabaseHelper.fUpdateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.WHITE_LIST); + contentValues.put(ICDatabaseHelper.fPhoneNum, phoneNum); + contentValues.put(ICDatabaseHelper.fID, phoneNum); + contentValues.put(ICDatabaseHelper.fUserName, name); + contentValues.put(ICDatabaseHelper.fCreateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.fUpdateTime, System.currentTimeMillis()); //保存到新的数据库中，为了防止问题，先兼容原来的库 //后面所有地方都切换到新库了，才删除上面的代码 // TODO:需要修改白名单拦截的地方. - resolver.insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); + resolver.insert(Uri.parse(ICMembersProvider.MEMBERS), contentValues); } //TODO:保存到fzd的联系人列表，类型为白名单 runtime.getDbHelper().saveContacts(contactArray, false, false, true, false, false, false); @@ -1850,15 +1850,15 @@ public class protocol_fzd { ICLogger.d("friendName == > " + friendName); ICLogger.d("phoneNum == > " + phoneNum); ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.fID, id); - contentValues.put(FZDDatabaseHelper.fUserName, friendName); - contentValues.put(FZDDatabaseHelper.fPhoneNum, phoneNum); - contentValues.put(FZDDatabaseHelper.fType, FZDDatabaseHelper.MemberType.FRIEND); - contentValues.put(FZDDatabaseHelper.fCreateTime, System.currentTimeMillis()); - contentValues.put(FZDDatabaseHelper.fUpdateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.fID, id); + contentValues.put(ICDatabaseHelper.fUserName, friendName); + contentValues.put(ICDatabaseHelper.fPhoneNum, phoneNum); + contentValues.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.FRIEND); + contentValues.put(ICDatabaseHelper.fCreateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.fUpdateTime, System.currentTimeMillis()); //结果有了，保存到内容提供者里头去. mRuntime.getContextProxy().getResolver() - .insert(Uri.parse(FZDMembersProvider.MEMBERS), + .insert(Uri.parse(ICMembersProvider.MEMBERS), contentValues); } //通知UI更新 @@ -2235,9 +2235,9 @@ public class protocol_fzd { ICLogger.d(cmd + " trigger setting --> " + data); ContentResolver resolver = mRuntime.getContextProxy().getResolver(); ContentValues values = new ContentValues(); - values.put(FZDDatabaseHelper.sKey, cmdMap.get(cmd)); - values.put(FZDDatabaseHelper.sValue, data); - resolver.insert(Uri.parse(FZDSettingsProvider.SETTINGS), values); + values.put(ICDatabaseHelper.sKey, cmdMap.get(cmd)); + values.put(ICDatabaseHelper.sValue, data); + resolver.insert(Uri.parse(ICGlobalSettingsProvider.SETTINGS), values); } /** @@ -2281,12 +2281,12 @@ public class protocol_fzd { ICLogger.d("follow data == > " + data); int count = Integer.parseInt(data); ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.flState, FZDDatabaseHelper.FollowState.unread); - contentValues.put(FZDDatabaseHelper.flCount, count); - contentValues.put(FZDDatabaseHelper.createTime, System.currentTimeMillis()); - contentValues.put(FZDDatabaseHelper.updateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.flState, ICDatabaseHelper.FollowState.unread); + contentValues.put(ICDatabaseHelper.flCount, count); + contentValues.put(ICDatabaseHelper.createTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.updateTime, System.currentTimeMillis()); runtime.getContextProxy().getResolver().insert( - Uri.parse(FZDFollowProvider.FOLLOW), + Uri.parse(ICFollowProvider.FOLLOW), contentValues ); } catch (Exception e) { @@ -2302,13 +2302,13 @@ public class protocol_fzd { private void handleMONITOR(Runtime mRuntime) { //获取中心号码 Cursor query = mRuntime.getContextProxy().getResolver().query( - Uri.parse(FZDSettingsProvider.SETTINGS), - null, FZDDatabaseHelper.sKey + "=?", + Uri.parse(ICGlobalSettingsProvider.SETTINGS), + null, ICDatabaseHelper.sKey + "=?", new String[]{cmdMap.get(CMD_TYPE.CENTER)}, null ); String targetPhone = null; if (query != null && query.moveToNext()) { - targetPhone = query.getString(query.getColumnIndex(FZDDatabaseHelper.sValue)); + targetPhone = query.getString(query.getColumnIndex(ICDatabaseHelper.sValue)); query.close(); } ICLogger.d("target number is == > " + targetPhone); @@ -2467,18 +2467,18 @@ public class protocol_fzd { //让监听的地方去更新即可 //插入天气类型 ContentValues wtCodeValues = new ContentValues(); - wtCodeValues.put(FZDDatabaseHelper.sKey, "weather_type"); - wtCodeValues.put(FZDDatabaseHelper.sValue, wtCode); + wtCodeValues.put(ICDatabaseHelper.sKey, "weather_type"); + wtCodeValues.put(ICDatabaseHelper.sValue, wtCode); mRuntime.getContextProxy().getResolver().insert( - Uri.parse(FZDSettingsProvider.SETTINGS), + Uri.parse(ICGlobalSettingsProvider.SETTINGS), wtCodeValues ); //插入天气当前温度 ContentValues tempValues = new ContentValues(); - tempValues.put(FZDDatabaseHelper.sKey, "weather_temp"); - tempValues.put(FZDDatabaseHelper.sValue, currentTemp); + tempValues.put(ICDatabaseHelper.sKey, "weather_temp"); + tempValues.put(ICDatabaseHelper.sValue, currentTemp); mRuntime.getContextProxy().getResolver().insert( - Uri.parse(FZDSettingsProvider.SETTINGS), + Uri.parse(ICGlobalSettingsProvider.SETTINGS), tempValues ); if (mRuntime.mFZDWeatherCallback != null) { @@ -2497,7 +2497,7 @@ public class protocol_fzd { //解析数据 String textData = Util.decodeUnicode2Utf8(data); ICLogger.d("message data == > " + textData); - message2Db("", textData, FZDDatabaseHelper.MessageType.TEXT); + message2Db("", textData, ICDatabaseHelper.MessageType.TEXT); //入数据库 mConnection.send(MESSAGE()); //弹窗提示//具体看"NewTalkMsg"的处理 @@ -2855,17 +2855,17 @@ public class protocol_fzd { } else { ContentResolver resolver = mRuntime.getContextProxy().getResolver(); //添加之前先清空 - resolver.delete(Uri.parse(FZDMembersProvider.MEMBERS), null, null); + resolver.delete(Uri.parse(ICMembersProvider.MEMBERS), null, null); for (int i = 0; i < split.length; i += 3) { ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.fID, Integer.parseInt(split[i])); - contentValues.put(FZDDatabaseHelper.fUserName, split[i + 1]); - contentValues.put(FZDDatabaseHelper.fPhoneNum, split[i + 2]); - contentValues.put(FZDDatabaseHelper.fType, FZDDatabaseHelper.MemberType.CONTACT); - contentValues.put(FZDDatabaseHelper.fCreateTime, System.currentTimeMillis()); - contentValues.put(FZDDatabaseHelper.fUpdateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.fID, Integer.parseInt(split[i])); + contentValues.put(ICDatabaseHelper.fUserName, split[i + 1]); + contentValues.put(ICDatabaseHelper.fPhoneNum, split[i + 2]); + contentValues.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.CONTACT); + contentValues.put(ICDatabaseHelper.fCreateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.fUpdateTime, System.currentTimeMillis()); //结果有了，保存到内容提供者里头去. - resolver.insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); + resolver.insert(Uri.parse(ICMembersProvider.MEMBERS), contentValues); } } } diff --git a/app/src/main/java/com/ic/protocols/protocol_gator.java b/app/src/main/java/com/ic/protocols/protocol_gator.java index b949aa3a..e81826a4 100644 --- a/app/src/main/java/com/ic/protocols/protocol_gator.java +++ b/app/src/main/java/com/ic/protocols/protocol_gator.java @@ -1,65 +1,42 @@ package com.ic.protocols; -import android.content.ComponentName; import android.content.ContentResolver; import android.content.ContentValues; -import android.content.Context; -import android.content.IClipboard; -import android.content.Intent; import android.net.Uri; import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; -import android.text.TextUtils; -import com.android.internal.telephony.uicc.RuimFileHandler; import com.enqualcomm.support.Config; -import com.enqualcomm.support.Constants; import com.enqualcomm.support.CoreService; -import com.enqualcomm.support.R; import com.enqualcomm.support.bean.Alarm; import com.enqualcomm.support.bean.Contact; import com.enqualcomm.support.bean.Content; -import com.enqualcomm.support.bean.ICLocation; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.Silent; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.bean.VoiceContent; import com.enqualcomm.support.bean.voicePacket; -import com.enqualcomm.support.provider.FZDDatabaseHelper; -import com.enqualcomm.support.provider.FZDMembersProvider; -import com.enqualcomm.support.provider.FZDMessageProvider; -import com.enqualcomm.support.service.HeartRateManager; +import com.enqualcomm.support.provider.ICDatabaseHelper; +import com.enqualcomm.support.provider.ICMembersProvider; +import com.enqualcomm.support.provider.WeTalkMessageProvider; import com.enqualcomm.support.utils.AESCipher; -import com.enqualcomm.support.utils.CameraUtil; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.enqualcomm.support.utils.ICAudioManager; import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.LanguageUtils; -import com.enqualcomm.support.utils.TemperatureUtil; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.Util; -import com.enqualcomm.support.utils.VibrateUtil; -import com.enqualcomm.support.utils.WakeLockUtil; import com.enqualcomm.support.utils.regexUtil; -import com.ic.view.msg.MsgMustReadDialog; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.RandomAccessFile; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import chestnut.utils.RegexUtils; - -import static com.enqualcomm.support.Constants.DIALOG_ACTION; -import static com.enqualcomm.support.Constants.FROM_SERVER; -import static com.enqualcomm.support.LocationClient.LOCATION_MODE; import static com.enqualcomm.support.bean.Contact.GROUP_ALL; import static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP; import static java.lang.Math.abs; @@ -499,13 +476,13 @@ public class protocol_gator { private void appendSOS(Runtime runtime,ArrayList numbers,ArrayList names,ArrayList types){ ArrayList contactArray = new ArrayList<>(); ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.fType, FZDDatabaseHelper.MemberType.SOS); + contentValues.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.SOS); for(int i=0;i< numbers.size();i++) { if (regexUtil.isMobileNumber(numbers.get(i)) || regexUtil.isPhoneNumber(numbers.get(i))) { contactArray.add(new Contact(Contact.CATEGORY_SOS, names.get(i), numbers.get(i))); ICLogger.i("find SOS "+ names.get(i)+" number " + numbers.get(i)); - contentValues.put(FZDDatabaseHelper.fUserName, names.get(i)); - contentValues.put(FZDDatabaseHelper.fPhoneNum, numbers.get(i)); + contentValues.put(ICDatabaseHelper.fUserName, names.get(i)); + contentValues.put(ICDatabaseHelper.fPhoneNum, numbers.get(i)); //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); } } @@ -516,24 +493,24 @@ public class protocol_gator { ArrayList contactArray = new ArrayList<>(); ContentValues contentValues = new ContentValues(); ContentResolver resolver = runtime.getContextProxy().getResolver(); - resolver.delete(Uri.parse(FZDMembersProvider.MEMBERS), "type=?", new String[]{ - FZDDatabaseHelper.MemberType.WHITE_LIST + "" + resolver.delete(Uri.parse(ICMembersProvider.MEMBERS), "type=?", new String[]{ + ICDatabaseHelper.MemberType.WHITE_LIST + "" }); for (int i = 0; i < numbers.size(); i ++) { String phoneNum = numbers.get(i); String name = names.get(i); ICLogger.i(i / 2 + " 姓名 " + name + ", 电话 " + phoneNum); contactArray.add(new Contact(Contact.CATEGORY_CALL, name, phoneNum)); - contentValues.put(FZDDatabaseHelper.fType, FZDDatabaseHelper.MemberType.WHITE_LIST); - contentValues.put(FZDDatabaseHelper.fPhoneNum, phoneNum); - contentValues.put(FZDDatabaseHelper.fID, phoneNum); - contentValues.put(FZDDatabaseHelper.fUserName, name); - contentValues.put(FZDDatabaseHelper.fCreateTime, System.currentTimeMillis()); - contentValues.put(FZDDatabaseHelper.fUpdateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.WHITE_LIST); + contentValues.put(ICDatabaseHelper.fPhoneNum, phoneNum); + contentValues.put(ICDatabaseHelper.fID, phoneNum); + contentValues.put(ICDatabaseHelper.fUserName, name); + contentValues.put(ICDatabaseHelper.fCreateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.fUpdateTime, System.currentTimeMillis()); //保存到新的数据库中，为了防止问题，先兼容原来的库 //后面所有地方都切换到新库了，才删除上面的代码 // TODO:需要修改白名单拦截的地方. - resolver.insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues); + resolver.insert(Uri.parse(ICMembersProvider.MEMBERS), contentValues); } //TODO:保存到fzd的联系人列表，类型为白名单 runtime.getDbHelper().saveContacts(contactArray, false, false, true, false, false, false); @@ -827,7 +804,7 @@ uncle:13141516175 // } //计算文件时长 int amrDuration = 0; - if (type == FZDDatabaseHelper.MessageType.VOICE) { + if (type == ICDatabaseHelper.MessageType.VOICE) { try { File file = new File(amrFilepath); amrDuration = getAmrDuration(file); @@ -851,7 +828,7 @@ uncle:13141516175 contentValues.put("remote_num", remoteId); contentValues.put("create_time", System.currentTimeMillis()); contentValues.put("update_time", System.currentTimeMillis()); - resolver.insert(Uri.parse(FZDMessageProvider.MESSAGES), contentValues); + resolver.insert(Uri.parse(WeTalkMessageProvider.MESSAGES), contentValues); } //服务器下发微聊消息 @@ -902,7 +879,7 @@ uncle:13141516175 voiceContent.preview = String.valueOf(Util.getDuration(voiceContent.content)); ds.getDbHelper().updateMessage(voiceContent, uri2); //插入到数据库中 - message2Db("", amrFilepath, FZDDatabaseHelper.MessageType.VOICE); + message2Db("", amrFilepath, ICDatabaseHelper.MessageType.VOICE); // runtime.getContextProxy().sendBroadcast(ACTION_IMESSAGE, runtime); connection.DeliverCMDMessageToSystem("NewVoice", amrFilepath);//通知下面线程状态变化 } diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java index 96a5d494..902a4d2d 100644 --- a/app/src/main/java/com/ic/protocols/protocol_s123.java +++ b/app/src/main/java/com/ic/protocols/protocol_s123.java @@ -23,9 +23,9 @@ import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.bean.StringMessage; import com.enqualcomm.support.bean.VoiceContent; import com.enqualcomm.support.bean.voicePacket; -import com.enqualcomm.support.provider.FZDAlarmProvider; -import com.enqualcomm.support.provider.FZDDatabaseHelper; -import com.enqualcomm.support.provider.FZDSettingsProvider; +import com.enqualcomm.support.provider.ICAlarmProvider; +import com.enqualcomm.support.provider.ICDatabaseHelper; +import com.enqualcomm.support.provider.ICGlobalSettingsProvider; import com.enqualcomm.support.service.HeartRateManager; import com.enqualcomm.support.utils.CameraUtil; import com.enqualcomm.support.utils.Connection; @@ -3447,7 +3447,7 @@ public class protocol_s123 { String[] alarmItemArray = substring.split("@"); ContentResolver resolver = mRuntime.getContextProxy().getResolver(); //闹钟下发，也是要清空闹钟的 - resolver.delete(Uri.parse(FZDAlarmProvider.ALARMS), null, null); + resolver.delete(Uri.parse(ICAlarmProvider.ALARMS), null, null); for (String itemStr : alarmItemArray) { ICLogger.d("itemStr==> " + itemStr); String[] itemDetail = itemStr.split(CMDSPLIT); @@ -3476,14 +3476,14 @@ public class protocol_s123 { ICLogger.d("alarmItem == > " + alarmName); //入库 ContentValues contentValues = new ContentValues(); - contentValues.put(FZDDatabaseHelper.alarm_name, alarmItem.name); - contentValues.put(FZDDatabaseHelper.alarm_week, alarmItem.week); - contentValues.put(FZDDatabaseHelper.alarm_ring, alarmItem.ring); - contentValues.put(FZDDatabaseHelper.alarm_time, alarmItem.time); - contentValues.put(FZDDatabaseHelper.alarm_status, alarmItem.status); - contentValues.put(FZDDatabaseHelper.updateTime, System.currentTimeMillis()); - contentValues.put(FZDDatabaseHelper.createTime, System.currentTimeMillis()); - resolver.insert(Uri.parse(FZDAlarmProvider.ALARMS), contentValues); + contentValues.put(ICDatabaseHelper.alarm_name, alarmItem.name); + contentValues.put(ICDatabaseHelper.alarm_week, alarmItem.week); + contentValues.put(ICDatabaseHelper.alarm_ring, alarmItem.ring); + contentValues.put(ICDatabaseHelper.alarm_time, alarmItem.time); + contentValues.put(ICDatabaseHelper.alarm_status, alarmItem.status); + contentValues.put(ICDatabaseHelper.updateTime, System.currentTimeMillis()); + contentValues.put(ICDatabaseHelper.createTime, System.currentTimeMillis()); + resolver.insert(Uri.parse(ICAlarmProvider.ALARMS), contentValues); } //设置闹钟 mRuntime.getContextProxy().context.sendBroadcast(new Intent(ACTION_ALARM_ALARM_CHANGE)); @@ -3507,10 +3507,10 @@ public class protocol_s123 { if (split.length == 4) { ContentResolver resolver = mRuntime.getContextProxy().getResolver(); ContentValues values = new ContentValues(); - values.put(FZDDatabaseHelper.sKey, "is_mic_enable"); + values.put(ICDatabaseHelper.sKey, "is_mic_enable"); //把值保存到数据库中，相机会就监听数据库值的变化，做出响应 - values.put(FZDDatabaseHelper.sValue, split[3].replace(CMDEND, "")); - resolver.insert(Uri.parse(FZDSettingsProvider.SETTINGS), values); + values.put(ICDatabaseHelper.sValue, split[3].replace(CMDEND, "")); + resolver.insert(Uri.parse(ICGlobalSettingsProvider.SETTINGS), values); } else { ICLogger.d("parse cmd error..."); } @@ -3532,10 +3532,10 @@ public class protocol_s123 { if (split.length == 4) { ContentResolver resolver = mRuntime.getContextProxy().getResolver(); ContentValues values = new ContentValues(); - values.put(FZDDatabaseHelper.sKey, "is_camera_enable"); + values.put(ICDatabaseHelper.sKey, "is_camera_enable"); //把值保存到数据库中，相机会就监听数据库值的变化，做出响应 - values.put(FZDDatabaseHelper.sValue, split[3].replace(CMDEND, "")); - resolver.insert(Uri.parse(FZDSettingsProvider.SETTINGS), values); + values.put(ICDatabaseHelper.sValue, split[3].replace(CMDEND, "")); + resolver.insert(Uri.parse(ICGlobalSettingsProvider.SETTINGS), values); } else { ICLogger.d("parse cmd error..."); } diff --git a/local.properties b/local.properties index c6dcf0cf..8bb06342 100644 --- a/local.properties +++ b/local.properties @@ -5,4 +5,4 @@ # For customization when using a Version Control System, please read the # header note. #Fri Jul 02 14:52:39 CST 2021 -sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk +sdk.dir=E\:\\Android\\Sdk