diff --git a/app/src/main/java/com/rehome/zhdcoa/Api.java b/app/src/main/java/com/rehome/zhdcoa/Api.java index c514278..893a5c8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Api.java +++ b/app/src/main/java/com/rehome/zhdcoa/Api.java @@ -628,11 +628,11 @@ public interface Api { * @param password * @return */ - @GET("Authentication/LoginJsonApp") - Call userAuthenticationLogin( - @Query("userid") String userid, - @Query("password") String password - ); +// @GET("Authentication/LoginJsonApp") +// Call userAuthenticationLogin( +// @Query("userid") String userid, +// @Query("password") String password +// ); /** * AI三维可视化安防平台登录接口 diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index 93c3f97..7528109 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -52,6 +52,8 @@ public class Contans { public static String REFRESH_LIST_EXAM_DATA= "REFRESH_LIST_EXAM_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 GETABOUTMELIST_URL = "PubFile/Data/aboutme/aboutdetail.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"; diff --git a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java index ae8c2c1..5e548bd 100755 --- a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java +++ b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java @@ -42,6 +42,7 @@ import com.rehome.zhdcoa.ui.activity.AjhXzActivity; import com.rehome.zhdcoa.ui.activity.AxwaqgcglActivity; import com.rehome.zhdcoa.ui.activity.SxcdjActivity; import com.rehome.zhdcoa.ui.activity.XxzActivity; +import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.NohttpUtils; 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"))); NohttpUtils.getInstance().add(null, 1, dj, callback, false, false, "加载中..."); - Request zy = NoHttp.createStringRequest(Contans.IP + Contans.QXGDZY); + String url = Contans.IP + Contans.QXGDZY; + showLog(url); + showLog("11"); + Request zy = NoHttp.createStringRequest(url); + NohttpUtils.getInstance().add(null, 11, zy, callback, false, false, ""); break; //安建环 @@ -269,6 +274,8 @@ public class PushService extends IntentService { //专业 case 11: ZyInfo zy = GsonToBean(response.get(), ZyInfo.class); + showLog("11"); + showLog(GsonUtils.GsonString(zy)); if (zy != null) { if (zy.getRows().size() != 0) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java index 1cf1309..c6cf7d9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Activity_Yjyajx_Action.java @@ -100,7 +100,7 @@ public class Activity_Yjyajx_Action extends BaseActivity { //token已过期 Log.i("完整的时间和日期： ", "token已过期"); 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 public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -112,7 +112,7 @@ public class Activity_Yjyajx_Action extends BaseActivity { } } else { 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 public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -148,7 +148,7 @@ public class Activity_Yjyajx_Action extends BaseActivity { //token已过期 Log.i("完整的时间和日期： ", "token已过期"); 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 public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -160,7 +160,7 @@ public class Activity_Yjyajx_Action extends BaseActivity { } } else { 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 public void onAuthenticationSuccess(boolean result, String token) { if (result) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java index 399c2d6..668f1a8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveDetailActivity.java @@ -433,7 +433,9 @@ public class ApplyLeaveDetailActivity extends BaseActivity { * 保存请假申请到服务端 */ 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(context) { @Override public void onSuccess(Call call, Response response) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java index c33c128..706fc89 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/CbsMemberSelectActivity.java @@ -152,7 +152,7 @@ public class CbsMemberSelectActivity extends BaseActivity implements CbsMemberSe Log.i("token是否有效： ", "token已过期"); if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(CbsMemberSelectActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -164,7 +164,7 @@ public class CbsMemberSelectActivity extends BaseActivity implements CbsMemberSe } } else { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(CbsMemberSelectActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java index de6809e..0a80546 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DJPXinfoMoreActivity.java @@ -530,15 +530,11 @@ public class DJPXinfoMoreActivity extends BaseActivity { List resultsBean = bean.getResults(); if (resultsBean != null) { - - + filedataBeans.clear(); for (PxinfomoreBean.ResultsBean resultsbean : resultsBean) { - filedataBeans.addAll(resultsbean.getFiles()); } - initDHRDialogDatas(); - } @@ -635,6 +631,7 @@ public class DJPXinfoMoreActivity extends BaseActivity { private void initDHRDialogDatas() { + dialogDatas.clear(); for (PxinfomoreBean.ResultsBean.FilesBean dataBean : filedataBeans) { dialogDatas.add(dataBean.getKjname()); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java index b3d9527..798e8b0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqActivity.java @@ -146,7 +146,7 @@ public class JcyrsqActivity extends BaseActivity { //token已过期 Log.i("完整的时间和日期： ", "token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -158,7 +158,7 @@ public class JcyrsqActivity extends BaseActivity { } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java index 8a9c807..4d89665 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/JcyrsqAddActivity.java @@ -364,7 +364,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe //token已过期 Log.i("token是否有效： ", "token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -376,7 +376,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -412,7 +412,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe //token已过期 Log.i("token是否有效： ", "token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -424,7 +424,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -460,7 +460,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe //token已过期 Log.i("token是否有效： ", "token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -472,7 +472,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -508,7 +508,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe //token已过期 Log.i("token是否有效： ", "token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -520,7 +520,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -556,7 +556,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe //token已过期 Log.i("token是否有效： ", "token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -568,7 +568,7 @@ public class JcyrsqAddActivity extends BaseActivity implements View.OnClickListe } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(JcyrsqAddActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index 30b7c54..ca0973f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -170,8 +170,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (BuildConfig.LOG_ERROR) { // 管理员 -// binding.etUsername.setText("ZHPS_Admin") -// binding.etPassword.setText("Rehome.zhps@996") + binding.etUsername.setText("ZHPS_Admin") + binding.etPassword.setText("Rehome.zhps@996") //马 // binding.etUsername.setText("310482") @@ -202,6 +202,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etUsername.setText("310561") // 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() { Contans.ISSCBM, if (userInfo.isScBm == null) "" else userInfo.isScBm ) + + showLog("-----------") + showLog(userInfo.bzmc) + showLog(userInfo.token) // if (userInfo.isScBm == null) { // Log.i("app", "userInfo.isScBm is null") // } else { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt index e056233..c341ca9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt @@ -6,6 +6,7 @@ import android.content.pm.PackageInfo import android.content.pm.PackageManager import android.graphics.Color import android.os.Build +import android.text.TextUtils import android.util.Log import android.view.Gravity import android.view.KeyEvent @@ -204,7 +205,7 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { //获取我的条数显示 val url = Contans.BASE_URL + Contans.GETABOUTME_URL + App.getInstance().userInfo.manid val request = NoHttp.createStringRequest(url, RequestMethod.GET) - NohttpUtils.getInstance().addNoProgress(this,0, request, object : HttpListener { + NohttpUtils.getInstance().addNoProgress(this, 0, request, object : HttpListener { override fun onSucceed(what: Int, response: Response?) { Log.i("app", "----------------") val jsonResult = response?.get() @@ -312,7 +313,7 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { .component!!.className intent.putExtra("className", launchClassName) intent.putExtra("notificationNum", number) - LocalBroadcastManager.getInstance( context ).sendBroadcast(intent) + LocalBroadcastManager.getInstance(context).sendBroadcast(intent) } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -362,14 +363,18 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { private fun checkUpdateApk() { val url = Contans.BASE_URL + Contans.GETCHECKUPDATAAPK_URL val request = NoHttp.createStringRequest(url, RequestMethod.GET) - NohttpUtils.getInstance().addNoProgress(this,0, request, object : HttpListener { + NohttpUtils.getInstance().addNoProgress(this, 0, request, object : HttpListener { override fun onSucceed(what: Int, response: Response?) { val jsonResult = response?.get() - showLog("----------------->") + showLog("---------update app-------->") 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( - jsonResult, + jsonDecode, ApkUpdateBean::class.java ) if (apkUpdateBean != null) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/QxgdFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/QxgdFragment.java index 6cf9d02..9880386 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/QxgdFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/QxgdFragment.java @@ -149,15 +149,22 @@ public class QxgdFragment extends BaseFragment { et_zy.setAdapter(adapter); int item = -1; String bzmc = (String)SPUtils.get(context, Contans.BZMC, ""); - for (int i = 0; i < zys.size(); i++) { - if (zys.get(i).getXXMS().equals(bzmc)) { - item = i; - break; + + if(zys!=null&&zys.size()>0){ + for (int i = 0; i < zys.size(); i++) { + Zy zy = zys.get(i); + if(zy!=null&&zy.getXXMS()!=null){ + if (zy.getXXMS().equals(bzmc)) { + item = i; + break; + } + } + } + if (item != -1) { + et_zy.setSelection(item); } } - if (item != -1) { - et_zy.setSelection(item); - } + // et_zy.getSelectedItem(); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SQxgdlrfActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SQxgdlrfActivity.java index e7b6034..7e989a9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SQxgdlrfActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SQxgdlrfActivity.java @@ -106,15 +106,21 @@ public class SQxgdlrfActivity extends BaseActivity2 { etZy.setAdapter(adapter); int item = -1; String bzmc = (String) SPUtils.get(context, Contans.BZMC, ""); - for (int i = 0; i < zys.size(); i++) { - if (zys.get(i).getXXMS().equals(bzmc)) { - item = i; - break; + if(zys!=null&&zys.size()>0){ + for (int i = 0; i < zys.size(); i++) { + Zy zy = zys.get(i); + if(zy!=null&&zy.getXXMS()!=null){ + if (zy.getXXMS().equals(bzmc)) { + item = i; + break; + } + } + } + if (item != -1) { + etZy.setSelection(item); } } - if (item != -1) { - etZy.setSelection(item); - } + //etZy.getSelectedItem(); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java index 95d1109..2c6238b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java @@ -276,8 +276,8 @@ public class SdjgzActivity extends BaseActivity2 { //处理NFC的数据 @Override public void handleNfc(String result) { - super.handleNfc(result); -// tvNodata.setText(result); + + result="AB4E97E6"; if (list.size() != 0) { Intent intent = new Intent(SdjgzActivity.this, SdlbActivity.class); //intent.putExtra("lx",true); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SisActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SisActivity.java index e6fbb27..1da071e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SisActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SisActivity.java @@ -58,6 +58,10 @@ public class SisActivity extends BaseActivity { @Override public void initData() { + Alldatas = new ArrayList<>(); + jz1Datas = new ArrayList<>(); + jz2Datas = new ArrayList<>(); + initToolbar("机组生产实况", "刷新", new View.OnClickListener() { @Override public void onClick(View v) { @@ -68,15 +72,15 @@ public class SisActivity extends BaseActivity { } }); requestData(); - Alldatas = new ArrayList<>(); - jz1Datas = new ArrayList<>(); - jz2Datas = new ArrayList<>(); + } private void requestData() { - Request request = NoHttp.createStringRequest(Contans.BASE_URL + Contans.sis, RequestMethod.GET); + String url = Contans.BASE_URL + Contans.sis; + showLog(url); + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); NohttpUtils.getInstance().add(this, 0, request, callback, true, true, "加载中..."); } @@ -91,34 +95,31 @@ public class SisActivity extends BaseActivity { sttimetext.setText("数据获取时间: (" + nowTime + ") "); Sisbean sisbean = GsonUtils.GsonToBean(response.get(), Sisbean.class); + showLog(GsonUtils.GsonString(sisbean)); - Alldatas.addAll(sisbean.getRows()); - - for (int i = 0; i < sisbean.getRows().size(); i++) { + if(sisbean!=null&&sisbean.getRows()!=null&&sisbean.getRows().size()>0){ + Alldatas.addAll(sisbean.getRows()); + for (int i = 0; i < sisbean.getRows().size(); i++) { - if (sisbean.getRows().get(i).getJzbm().equals("1")) { - - jz1Datas.add(sisbean.getRows().get(i)); - - } else if (sisbean.getRows().get(i).getJzbm().equals("2")) { - - jz2Datas.add(sisbean.getRows().get(i)); + Sisbean.RowsBean item = sisbean.getRows().get(i); + if(item!=null&&item.getJzbm()!=null){ + if (item.getJzbm().equals("1")) { + jz1Datas.add(sisbean.getRows().get(i)); + } else if (item.getJzbm().equals("2")) { + jz2Datas.add(sisbean.getRows().get(i)); + } + } } - + parseZJ1Data(jz1Datas); + parseZJ2Data(jz2Datas); } - - parseZJ1Data(jz1Datas); - parseZJ2Data(jz2Datas); - } @Override public void onFailed(int what, Response response) { } - - }; @@ -138,7 +139,6 @@ public class SisActivity extends BaseActivity { private void parseZJ2Data(List zj2list) { - Column mLine1 = new Column<>("#2机组", "poitvalue"); TableData data = new TableData("", zj2list, mLine1); tableJz2.setTableData(data); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java index 8d8d906..074646a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccCbsSelectItemActivity.java @@ -115,7 +115,7 @@ public class WzccCbsSelectItemActivity extends BaseActivity { //token已过期 Log.i("完整的时间和日期： ", "token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(WzccCbsSelectItemActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -127,7 +127,7 @@ public class WzccCbsSelectItemActivity extends BaseActivity { } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(WzccCbsSelectItemActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java index a8c90ac..b841124 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WzccFhqSelectItemActivity.java @@ -120,7 +120,7 @@ public class WzccFhqSelectItemActivity extends BaseActivity { //token已过期 Log.i("完整的时间和日期： ", "token已过期"); if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(WzccFhqSelectItemActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -132,7 +132,7 @@ public class WzccFhqSelectItemActivity extends BaseActivity { } } else { if ((!TextUtils.isEmpty(userName)) && (!TextUtils.isEmpty(password))) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(WzccFhqSelectItemActivity.this, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YulActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YulActivity.java index 4fd85bd..ad9ff72 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YulActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YulActivity.java @@ -11,6 +11,8 @@ import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.adapter.DlbAdapter; import com.rehome.zhdcoa.base.BaseActivity2; import com.rehome.zhdcoa.entity.DlbInfo; +import com.rehome.zhdcoa.utils.GsonUtils; + import java.util.ArrayList; import java.util.List; @@ -49,6 +51,8 @@ public class YulActivity extends BaseActivity2 { djjhs = bundle.getParcelableArrayList(Contans.KEY_DJJHRWQY); item = bundle.getInt(Contans.KEY_ITEM); + showLog(GsonUtils.GsonString(djjhs)); + headView = View.inflate(context, R.layout.dlb_item, null); headView.findViewById(R.id.head).setVisibility(View.VISIBLE); setListAdapter(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaCFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaCFragment.java index d0f8fbf..539f09b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaCFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaCFragment.java @@ -10,6 +10,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ListView; +import android.widget.TextView; import com.rehome.zhdcoa.App; import com.rehome.zhdcoa.Contans; @@ -42,8 +43,9 @@ import retrofit2.Response; public class YjyaCFragment extends BaseFragment { ListView lv; + TextView tv_nodata; - private List rowsBeanList; + private List rowsBeanList = new ArrayList();; public YjyaBaseAdapter adapter; public String stime = ""; public String etime = ""; @@ -60,6 +62,9 @@ public class YjyaCFragment extends BaseFragment { @Override protected void initView() { 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(); @@ -69,6 +74,23 @@ public class YjyaCFragment extends BaseFragment { showLog("Contans.SP.AF_PASS_WORD"); 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() { @@ -100,7 +122,7 @@ public class YjyaCFragment extends BaseFragment { //token已过期 showLog("完整的时间和日期： " + "token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(mActivity, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -112,7 +134,7 @@ public class YjyaCFragment extends BaseFragment { } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(mActivity, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -139,16 +161,19 @@ public class YjyaCFragment extends BaseFragment { if (bean != null) { if (bean.getTotal().equals("0")) { - //showToast("暂无数据"); - rowsBeanList = new ArrayList(); - setAdapter(); + tv_nodata.setVisibility(View.VISIBLE); + lv.setVisibility(View.GONE); + adapter.notifyDataSetChanged(); } else { + tv_nodata.setVisibility(View.GONE); + lv.setVisibility(View.VISIBLE); rowsBeanList = bean.getData(); - setAdapter(); + adapter.notifyDataSetChanged(); } }else{ - rowsBeanList = new ArrayList(); - setAdapter(); + tv_nodata.setVisibility(View.VISIBLE); + lv.setVisibility(View.GONE); + adapter.notifyDataSetChanged(); } } @@ -158,28 +183,14 @@ public class YjyaCFragment extends BaseFragment { }); } - private void setAdapter() { - - if (adapter == null) { - 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); - } - }); - } else { - adapter.setNewData(rowsBeanList); - } - } +// private void setAdapter() { +// +// if (adapter == null) { +// +// } else { +// adapter.setNewData(rowsBeanList); +// } +// } @Override public int getLayoutId() { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaDFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaDFragment.java index 46c789f..0f5863e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaDFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/YjyaDFragment.java @@ -102,7 +102,7 @@ public class YjyaDFragment extends BaseFragment { //token已过期 showLog("完整的时间和日期： "+"token已过期"); if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(mActivity, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { @@ -114,7 +114,7 @@ public class YjyaDFragment extends BaseFragment { } } else { if (userName.equals("") == false && password.equals("") == false) { - AuthenticationLoginUtils.authenticationLogin(context, userName, password, new OnAuthenticationLoginListener() { + AuthenticationLoginUtils.authenticationLogin(mActivity, userName, password, new OnAuthenticationLoginListener() { @Override public void onAuthenticationSuccess(boolean result, String token) { if (result) { diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginUtils.java index 94689ba..2338d01 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginUtils.java @@ -1,14 +1,18 @@ 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.util.Base64; import android.util.Log; - import com.rehome.zhdcoa.BuildConfig; import com.rehome.zhdcoa.Contans; -import com.rehome.zhdcoa.base.BaseCallBack; +import com.rehome.zhdcoa.R; 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.util.Calendar; @@ -22,50 +26,122 @@ public class AuthenticationLoginUtils { * @param password 密码 * @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 base64Password = Base64.encodeToString(password.getBytes(), Base64.DEFAULT); + //String base64Password = Base64.encodeToString(password.getBytes(), Base64.DEFAULT); params.put("userid",username); - params.put("password",base64Password); + params.put("password",password); String json = GsonUtils.GsonString(params); + showLog("----------authenticationLogin------------"); showLog(json); - showLog(base64Password); + //showLog(base64Password); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH：mm：ss"); - HttpUtils.getCompanyServerApi().userAuthenticationLogin(username,base64Password).enqueue(new BaseCallBack(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 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() { + @Override - public void onSuccess(retrofit2.Call call, retrofit2.Response 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); + public void onSucceed(int what, Response response) { + String jsonResult = response.get(); + + 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.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,""); } - 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 call, Throwable t) { + public void onFailed(int what, Response response) { SPUtils.put(context, Contans.AUTHENTICATIONLOGINTOKEN, ""); SPUtils.put(context, Contans.AUTHENTICATIONLOGINNEXTDATE, Calendar.getInstance().getTimeInMillis()); listener.onAuthenticationSuccess(false,""); } + }); + +// HttpUtils.getCompanyServerApi().userAuthenticationLogin(username,base64Password).enqueue(new BaseCallBack(context) { +// @Override +// public void onSuccess(retrofit2.Call call, retrofit2.Response 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 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) { if (BuildConfig.LOG_ERROR) { diff --git a/app/src/main/res/layout/fragment_yjyac.xml b/app/src/main/res/layout/fragment_yjyac.xml index 6e52318..9b79c30 100644 --- a/app/src/main/res/layout/fragment_yjyac.xml +++ b/app/src/main/res/layout/fragment_yjyac.xml @@ -4,12 +4,28 @@ android:layout_height="match_parent" android:orientation="vertical"> - + android:layout_weight="1"> + + + + + + + +