hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8011应急预案登录明文传输高危漏油修复。

Browse Source
master
hwf453 2 years ago
parent b5c39dd289
commit 921fa08caa
22 changed files with 290 additions and 148 deletions
Show Stats Download Patch File Download Diff File

10
app/src/main/java/com/rehome/zhdcoa/Api.java
Unescape Escape View File

@ -628,11 +628,11 @@ public interface Api {
* @param password * @param password
* @return * @return
*/ */
@GET("Authentication/LoginJsonApp") // @GET("Authentication/LoginJsonApp")
Call<UserAuthenticationBean> userAuthenticationLogin( // Call<UserAuthenticationBean> userAuthenticationLogin(
@Query("userid") String userid, // @Query("userid") String userid,
@Query("password") String password // @Query("password") String password
); // );
/** /**
* AI三维可视化安防平台登录接口 * AI三维可视化安防平台登录接口

4
app/src/main/java/com/rehome/zhdcoa/Contans.java
Unescape Escape View File

@ -52,6 +52,8 @@ public class Contans {
public static String REFRESH_LIST_EXAM_DATA= "REFRESH_LIST_EXAM_DATA"; public static String REFRESH_LIST_EXAM_DATA= "REFRESH_LIST_EXAM_DATA";
//考试详情页面刷新数据 //考试详情页面刷新数据
public static String REFRESH_LIST_EXAM_DETAIL_DATA= "REFRESH_LIST_EXAM_DETAIL_DATA"; public static String REFRESH_LIST_EXAM_DETAIL_DATA= "REFRESH_LIST_EXAM_DETAIL_DATA";
//智慧安防平台登录url
public static String ZHAF_LOGIN_URL= "Authentication/LoginJsonAppRsa";
@ -193,7 +195,7 @@ public class Contans {
public static String GETABOUTME_URL = "PubFile/Data/aboutme/aboutme.ashx?manid="; public static String GETABOUTME_URL = "PubFile/Data/aboutme/aboutme.ashx?manid=";
public static String GETABOUTMELIST_URL = "PubFile/Data/aboutme/aboutdetail.ashx?manid="; public static String GETABOUTMELIST_URL = "PubFile/Data/aboutme/aboutdetail.ashx?manid=";
public static String GETATTENDANCECHECK_URL = "PubFile/Data/RGKQ/GetDataZZCX.ashx?manid="; public static String GETATTENDANCECHECK_URL = "PubFile/Data/RGKQ/GetDataZZCX.ashx?manid=";
public static String GETCHECKUPDATAAPK_URL = "ApkUpdate/GetData.aspx"; public static String GETCHECKUPDATAAPK_URL = "ApkUpdate/GetDataRsa.aspx";
public static String GETYZMANDCHECKYZMANDMODIFYMIMA = "PubFile/Data/GetVerificationCode.ashx"; public static String GETYZMANDCHECKYZMANDMODIFYMIMA = "PubFile/Data/GetVerificationCode.ashx";

9
app/src/main/java/com/rehome/zhdcoa/service/PushService.java
Unescape Escape View File

@ -42,6 +42,7 @@ import com.rehome.zhdcoa.ui.activity.AjhXzActivity;
import com.rehome.zhdcoa.ui.activity.AxwaqgcglActivity; import com.rehome.zhdcoa.ui.activity.AxwaqgcglActivity;
import com.rehome.zhdcoa.ui.activity.SxcdjActivity; import com.rehome.zhdcoa.ui.activity.SxcdjActivity;
import com.rehome.zhdcoa.ui.activity.XxzActivity; import com.rehome.zhdcoa.ui.activity.XxzActivity;
import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.NohttpUtils;
import com.rehome.zhdcoa.utils.SPUtils; import com.rehome.zhdcoa.utils.SPUtils;
@ -120,7 +121,11 @@ public class PushService extends IntentService {
dj.add("BZMC", UiUtlis.encoder((String) SPUtils.get(getApplicationContext(), Contans.SCBZBH, "12108080102"))); dj.add("BZMC", UiUtlis.encoder((String) SPUtils.get(getApplicationContext(), Contans.SCBZBH, "12108080102")));
NohttpUtils.getInstance().add(null, 1, dj, callback, false, false, "加载中..."); NohttpUtils.getInstance().add(null, 1, dj, callback, false, false, "加载中...");
Request<String> zy = NoHttp.createStringRequest(Contans.IP + Contans.QXGDZY); String url = Contans.IP + Contans.QXGDZY;
showLog(url);
showLog("11");
Request<String> zy = NoHttp.createStringRequest(url);
NohttpUtils.getInstance().add(null, 11, zy, callback, false, false, ""); NohttpUtils.getInstance().add(null, 11, zy, callback, false, false, "");
break; break;
//安建环 //安建环
@ -269,6 +274,8 @@ public class PushService extends IntentService {
//专业 //专业
case 11: case 11:
ZyInfo zy = GsonToBean(response.get(), ZyInfo.class); ZyInfo zy = GsonToBean(response.get(), ZyInfo.class);
showLog("11");
showLog(GsonUtils.GsonString(zy));
if (zy != null) { if (zy != null) {
if (zy.getRows().size() != 0) { if (zy.getRows().size() != 0) {

8
app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java
Unescape Escape View File

@ -100,7 +100,7 @@ public class Activity_Yjyajx_Action extends BaseActivity {
//token已过期 //token已过期
Log.i("完整的时间和日期： ", "token已过期"); Log.i("完整的时间和日期： ", "token已过期");
if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(Activity_Yjyajx_Action.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -112,7 +112,7 @@ public class Activity_Yjyajx_Action extends BaseActivity {
} }
} else { } else {
if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(Activity_Yjyajx_Action.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -148,7 +148,7 @@ public class Activity_Yjyajx_Action extends BaseActivity {
//token已过期 //token已过期
Log.i("完整的时间和日期： ", "token已过期"); Log.i("完整的时间和日期： ", "token已过期");
if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(Activity_Yjyajx_Action.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -160,7 +160,7 @@ public class Activity_Yjyajx_Action extends BaseActivity {
} }
} else { } else {
if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(Activity_Yjyajx_Action.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java
Unescape Escape View File

@ -433,7 +433,9 @@ public class ApplyLeaveDetailActivity extends BaseActivity {
* 保存请假申请到服务端 * 保存请假申请到服务端
*/ */
private void saveLeaveByServer(String Flow_state) { private void saveLeaveByServer(String Flow_state) {
RequestBody body = RequestBody.create(MediaType.parse("applocation/json"), createJson(Flow_state)); String json = createJson(Flow_state);
showLog(json);
RequestBody body = RequestBody.create(MediaType.parse("applocation/json"),json);
HttpUtils.getApi().saveLeave(body).enqueue(new BaseCallBack<ResultBean>(context) { HttpUtils.getApi().saveLeave(body).enqueue(new BaseCallBack<ResultBean>(context) {
@Override @Override
public void onSuccess(Call<ResultBean> call, Response<ResultBean> response) { public void onSuccess(Call<ResultBean> call, Response<ResultBean> response) {

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java
Unescape Escape View File

@ -152,7 +152,7 @@ public class CbsMemberSelectActivity extends BaseActivity implements CbsMemberSe
Log.i("token是否有效： ", "token已过期"); Log.i("token是否有效： ", "token已过期");
if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(CbsMemberSelectActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -164,7 +164,7 @@ public class CbsMemberSelectActivity extends BaseActivity implements CbsMemberSe
} }
} else { } else {
if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(CbsMemberSelectActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {

7
app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java
Unescape Escape View File

@ -530,15 +530,11 @@ public class DJPXinfoMoreActivity extends BaseActivity {
List<PxinfomoreBean.ResultsBean> resultsBean = bean.getResults(); List<PxinfomoreBean.ResultsBean> resultsBean = bean.getResults();
if (resultsBean != null) { if (resultsBean != null) {
filedataBeans.clear();
for (PxinfomoreBean.ResultsBean resultsbean : resultsBean) { for (PxinfomoreBean.ResultsBean resultsbean : resultsBean) {
filedataBeans.addAll(resultsbean.getFiles()); filedataBeans.addAll(resultsbean.getFiles());
} }
initDHRDialogDatas(); initDHRDialogDatas();
} }
@ -635,6 +631,7 @@ public class DJPXinfoMoreActivity extends BaseActivity {
private void initDHRDialogDatas() { private void initDHRDialogDatas() {
dialogDatas.clear();
for (PxinfomoreBean.ResultsBean.FilesBean dataBean : filedataBeans) { for (PxinfomoreBean.ResultsBean.FilesBean dataBean : filedataBeans) {
dialogDatas.add(dataBean.getKjname()); dialogDatas.add(dataBean.getKjname());
} }

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java
Unescape Escape View File

@ -146,7 +146,7 @@ public class JcyrsqActivity extends BaseActivity {
//token已过期 //token已过期
Log.i("完整的时间和日期： ", "token已过期"); Log.i("完整的时间和日期： ", "token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -158,7 +158,7 @@ public class JcyrsqActivity extends BaseActivity {
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {

20
app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java
Unescape Escape View File

@ -364,7 +364,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
//token已过期 //token已过期
Log.i("token是否有效： ", "token已过期"); Log.i("token是否有效： ", "token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -376,7 +376,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -412,7 +412,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
//token已过期 //token已过期
Log.i("token是否有效： ", "token已过期"); Log.i("token是否有效： ", "token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -424,7 +424,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -460,7 +460,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
//token已过期 //token已过期
Log.i("token是否有效： ", "token已过期"); Log.i("token是否有效： ", "token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -472,7 +472,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -508,7 +508,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
//token已过期 //token已过期
Log.i("token是否有效： ", "token已过期"); Log.i("token是否有效： ", "token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -520,7 +520,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -556,7 +556,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
//token已过期 //token已过期
Log.i("token是否有效： ", "token已过期"); Log.i("token是否有效： ", "token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -568,7 +568,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {

13
app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -170,8 +170,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (BuildConfig.LOG_ERROR) { if (BuildConfig.LOG_ERROR) {
// 管理员 // 管理员
// binding.etUsername.setText("ZHPS_Admin") binding.etUsername.setText("ZHPS_Admin")
// binding.etPassword.setText("Rehome.zhps@996") binding.etPassword.setText("Rehome.zhps@996")
//马 //马
// binding.etUsername.setText("310482") // binding.etUsername.setText("310482")
@ -202,6 +202,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// binding.etUsername.setText("310561") // binding.etUsername.setText("310561")
// binding.etPassword.setText("Yangjing!0561") // binding.etPassword.setText("Yangjing!0561")
// binding.etUsername.setText("310534")
// binding.etPassword.setText("abCd*1234")
// binding.etUsername.setText("310291")
// binding.etPassword.setText("sfd02910291Z+")
} }
@ -387,6 +392,10 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
Contans.ISSCBM, Contans.ISSCBM,
if (userInfo.isScBm == null) "" else userInfo.isScBm if (userInfo.isScBm == null) "" else userInfo.isScBm
) )
showLog("-----------")
showLog(userInfo.bzmc)
showLog(userInfo.token)
// if (userInfo.isScBm == null) { // if (userInfo.isScBm == null) {
// Log.i("app", "userInfo.isScBm is null") // Log.i("app", "userInfo.isScBm is null")
// } else { // } else {

11
app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt
Unescape Escape View File

@ -6,6 +6,7 @@ import android.content.pm.PackageInfo
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.Color import android.graphics.Color
import android.os.Build import android.os.Build
import android.text.TextUtils
import android.util.Log import android.util.Log
import android.view.Gravity import android.view.Gravity
import android.view.KeyEvent import android.view.KeyEvent
@ -365,11 +366,15 @@ class MainActivity : BaseActivityOaToolbarViewBinding<ActivityMainBinding>() {
NohttpUtils.getInstance().addNoProgress(this, 0, request, object : HttpListener<String?> { NohttpUtils.getInstance().addNoProgress(this, 0, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: Response<String?>?) { override fun onSucceed(what: Int, response: Response<String?>?) {
val jsonResult = response?.get() val jsonResult = response?.get()
showLog("----------------->") showLog("---------update app-------->")
showLog(jsonResult) showLog(jsonResult)
if (jsonResult != null) { val jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult)
showLog(jsonDecode)
if (TextUtils.isEmpty(jsonDecode)) {
showLog(UiUtlis.getString(context, R.string.data_error))
} else {
val apkUpdateBean = GsonUtils.GsonToBean( val apkUpdateBean = GsonUtils.GsonToBean(
jsonResult, jsonDecode,
ApkUpdateBean::class.java ApkUpdateBean::class.java
) )
if (apkUpdateBean != null) { if (apkUpdateBean != null) {

9
app/src/main/java/com/rehome/zhdcoa/ui/activity/QxgdFragment.java
Unescape Escape View File

@ -149,15 +149,22 @@ public class QxgdFragment extends BaseFragment {
et_zy.setAdapter(adapter); et_zy.setAdapter(adapter);
int item = -1; int item = -1;
String bzmc = (String)SPUtils.get(context, Contans.BZMC, ""); String bzmc = (String)SPUtils.get(context, Contans.BZMC, "");
if(zys!=null&&zys.size()>0){
for (int i = 0; i < zys.size(); i++) { for (int i = 0; i < zys.size(); i++) {
if (zys.get(i).getXXMS().equals(bzmc)) { Zy zy = zys.get(i);
if(zy!=null&&zy.getXXMS()!=null){
if (zy.getXXMS().equals(bzmc)) {
item = i; item = i;
break; break;
} }
} }
}
if (item != -1) { if (item != -1) {
et_zy.setSelection(item); et_zy.setSelection(item);
} }
}
// et_zy.getSelectedItem(); // et_zy.getSelectedItem();
} }

8
app/src/main/java/com/rehome/zhdcoa/ui/activity/SQxgdlrfActivity.java
Unescape Escape View File

@ -106,15 +106,21 @@ public class SQxgdlrfActivity extends BaseActivity2 {
etZy.setAdapter(adapter); etZy.setAdapter(adapter);
int item = -1; int item = -1;
String bzmc = (String) SPUtils.get(context, Contans.BZMC, ""); String bzmc = (String) SPUtils.get(context, Contans.BZMC, "");
if(zys!=null&&zys.size()>0){
for (int i = 0; i < zys.size(); i++) { for (int i = 0; i < zys.size(); i++) {
if (zys.get(i).getXXMS().equals(bzmc)) { Zy zy = zys.get(i);
if(zy!=null&&zy.getXXMS()!=null){
if (zy.getXXMS().equals(bzmc)) {
item = i; item = i;
break; break;
} }
} }
}
if (item != -1) { if (item != -1) {
etZy.setSelection(item); etZy.setSelection(item);
} }
}
//etZy.getSelectedItem(); //etZy.getSelectedItem();
} }

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java
Unescape Escape View File

@ -276,8 +276,8 @@ public class SdjgzActivity extends BaseActivity2 {
//处理NFC的数据 //处理NFC的数据
@Override @Override
public void handleNfc(String result) { public void handleNfc(String result) {
super.handleNfc(result);
// tvNodata.setText(result); result="AB4E97E6";
if (list.size() != 0) { if (list.size() != 0) {
Intent intent = new Intent(SdjgzActivity.this, SdlbActivity.class); Intent intent = new Intent(SdjgzActivity.this, SdlbActivity.class);
//intent.putExtra("lx",true); //intent.putExtra("lx",true);

32
app/src/main/java/com/rehome/zhdcoa/ui/activity/SisActivity.java
Unescape Escape View File

@ -58,6 +58,10 @@ public class SisActivity extends BaseActivity {
@Override @Override
public void initData() { public void initData() {
Alldatas = new ArrayList<>();
jz1Datas = new ArrayList<>();
jz2Datas = new ArrayList<>();
initToolbar("机组生产实况", "刷新", new View.OnClickListener() { initToolbar("机组生产实况", "刷新", new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -68,15 +72,15 @@ public class SisActivity extends BaseActivity {
} }
}); });
requestData(); requestData();
Alldatas = new ArrayList<>();
jz1Datas = new ArrayList<>();
jz2Datas = new ArrayList<>();
} }
private void requestData() { private void requestData() {
Request<String> request = NoHttp.createStringRequest(Contans.BASE_URL + Contans.sis, RequestMethod.GET); String url = Contans.BASE_URL + Contans.sis;
showLog(url);
Request<String> request = NoHttp.createStringRequest(url, RequestMethod.GET);
NohttpUtils.getInstance().add(this, 0, request, callback, true, true, "加载中..."); NohttpUtils.getInstance().add(this, 0, request, callback, true, true, "加载中...");
} }
@ -91,34 +95,31 @@ public class SisActivity extends BaseActivity {
sttimetext.setText("数据获取时间: (" + nowTime + ") "); sttimetext.setText("数据获取时间: (" + nowTime + ") ");
Sisbean sisbean = GsonUtils.GsonToBean(response.get(), Sisbean.class); Sisbean sisbean = GsonUtils.GsonToBean(response.get(), Sisbean.class);
showLog(GsonUtils.GsonString(sisbean));
if(sisbean!=null&&sisbean.getRows()!=null&&sisbean.getRows().size()>0){
Alldatas.addAll(sisbean.getRows()); Alldatas.addAll(sisbean.getRows());
for (int i = 0; i < sisbean.getRows().size(); i++) { for (int i = 0; i < sisbean.getRows().size(); i++) {
if (sisbean.getRows().get(i).getJzbm().equals("1")) { Sisbean.RowsBean item = sisbean.getRows().get(i);
if(item!=null&&item.getJzbm()!=null){
if (item.getJzbm().equals("1")) {
jz1Datas.add(sisbean.getRows().get(i)); jz1Datas.add(sisbean.getRows().get(i));
} else if (sisbean.getRows().get(i).getJzbm().equals("2")) { } else if (item.getJzbm().equals("2")) {
jz2Datas.add(sisbean.getRows().get(i)); jz2Datas.add(sisbean.getRows().get(i));
} }
} }
}
parseZJ1Data(jz1Datas); parseZJ1Data(jz1Datas);
parseZJ2Data(jz2Datas); parseZJ2Data(jz2Datas);
}
} }
@Override @Override
public void onFailed(int what, Response<String> response) { public void onFailed(int what, Response<String> response) {
} }
}; };
@ -138,7 +139,6 @@ public class SisActivity extends BaseActivity {
private void parseZJ2Data(List<Sisbean.RowsBean> zj2list) { private void parseZJ2Data(List<Sisbean.RowsBean> zj2list) {
Column<String> mLine1 = new Column<>("#2机组", "poitvalue"); Column<String> mLine1 = new Column<>("#2机组", "poitvalue");
TableData<Sisbean.RowsBean> data = new TableData("", zj2list, mLine1); TableData<Sisbean.RowsBean> data = new TableData("", zj2list, mLine1);
tableJz2.setTableData(data); tableJz2.setTableData(data);

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java
Unescape Escape View File

@ -115,7 +115,7 @@ public class WzccCbsSelectItemActivity extends BaseActivity {
//token已过期 //token已过期
Log.i("完整的时间和日期： ", "token已过期"); Log.i("完整的时间和日期： ", "token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(WzccCbsSelectItemActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -127,7 +127,7 @@ public class WzccCbsSelectItemActivity extends BaseActivity {
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(WzccCbsSelectItemActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java
Unescape Escape View File

@ -120,7 +120,7 @@ public class WzccFhqSelectItemActivity extends BaseActivity {
//token已过期 //token已过期
Log.i("完整的时间和日期： ", "token已过期"); Log.i("完整的时间和日期： ", "token已过期");
if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(WzccFhqSelectItemActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -132,7 +132,7 @@ public class WzccFhqSelectItemActivity extends BaseActivity {
} }
} else { } else {
if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(WzccFhqSelectItemActivity.this, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/YulActivity.java
Unescape Escape View File

@ -11,6 +11,8 @@ import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.adapter.DlbAdapter; import com.rehome.zhdcoa.adapter.DlbAdapter;
import com.rehome.zhdcoa.base.BaseActivity2; import com.rehome.zhdcoa.base.BaseActivity2;
import com.rehome.zhdcoa.entity.DlbInfo; import com.rehome.zhdcoa.entity.DlbInfo;
import com.rehome.zhdcoa.utils.GsonUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -49,6 +51,8 @@ public class YulActivity extends BaseActivity2 {
djjhs = bundle.getParcelableArrayList(Contans.KEY_DJJHRWQY); djjhs = bundle.getParcelableArrayList(Contans.KEY_DJJHRWQY);
item = bundle.getInt(Contans.KEY_ITEM); item = bundle.getInt(Contans.KEY_ITEM);
showLog(GsonUtils.GsonString(djjhs));
headView = View.inflate(context, R.layout.dlb_item, null); headView = View.inflate(context, R.layout.dlb_item, null);
headView.findViewById(R.id.head).setVisibility(View.VISIBLE); headView.findViewById(R.id.head).setVisibility(View.VISIBLE);
setListAdapter(); setListAdapter();

73
app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaCFragment.java
Unescape Escape View File

@ -10,6 +10,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView;
import com.rehome.zhdcoa.App; import com.rehome.zhdcoa.App;
import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.Contans;
@ -42,8 +43,9 @@ import retrofit2.Response;
public class YjyaCFragment extends BaseFragment { public class YjyaCFragment extends BaseFragment {
ListView lv; ListView lv;
TextView tv_nodata;
private List<YjyaItemBean> rowsBeanList; private List<YjyaItemBean> rowsBeanList = new ArrayList<YjyaItemBean>();;
public YjyaBaseAdapter adapter; public YjyaBaseAdapter adapter;
public String stime = ""; public String stime = "";
public String etime = ""; public String etime = "";
@ -60,6 +62,9 @@ public class YjyaCFragment extends BaseFragment {
@Override @Override
protected void initView() { protected void initView() {
lv = view.findViewById(R.id.lv); lv = view.findViewById(R.id.lv);
tv_nodata = view.findViewById(R.id.tv_nodata);
tv_nodata.setVisibility(View.VISIBLE);
lv.setVisibility(View.GONE);
//人员组织结构模块 用户验证接口 //人员组织结构模块 用户验证接口
userName = App.getInstance().getUserInfo().getManid(); userName = App.getInstance().getUserInfo().getManid();
@ -69,6 +74,23 @@ public class YjyaCFragment extends BaseFragment {
showLog("Contans.SP.AF_PASS_WORD"); showLog("Contans.SP.AF_PASS_WORD");
showLog(password); showLog(password);
} }
adapter = new YjyaBaseAdapter(context, rowsBeanList);
lv.setAdapter(adapter);
lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
YjyaItemBean bean = rowsBeanList.get(position);
Log.i("bean", GsonUtils.GsonString(bean));
Intent intent = new Intent(getActivity(), Activity_Yjyajx_Action.class);
intent.putExtra("jlid", bean.getID());
intent.putExtra("zstype", "1");
intent.putExtra("state", "0");
intent.putExtra("title", "应急处理执行");
startActivity(intent);
}
});
} }
public void reloadData() { public void reloadData() {
@ -100,7 +122,7 @@ public class YjyaCFragment extends BaseFragment {
//token已过期 //token已过期
showLog("完整的时间和日期： " + "token已过期"); showLog("完整的时间和日期： " + "token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(mActivity, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -112,7 +134,7 @@ public class YjyaCFragment extends BaseFragment {
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(mActivity, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -139,16 +161,19 @@ public class YjyaCFragment extends BaseFragment {
if (bean != null) { if (bean != null) {
if (bean.getTotal().equals("0")) { if (bean.getTotal().equals("0")) {
//showToast("暂无数据"); tv_nodata.setVisibility(View.VISIBLE);
rowsBeanList = new ArrayList<YjyaItemBean>(); lv.setVisibility(View.GONE);
setAdapter(); adapter.notifyDataSetChanged();
} else { } else {
tv_nodata.setVisibility(View.GONE);
lv.setVisibility(View.VISIBLE);
rowsBeanList = bean.getData(); rowsBeanList = bean.getData();
setAdapter(); adapter.notifyDataSetChanged();
} }
}else{ }else{
rowsBeanList = new ArrayList<YjyaItemBean>(); tv_nodata.setVisibility(View.VISIBLE);
setAdapter(); lv.setVisibility(View.GONE);
adapter.notifyDataSetChanged();
} }
} }
@ -158,28 +183,14 @@ public class YjyaCFragment extends BaseFragment {
}); });
} }
private void setAdapter() { // private void setAdapter() {
//
if (adapter == null) { // if (adapter == null) {
adapter = new YjyaBaseAdapter(context, rowsBeanList); //
lv.setAdapter(adapter); // } else {
lv.setOnItemClickListener(new AdapterView.OnItemClickListener() { // adapter.setNewData(rowsBeanList);
@Override // }
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { // }
YjyaItemBean bean = rowsBeanList.get(position);
Log.i("bean", GsonUtils.GsonString(bean));
Intent intent = new Intent(getActivity(), Activity_Yjyajx_Action.class);
intent.putExtra("jlid", bean.getID());
intent.putExtra("zstype", "1");
intent.putExtra("state", "0");
intent.putExtra("title", "应急处理执行");
startActivity(intent);
}
});
} else {
adapter.setNewData(rowsBeanList);
}
}
@Override @Override
public int getLayoutId() { public int getLayoutId() {

4
app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaDFragment.java
Unescape Escape View File

@ -102,7 +102,7 @@ public class YjyaDFragment extends BaseFragment {
//token已过期 //token已过期
showLog("完整的时间和日期： "+"token已过期"); showLog("完整的时间和日期： "+"token已过期");
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(mActivity, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {
@ -114,7 +114,7 @@ public class YjyaDFragment extends BaseFragment {
} }
} else { } else {
if (userName.equals("") == false && password.equals("") == false) { if (userName.equals("") == false && password.equals("") == false) {
AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { AuthenticationLoginUtils.authenticationLogin(mActivity, userName, password, new OnAuthenticationLoginListener() {
@Override @Override
public void onAuthenticationSuccess(boolean result, String token) { public void onAuthenticationSuccess(boolean result, String token) {
if (result) { if (result) {

104
app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginUtils.java
Unescape Escape View File

@ -1,14 +1,18 @@
package com.rehome.zhdcoa.utils; package com.rehome.zhdcoa.utils;
import android.content.Context; import static com.luck.picture.lib.utils.ToastUtils.showToast;
import android.app.Activity;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Base64;
import android.util.Log; import android.util.Log;
import com.rehome.zhdcoa.BuildConfig; import com.rehome.zhdcoa.BuildConfig;
import com.rehome.zhdcoa.Contans; import com.rehome.zhdcoa.Contans;
import com.rehome.zhdcoa.base.BaseCallBack; import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.bean.UserAuthenticationBean; import com.rehome.zhdcoa.bean.UserAuthenticationBean;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
@ -22,23 +26,58 @@ public class AuthenticationLoginUtils {
* @param password 密码 * @param password 密码
* @param listener 监听回调 * @param listener 监听回调
*/ */
public static void authenticationLogin(Context context, String username, String password, OnAuthenticationLoginListener listener) { public static void authenticationLogin(Activity context, String username, String password, OnAuthenticationLoginListener listener) {
Map params = new HashMap<String, String>(); Map params = new HashMap<String, String>();
String base64Password = Base64.encodeToString(password.getBytes(), Base64.DEFAULT); //String base64Password = Base64.encodeToString(password.getBytes(), Base64.DEFAULT);
params.put("userid",username); params.put("userid",username);
params.put("password",base64Password); params.put("password",password);
String json = GsonUtils.GsonString(params); String json = GsonUtils.GsonString(params);
showLog("----------authenticationLogin------------");
showLog(json); showLog(json);
showLog(base64Password); //showLog(base64Password);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH：mm：ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH：mm：ss");
HttpUtils.getCompanyServerApi().userAuthenticationLogin(username,base64Password).enqueue(new BaseCallBack<UserAuthenticationBean>(context) { String jsonEncrypt = RSAUtils.encryptBASE64Str(json);
// String jsonDecode1 = RSAUtils.decryptBASE64StrClient("TLSdKxn3slvDpUd3RwXLOviOvltXjIVZjexSy36KLEPkg+saF5yjZf79b1lvHzOHwlnwl9gyizhuAS1jS3Nz3iYkZbo4+JZGk/u4b92Pm9SepUg+61ehfJT6TS9FnIaAzny8nHYEmXePFuejNweXYnGwz2YXuQ9n6REuOx/M5QR5WEyO3W71FarywpZqRkp3gd5QmO97aNfPBXj8M7PGzwosKEX2qHV2q0rMEXhnWIgFlAimHuy4mOmc85LLXfX4nBP+M4j93sVfSufFhAB5i//5E3Q3uBvi0g9KV21kt6e8kQE95umsu3s/glKgx7VtOwSSHMC3fpASftTgGz4GgzGroNaOBVljYYRsXkI2IGwnWSlaTHVZcySK9bLXEh2zURZbW4Vl6tavf0lS76cgtNk7Ptg0LSj7/qMW/Ak4SYzYxVtxrrmImHUnIF2Zhyx415RqgrYdVQSH7DkjTo0O4a1kwBrmPgZiiC9/3Kk2Vleb1rv7ZRiRAboWJeQGz4LA2vcJTyo0bObCPRy59/vNAe4BYjK5IaUgsKXnpfg1LzVCJQeSTtdEu5F32n3ZudZXqLa8Fv8McxKqQbGpTlbciSp3kSP9pe28VQ85tmnSYix9pYZaYrEnZVwsIi19XKa49LcurfEA6YQZ4hWGnX8pQxOlJcq3obF59/TlmMzRarY=");
// showLog(jsonDecode1);
//
// UserAuthenticationBean bean = GsonUtils.GsonToBean(jsonDecode1,UserAuthenticationBean.class);
// showLog(GsonUtils.GsonString(bean));
// if (bean != null) {
// showLog("success");
// showLog(GsonUtils.GsonString(bean));
// }else{
// showLog("fail");
// }
showLog(jsonEncrypt);
final Request<String> request = NoHttp.createStringRequest(Contans.BASE_URL_COMPANY_SERVER + Contans.ZHAF_LOGIN_URL, RequestMethod.POST);
// request.setDefineRequestBodyForJson("\""+jsonEncrypt+"\"");
request.setDefineRequestBodyForJson(jsonEncrypt);
NohttpUtils.getInstance().add(context, 0, request, new HttpListener<String>() {
@Override @Override
public void onSuccess(retrofit2.Call<UserAuthenticationBean> call, retrofit2.Response<UserAuthenticationBean> response) { public void onSucceed(int what, Response<String> response) {
UserAuthenticationBean bean = response.body(); String jsonResult = response.get();
//Log.i("bean:",GsonUtils.GsonString(bean));
showLog("----------onSucceed------------");
showLog(jsonResult);
String jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult);
//String jsonDecode = RSAUtils.decryptBASE64StrClient("ddDHqrKCDOV3XhuiCrTWoksKWc+oh4np6BjS+ETBBa9E07GGUPCjYcuHSPIengyUntr/xz/iKcY93FiF/J+tqvmjtX6vI2OkrRYb79FHPqBdjCAwFz4GO/dRRgmjA9w2y7JL501oArG8Be+rekrNpf2Zr+yxAK9/fR6biDPd9ATsy8E5fOhurJKFYTJnCof+Y5WeP1nijy36K55EUGT5XMbzY92z/f8sXuTe3J3xPsJYNE6taM37op2ErI65dfO9CkIU3q7gxyQFjkz7iQrn6OrEySWtKBFwwvcDUv6VcrFs7vve7jXUkjlSfIN02XXYVBXdFi/mbKuUZVz69UmIxmlL/7yeKyQaiG2dEKCthzhx48F3g/jPRGmdIUJjnw4wdL2fHaDinXJyBGkv+LRKUg77SNzny20qBlyoxhZSO4IUJEbuctQzDt672lBFtfQH8dWgOYC++wfiT8l6hyCfkEFP2MzCBWta1a5UTRDv1gA39Axji7xhR8e+qwNo8QtgYqzI9rusc/g8aRpUDLEeCUVa8xLl2u55n33XR6ZuKRBB8/5ti8cxny4lEIp4kDeyNtgxsDz2HK6rZa8T7541tF/o9g/eKGexppi+8AtIAzC/MJ8cLj55KzCyHvW5IjWb6E9ipLqyqHbDE32K/OlRTM1cuSjod9y00uRy2FqYnbU=");
showLog(jsonDecode);
if (TextUtils.isEmpty(jsonDecode)) {
showLog(UiUtlis.getString(context, R.string.data_error));
} else {
UserAuthenticationBean bean = GsonUtils.GsonToBean(jsonDecode,UserAuthenticationBean.class);
showLog(GsonUtils.GsonString(bean));
if (bean != null) { if (bean != null) {
if (bean.isResult()) {//登录成功 if (bean.isResult()) {
//登录成功
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
int hours = 0; int hours = 0;
if(bean.getData().getExpires()>3600){ if(bean.getData().getExpires()>3600){
@ -58,14 +97,51 @@ public class AuthenticationLoginUtils {
} }
} }
} }
}
@Override @Override
public void onError(retrofit2.Call<UserAuthenticationBean> call, Throwable t) { public void onFailed(int what, Response<String> response) {
SPUtils.put(context, Contans.AUTHENTICATIONLOGINTOKEN, ""); SPUtils.put(context, Contans.AUTHENTICATIONLOGINTOKEN, "");
SPUtils.put(context, Contans.AUTHENTICATIONLOGINNEXTDATE, Calendar.getInstance().getTimeInMillis()); SPUtils.put(context, Contans.AUTHENTICATIONLOGINNEXTDATE, Calendar.getInstance().getTimeInMillis());
listener.onAuthenticationSuccess(false,""); listener.onAuthenticationSuccess(false,"");
} }
}); });
// HttpUtils.getCompanyServerApi().userAuthenticationLogin(username,base64Password).enqueue(new BaseCallBack<UserAuthenticationBean>(context) {
// @Override
// public void onSuccess(retrofit2.Call<UserAuthenticationBean> call, retrofit2.Response<UserAuthenticationBean> response) {
// UserAuthenticationBean bean = response.body();
// //Log.i("bean:",GsonUtils.GsonString(bean));
// if (bean != null) {
// if (bean.isResult()) {//登录成功
// Calendar calendar = Calendar.getInstance();
// int hours = 0;
// if(bean.getData().getExpires()>3600){
// hours= (bean.getData().getExpires()/3600);
// calendar.add(Calendar.HOUR_OF_DAY, +hours);
// }else{
// hours= (bean.getData().getExpires()/60);
// calendar.add(Calendar.MINUTE, +hours);
// }
// SPUtils.put(context, Contans.AUTHENTICATIONLOGINTOKEN, bean.getData().getToken());
// SPUtils.put(context, Contans.AUTHENTICATIONLOGINNEXTDATE, calendar.getTimeInMillis());
// listener.onAuthenticationSuccess(true,bean.getData().getToken());
// } else {
// SPUtils.put(context, Contans.AUTHENTICATIONLOGINTOKEN, "");
// SPUtils.put(context, Contans.AUTHENTICATIONLOGINNEXTDATE, Calendar.getInstance().getTimeInMillis());
// listener.onAuthenticationSuccess(false,"");
// }
// }
// }
//
// @Override
// public void onError(retrofit2.Call<UserAuthenticationBean> call, Throwable t) {
// SPUtils.put(context, Contans.AUTHENTICATIONLOGINTOKEN, "");
// SPUtils.put(context, Contans.AUTHENTICATIONLOGINNEXTDATE, Calendar.getInstance().getTimeInMillis());
// listener.onAuthenticationSuccess(false,"");
// }
// });
} }
public static void showLog(String logText) { public static void showLog(String logText) {
if (BuildConfig.LOG_ERROR) { if (BuildConfig.LOG_ERROR) {

16
app/src/main/res/layout/fragment_yjyac.xml
Unescape Escape View File

@ -4,6 +4,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<ListView <ListView
android:id="@+id/lv" android:id="@+id/lv"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -11,6 +16,17 @@
android:divider="@color/gray" android:divider="@color/gray"
android:dividerHeight="1px" /> android:dividerHeight="1px" />
<TextView
android:id="@+id/tv_nodata"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="暂无数据" />
</FrameLayout>
</LinearLayout> </LinearLayout>
Write Preview
Loading…
Cancel
Save