|
@@ -49,6 +49,11 @@ public class InitActivity extends AppCompatActivity {
|
|
|
super.onCreate(savedInstanceState);
|
|
|
setContentView(R.layout.init_layout);
|
|
|
|
|
|
+ if ("NULL".equals(NetFunctionConfig.getUUID())) {
|
|
|
+ String uuid = "UUID" + System.currentTimeMillis();
|
|
|
+ NetFunctionConfig.setUUID(uuid);
|
|
|
+ }
|
|
|
+
|
|
|
tvMac = findViewById(R.id.textView_mac);
|
|
|
tvIP = findViewById(R.id.textView_ip);
|
|
|
tvServer = findViewById(R.id.textView_server_ip);
|
|
@@ -238,7 +243,8 @@ public class InitActivity extends AppCompatActivity {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
if (tvMac != null && tvIP != null) {
|
|
|
- tvMac.setText("MAC地址: " + GetInformationUtils.getMacAddress(InitActivity.this));
|
|
|
+ //tvMac.setText("MAC地址: " + GetInformationUtils.getMacAddress(InitActivity.this));
|
|
|
+ tvMac.setText("设备ID: " + NetFunctionConfig.getUUID());
|
|
|
tvIP.setText("本机IP地址: " + GetInformationUtils.getLocalIP());
|
|
|
tvServer.setText("服务器IP: " + NetFunctionConfig.getServerIp() + ":" + NetFunctionConfig.getServerPort());
|
|
|
}
|