Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-01-24 16:19:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE] Подкручены числа HWID

Browse source
This commit is contained in:
Gravit 2019-03-09 22:52:24 +07:00
parent 07761dd88b
commit 08696839dc
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java
View file

@ -137,6 +137,7 @@ public HWID getHWID() {
hwid.totalMemory = getTotalMemory(); hwid.totalMemory = getTotalMemory();
hwid.HWDiskSerial = getHWDisk(); hwid.HWDiskSerial = getHWDisk();
hwid.processorID = getProcessorID(); hwid.processorID = getProcessorID();
hwid.macAddr = getMacAddr();
printHardwareInformation(); printHardwareInformation();
return hwid; return hwid;
} }

21
libLauncher/src/main/java/ru/gravit/launcher/OshiHWID.java
View file

@ -12,6 +12,8 @@ public class OshiHWID implements HWID {
public String HWDiskSerial; public String HWDiskSerial;
@LauncherAPI @LauncherAPI
public String processorID; public String processorID;
@LauncherAPI
public String macAddr;
@Override @Override
public String getSerializeString() { public String getSerializeString() {
@ -22,10 +24,11 @@ public String getSerializeString() {
public int getLevel() //Уровень доверия, насколько уникальные значения public int getLevel() //Уровень доверия, насколько уникальные значения
{ {
int result = 0; int result = 0;
if (totalMemory != 0) result++; if (totalMemory != 0) result+=8;
if (serialNumber != null && !serialNumber.equals("unknown")) result += 4; if (serialNumber != null && !serialNumber.equals("unknown")) result += 12;
if (HWDiskSerial != null && !HWDiskSerial.equals("unknown")) result += 15; if (HWDiskSerial != null && !HWDiskSerial.equals("unknown")) result += 30;
if (processorID != null && !processorID.equals("unknown")) result += 6; if (processorID != null && !processorID.equals("unknown")) result += 10;
if (macAddr != null && !macAddr.equals("00:00:00:00:00:00")) result += 15;
return result; return result;
} }
@ -35,10 +38,12 @@ public int compare(HWID hwid) {
{ {
int rate = 0; int rate = 0;
OshiHWID oshi = (OshiHWID) hwid; OshiHWID oshi = (OshiHWID) hwid;
if(Math.abs(oshi.totalMemory - totalMemory) < 1024*1024) rate+=10; if(Math.abs(oshi.totalMemory - totalMemory) < 1024*1024) rate+=5;
if(oshi.HWDiskSerial.equals(HWDiskSerial)) rate+=50; if(oshi.totalMemory == totalMemory) rate+=15;
if(oshi.processorID.equals(processorID)) rate+=26; if(oshi.HWDiskSerial.equals(HWDiskSerial)) rate+=45;
if(oshi.processorID.equals(processorID)) rate+=18;
if(oshi.serialNumber.equals(serialNumber)) rate+=15; if(oshi.serialNumber.equals(serialNumber)) rate+=15;
if(oshi.macAddr.equals(macAddr)) rate+=19;
return rate; return rate;
} }
return 0; return 0;
@ -46,6 +51,6 @@ public int compare(HWID hwid) {
@Override @Override
public boolean isNull() { public boolean isNull() {
return getLevel() < 2; return getLevel() < 15;
} }
} }