From 14b88ebee1cf2f5e23aca70ce7306e053be89e91 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Tue, 3 Dec 2024 22:54:41 +0800 Subject: [PATCH] 1.1.8 release --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 4 + .../main/java/com/rehome/dywoa/Contans.java | 28 +- .../dywoa/ui/activity/HightRiskActivity.java | 298 ++++++++++++++ .../rehome/dywoa/ui/activity/HomeActivity.kt | 2 + .../rehome/dywoa/ui/activity/LoginActivity.kt | 4 +- .../dywoa/ui/activity/RunLogBaseActivity.kt | 5 + .../ui/activity/WaitForToDoActivity.java | 4 +- .../dywoa/ui/activity/sbxdjgl/CJFragment.java | 21 +- .../ui/activity/sbxj/SbxjcjsbActivity.java | 1 + .../dywoa/ui/activity/sbxj/XJCJFragment.java | 113 +++++- .../dywoa/ui/fragment/HomeFragment.java | 18 +- .../main/res/layout/activity_hight_risk.xml | 40 ++ app/src/main/res/layout/activity_sbxjcjsb.xml | 4 +- app/src/main/res/layout/fragment_cj.xml | 3 +- app/src/main/res/layout/fragment_xjcj.xml | 375 ++++++++++++++---- app/src/main/res/values/dimen.xml | 2 +- 17 files changed, 785 insertions(+), 141 deletions(-) create mode 100644 app/src/main/java/com/rehome/dywoa/ui/activity/HightRiskActivity.java create mode 100644 app/src/main/res/layout/activity_hight_risk.xml diff --git a/app/build.gradle b/app/build.gradle index af09d30..4d7df0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.rehome.dywoa" minSdk 24 targetSdk 34 - versionCode 18 - versionName "1.1.7" + versionCode 19 + versionName "1.1.8" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 34dc9a3..ab7aba1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -212,6 +212,10 @@ android:name=".ui.activity.WaitForToDoActivity" android:exported="false" android:screenOrientation="portrait" /> + HightRiskActivity.this.finish()); + + + //支持缩放 + mAgentWeb.getWebCreator().getWebView().getSettings().setBuiltInZoomControls(true); + mAgentWeb.getWebCreator().getWebView().getSettings().setDisplayZoomControls(false); + mAgentWeb.getWebCreator().getWebView().getSettings().setSupportZoom(true); + + checkServerConnectStatus(); + + } + + @Override + protected void onResume() { + super.onResume(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } + + + //检查服务器连接状态 + private void checkServerConnectStatus() { + Map param = new HashMap<>(); + param.put("login","dywoa"); + String json = GsonUtils.GsonString(param); + String url = Contans.IP + Contans.check_server_connect; + showLog(url); + showLog(json); + Request request = NoHttp.createStringRequest( + url, + RequestMethod.POST + ); + request.setDefineRequestBodyForJson(json); + NoProgresshttpUtils.getInstance().add(this, 0, request, new HttpListener() { + + @Override + public void onSucceed(int what, Response response) { + String result = response.get(); + showLog("-----onSucceed----"); + showLog(result); + if(result.equals("1")){ + showLog("connect server success"); + //可以连接到服务器，请求数据 + getSingleLoginToken(); + }else{ + showToast("无法连接到服务器，请检查网络环境"); + } + } + + @Override + public void onFailed(int what, Response response) { + showLog("connect server onFailed"); + showToast("无法连接到服务器，请检查网络环境"); + } + }); + } + + + private void getSingleLoginToken() { + String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid(); + + //String url = Contans.IP + urlToken + "803011"; + + + //url = Contans.IP + urlToken + "280846"; + + + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + showLog(url); + +// SSLSocketFactory socketFactory = NohttpUtils.getSisSSLSocketFactory(WaitForToDoActivity.this); +// if (socketFactory != null) { +// request.setSSLSocketFactory(socketFactory); +// request.setHostnameVerifier(new HostnameVerifier() { +// @Override +// public boolean verify(String s, SSLSession sslSession) { +// return true; +// } +// }); +// } + + NohttpUtils.getInstance().add(this,1,request,new HttpListener(){ + @Override + public void onSucceed(int what, Response response) throws ParseException { + + String jsonResult = response.get(); + showLog("-----login------"); + showLog(jsonResult); + + String jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(HightRiskActivity.this, R.string.data_error)); + } else { + FwSingleLoginResult loginResult = GsonUtils.GsonToBean(jsonDecode, FwSingleLoginResult.class); + showLog(jsonDecode); + if (loginResult != null) { + if (loginResult.getErrmsg()!=null&&loginResult.getErrmsg().equals("success")) { + if(!TextUtils.isEmpty(loginResult.getToken())){ + loadSisPage(loginResult.getToken()); + } + }else{ + showToast(loginResult.getErrmsg()); + } + } + } + } + + @Override + public void onFailed(int what, Response response) { + showLog("getSisToken onFailed"); + } + }, true, true, "请稍候..."); + } + + private void loadSisPage(String token) { + try { + var tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken="+ token +"&redirect_uri="; + String encodeUrl = URLEncoder.encode(urlLog,"UTF-8"); + startUrl = tempUrl + encodeUrl; + showLog(startUrl); + this.mAgentWeb.getUrlLoader().loadUrl(startUrl); + }catch (Exception e){ + e.printStackTrace(); + } + } + + + + @NonNull + @Override + protected ViewGroup getAgentWebParent() { + return (ViewGroup) this.findViewById(R.id.container); + } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (mAgentWeb != null && mAgentWeb.handleKeyEvent(keyCode, event)) { + return true; + } + + return super.onKeyDown(keyCode, event); + } + + @Override + protected int getIndicatorColor() { + return Color.parseColor("#ff0000"); + } + + @Override + protected void setTitle(WebView view, String title) { + super.setTitle(view, title); + if (!TextUtils.isEmpty(title)) { + if (mTitleTextView != null) { + mTitleTextView.setText(type); + } + } + } + + @Override + protected int getIndicatorHeight() { + return 3; + } + + @Nullable + @Override + protected String getUrl() { + return null; + //return "https://www.baidu.com/"; + } + + + private void showLog(String logText) { + if (isApkInDebug(HightRiskActivity.this)) { + if (TextUtils.isEmpty(logText)) { + Log.i("app", "logText is null"); + } else { + Log.i("app", logText); + } + } + } + + /** + * 判断当前应用是否是debug状态 + */ + + public static boolean isApkInDebug(Context context) { + try { + ApplicationInfo info = context.getApplicationInfo(); + return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + } catch (Exception e) { + return false; + } + } + + public void showToast(String msg) { + Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); + } + + public void showToast(int strId) { + Toast.makeText(this, strId, Toast.LENGTH_SHORT).show(); + } + +} diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt index 838b279..df43c4a 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt @@ -836,6 +836,8 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() { showLog(url) val request = NoHttp.createStringRequest(url, RequestMethod.POST) val json = getJsonUploadSingleTaskDj(djCheckedItem) + showLog("上传单个巡检点:") + showLog(json) request.setDefineRequestBodyForJson(json) if (App.getInstance().userInfo != null && App.getInstance().userInfo.token != null) { diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt index 6af26da..cfd9fac 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt @@ -207,8 +207,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { //李梓雄 - binding.etUsername.setText("371522") - binding.etPassword.setText("A000000a.") +// binding.etUsername.setText("371522") +// binding.etPassword.setText("A000000a.") //ceshi1 // binding.etUsername.setText("ceshi1") diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/RunLogBaseActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/RunLogBaseActivity.kt index 3bc0585..bf660fc 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/RunLogBaseActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/RunLogBaseActivity.kt @@ -100,6 +100,11 @@ class RunLogBaseActivity : BaseActivityOaToolbarViewBinding + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_sbxjcjsb.xml b/app/src/main/res/layout/activity_sbxjcjsb.xml index 43ab38d..5ba150f 100644 --- a/app/src/main/res/layout/activity_sbxjcjsb.xml +++ b/app/src/main/res/layout/activity_sbxjcjsb.xml @@ -9,8 +9,8 @@ diff --git a/app/src/main/res/layout/fragment_cj.xml b/app/src/main/res/layout/fragment_cj.xml index 700ad45..d199870 100644 --- a/app/src/main/res/layout/fragment_cj.xml +++ b/app/src/main/res/layout/fragment_cj.xml @@ -296,8 +296,7 @@ android:layout_margin="0dp" android:layout_width="250px" android:layout_gravity="center_vertical" - android:digits="0123456789.-" - android:inputType="numberDecimal" /> + android:inputType="numberSigned|numberDecimal"/> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + + android:text="专业名称：" + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:text="所属机组：" + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:text="机组状态：" + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + - + android:orientation="vertical"> - + android:layout_weight="1" + android:orientation="horizontal"> + + + + + + + + + + + + + + - + + + + android:layout_weight="1" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + - - + android:layout_weight="1" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + + android:text="kks编码：" + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> @@ -321,7 +518,7 @@ android:layout_height="match_parent" android:gravity="center_vertical|right" android:text="kks描述：" - android:textSize="@dimen/sbtextSize"/> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:visibility="gone" /> + android:visibility="gone" /> @@ -373,7 +570,7 @@ android:maxHeight="120px" android:text="高值：" android:textSize="@dimen/sbtextSize" - android:visibility="gone"/> + android:visibility="gone" /> + android:visibility="gone" /> @@ -391,9 +588,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/px_5" - android:visibility="gone" android:maxHeight="120px" - android:minHeight="@dimen/px_60"> + android:minHeight="@dimen/px_60" + android:visibility="gone"> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + android:textSize="@dimen/sbtextSize" /> + + android:visibility="gone" /> + android:visibility="gone" /> @@ -473,34 +671,35 @@ android:id="@+id/textView2" android:layout_width="@dimen/cjwidth" android:layout_height="@dimen/sbHeight" - android:layout_centerVertical="true" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" android:gravity="center_vertical|right" android:text="采集结果：" - android:textSize="@dimen/sbtextSize"/> + android:textSize="@dimen/sbtextSize" /> + android:visibility="visible" /> + + android:textSize="24sp" />