From 22366f83f40bec4302d40393ecd5afb60a6645b7 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Fri, 27 Oct 2023 17:22:16 +0800 Subject: [PATCH] network change --- app/src/main/AndroidManifest.xml | 186 +++++++++++++----- .../zhapp/activity/LoginActivity.java | 8 +- .../zhapp/activity/xscbgl/XscbqyActivity.java | 14 +- .../activity/xscbgl/XscbqyWorkActivity.java | 1 + .../activity/xscbgl/XscbqyWorkXsActivity.java | 6 +- .../zhapp/utils/NohttpUtils.java | 24 +-- 6 files changed, 166 insertions(+), 73 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index affc52c..a594dde 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - + @@ -24,9 +25,10 @@ + - - - + + @@ -68,7 +71,7 @@ - + @@ -120,13 +123,13 @@ - - - + + + - + - + - - - - + + + + - - - + + + - - - - - + + + + + - - + + + + + + + + - - - - - - - - - + - + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/administrator/zhapp/activity/LoginActivity.java b/app/src/main/java/com/example/administrator/zhapp/activity/LoginActivity.java index e5589d1..3562b73 100755 --- a/app/src/main/java/com/example/administrator/zhapp/activity/LoginActivity.java +++ b/app/src/main/java/com/example/administrator/zhapp/activity/LoginActivity.java @@ -152,16 +152,16 @@ public class LoginActivity extends BaseActivity { // et_use.setText("990002"); // et_pwd.setText("000000"); - et_use.setText("310258"); - et_pwd.setText("Shi&7791"); +// et_use.setText("310258"); +// et_pwd.setText("Shi&7791"); // et_use.setText("FGTL01"); // et_pwd.setText("123"); -// et_use.setText("310673"); -// et_pwd.setText("Abcd@1234"); + et_use.setText("310673"); + et_pwd.setText("Abcd@1234"); // et_use.setText("310482"); // et_pwd.setText("310482"); diff --git a/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyActivity.java b/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyActivity.java index 7c706de..64d126f 100755 --- a/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyActivity.java +++ b/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyActivity.java @@ -216,7 +216,7 @@ public class XscbqyActivity extends BaseActivity { intent.putExtra(Contans.KEY_IS_HIS, false); startActivity(intent); } - return; + break; } } } @@ -267,4 +267,16 @@ public class XscbqyActivity extends BaseActivity { super.onRestart(); requestDatas(); } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + // 在此处保存需要恢复的数据 + } + + @Override + protected void onRestoreInstanceState(Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); + // 在此处恢复保存的数据 + } } diff --git a/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyWorkActivity.java b/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyWorkActivity.java index ab1175e..73a99d2 100755 --- a/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyWorkActivity.java +++ b/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyWorkActivity.java @@ -229,4 +229,5 @@ public class XscbqyWorkActivity extends BaseActivity { return json; } + } diff --git a/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyWorkXsActivity.java b/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyWorkXsActivity.java index 42b757e..484e36e 100755 --- a/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyWorkXsActivity.java +++ b/app/src/main/java/com/example/administrator/zhapp/activity/xscbgl/XscbqyWorkXsActivity.java @@ -84,10 +84,6 @@ public class XscbqyWorkXsActivity extends BaseActivity { return R.layout.activity_xscbqy_work; } - @Override - protected void onResume() { - super.onResume(); - } @Override protected void initView() { @@ -99,6 +95,8 @@ public class XscbqyWorkXsActivity extends BaseActivity { smfx = getIntent().getExtras().getString(Contans.KEY_EWM_OR_NFC); isHis = getIntent().getExtras().getBoolean(Contans.KEY_IS_HIS, false); + showLog(String.valueOf(isHis)); + if (isHis) { btnCommit.setVisibility(View.GONE); } diff --git a/app/src/main/java/com/example/administrator/zhapp/utils/NohttpUtils.java b/app/src/main/java/com/example/administrator/zhapp/utils/NohttpUtils.java index 23c6ff2..f651a60 100755 --- a/app/src/main/java/com/example/administrator/zhapp/utils/NohttpUtils.java +++ b/app/src/main/java/com/example/administrator/zhapp/utils/NohttpUtils.java @@ -74,10 +74,10 @@ public class NohttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, canCanel, isLoading, msg)); } @@ -90,10 +90,10 @@ public class NohttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, true, true, "加载中...")); } @@ -105,10 +105,10 @@ public class NohttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url()); - if(!TextUtils.isEmpty(token)){ - showLog(credential); - showLog(new Gson().toJson(request.headers())); - } +// if(!TextUtils.isEmpty(token)){ +// showLog(credential); +// showLog(new Gson().toJson(request.headers())); +// } } mQueue.add(what, request, new HttpResponseListenerNoProgress(request, callback)); }