Skip to content

Commit 3fe2065

Browse files
committed
add uuid
1 parent 3c57fc8 commit 3fe2065

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

app/src/main/java/com/brian/csdnblog/activity/ChatActivity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
import com.brian.csdnblog.R;
1515
import com.brian.csdnblog.adapter.ChatListAdapter;
1616
import com.brian.csdnblog.manager.ThreadManager;
17+
import com.brian.csdnblog.manager.UsageStatsManager;
1718
import com.brian.csdnblog.model.ChatMsgInfo;
1819
import com.brian.csdnblog.robot.ChatRobot;
1920
import com.brian.csdnblog.robot.ChatRobot.OnReplyListener;
21+
import com.brian.csdnblog.util.DeviceUtil;
22+
import com.google.gson.Gson;
23+
import com.google.gson.reflect.TypeToken;
2024

2125
import java.util.ArrayList;
2226
import java.util.List;
@@ -126,6 +130,6 @@ private void formatChatList() {
126130
for (ChatMsgInfo chatInfo : chatList) {
127131
list.add(chatInfo.toString());
128132
}
129-
// UsageStatsManager.reportErrorToUmeng(new Gson().toJson(list, new TypeToken<ArrayList<String>>() {}.getType()) + "\n DeviceToken=" + PushManager.getInstance().getDeviceToken());
133+
UsageStatsManager.reportErrorToUmeng(new Gson().toJson(list, new TypeToken<ArrayList<String>>() {}.getType()) + "\n DeviceToken=" + DeviceUtil.getUUID());
130134
}
131135
}

app/src/main/java/com/brian/csdnblog/manager/PushManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.brian.csdnblog.model.NotifyMsgInfo;
99
import com.brian.csdnblog.model.PushInfo;
1010
import com.brian.csdnblog.model.UpdateInfo;
11+
import com.brian.csdnblog.util.DeviceUtil;
1112
import com.brian.csdnblog.util.LogUtil;
1213
import com.google.gson.Gson;
1314
import com.xiaomi.channel.commonutils.logger.LoggerInterface;
@@ -55,6 +56,7 @@ public void handlePushMessageIfNeed() {
5556

5657
public void initPushMsg(Context context) {
5758
MiPushClient.registerPush(context, "2882303761517322008", "5871732210008");
59+
MiPushClient.setUserAccount(context, DeviceUtil.getUUID(), null);
5860
//打开Log
5961
LoggerInterface newLogger = new LoggerInterface() {
6062
@Override

app/src/main/java/com/brian/csdnblog/util/DeviceUtil.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
import android.os.Build;
1111
import android.os.Environment;
1212
import android.os.StatFs;
13+
import android.provider.Settings;
1314
import android.telephony.TelephonyManager;
15+
import android.text.TextUtils;
1416
import android.util.DisplayMetrics;
1517

18+
import com.brian.csdnblog.Env;
19+
1620
import java.io.BufferedReader;
1721
import java.io.File;
1822
import java.io.FileNotFoundException;
@@ -23,13 +27,29 @@
2327
import java.lang.reflect.Field;
2428
import java.lang.reflect.Method;
2529
import java.util.ArrayList;
30+
import java.util.UUID;
2631

2732

2833
/**
2934
* 获取设备的信息
3035
*/
3136
public class DeviceUtil {
3237

38+
private static String uniqueId;
39+
public static String getUUID() {
40+
if (!TextUtils.isEmpty(uniqueId)) {
41+
return uniqueId;
42+
}
43+
final TelephonyManager tm = (TelephonyManager) Env.getContext().getSystemService(Context.TELEPHONY_SERVICE);
44+
final String tmDevice, tmSerial, androidId;
45+
tmDevice = "" + tm.getDeviceId();
46+
tmSerial = "" + tm.getSimSerialNumber();
47+
androidId = "" + Settings.Secure.getString(Env.getContext().getContentResolver(), Settings.Secure.ANDROID_ID);
48+
UUID deviceUuid = new UUID(androidId.hashCode(), ((long) tmDevice.hashCode() << 32) | tmSerial.hashCode());
49+
uniqueId = Md5.getMD5ofStr(deviceUuid.toString());
50+
LogUtil.d("uuid=" + uniqueId);
51+
return uniqueId;
52+
}
3353

3454
/**
3555
* 获取分辨率,格式:640x480

0 commit comments

Comments
 (0)