master
hwf452 2 years ago
parent 5bc47b32fb
commit fcba4511e2

@ -190,10 +190,10 @@ public class LoginActivity extends BaseActivity {
// etUse.setText("161619"); // etUse.setText("161619");
// etPwd.setText("lgy12345"); // etPwd.setText("lgy12345");
etUse.setText("161619"); // etUse.setText("161619");
etPwd.setText("161619"); // etPwd.setText("161619");
//使用完一定记得关闭电源 //使用完一定记得关闭 电源
mt.RFIDclose(); mt.RFIDclose();
mt.IRTclose(); mt.IRTclose();
mt.VIBclose(); mt.VIBclose();
@ -353,16 +353,15 @@ public class LoginActivity extends BaseActivity {
@Override @Override
public void onSucceed(int what, Response<String> response) throws ParseException { public void onSucceed(int what, Response<String> response) throws ParseException {
String json = response.get(); String json = response.get();
showLog("-----login-----"); // showLog("-----login-----");
showLog(json); // showLog(json);
String jsonDecode = RSAUtils.decryptBASE64StrClient(json); String jsonDecode = RSAUtils.decryptBASE64StrClient(json);
if (TextUtils.isEmpty(jsonDecode)) { if (TextUtils.isEmpty(jsonDecode)) {
showToast(UiUtlis.getString(context, R.string.data_error)); showToast(UiUtlis.getString(context, R.string.data_error));
} else { } else {
UserInfo userInfo = GsonUtils.GsonToBean(jsonDecode, UserInfo.class); UserInfo userInfo = GsonUtils.GsonToBean(jsonDecode, UserInfo.class);
showLog(new Gson().toJson(userInfo)); //showLog(jsonDecode);
showLog(jsonDecode);
if (userInfo != null) { if (userInfo != null) {
UserInfo.User user = userInfo.getRows().get(0); UserInfo.User user = userInfo.getRows().get(0);
@ -459,9 +458,9 @@ public class LoginActivity extends BaseActivity {
info.setRows(list); info.setRows(list);
String json = GsonUtils.GsonString(info); String json = GsonUtils.GsonString(info);
String jsonEncrypt = RSAUtils.encryptBASE64Str(json); String jsonEncrypt = RSAUtils.encryptBASE64Str(json);
showLog(json); // showLog(json);
showLog(jsonEncrypt); // showLog(jsonEncrypt);
showLog(RSAUtils.decryptBASE64Str(jsonEncrypt)); // showLog(RSAUtils.decryptBASE64Str(jsonEncrypt));
return jsonEncrypt; return jsonEncrypt;
} }

@ -12,9 +12,13 @@ public class Contans {
// public static String network_type_Intranet = "http://192.168.254.1:8090/"; // public static String network_type_Intranet = "http://192.168.254.1:8090/";
// public static String network_type_extranet = "http://113.107.214.27:8090/"; // public static String network_type_extranet = "http://113.107.214.27:8090/";
public static String IP = "http://192.168.2.6:8089/"; public static String IP = "http://113.107.214.27:8092/";
public static String network_type_Intranet = "http://192.168.2.6:8089/"; public static String network_type_Intranet = "http://192.168.254.1:8092/";
public static String network_type_extranet = "http://192.168.2.6:8089/"; public static String network_type_extranet = "http://113.107.214.27:8092/";
// public static String IP = "http://192.168.2.6:8089/";
// public static String network_type_Intranet = "http://192.168.2.6:8089/";
// public static String network_type_extranet = "http://192.168.2.6:8089/";
public static String MAXIMOIP = "http://10.46.0.152:7001/"; public static String MAXIMOIP = "http://10.46.0.152:7001/";
@ -135,7 +139,4 @@ public class Contans {
public final static String Q4GD_IMG = "Q4WorkOrder/Q4GD_IMG.ashx"; public final static String Q4GD_IMG = "Q4WorkOrder/Q4GD_IMG.ashx";
} }
Loading…
Cancel
Save