From 6d620ed42d3b485566c88dd2b63f71a7758b7462 Mon Sep 17 00:00:00 2001 From: harry Date: Wed, 30 Oct 2024 20:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E5=8D=95=E4=BD=8D=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rehome/dywoa/Contans.java | 28 +++++----- .../rehome/dywoa/ui/activity/LoginActivity.kt | 10 ++-- .../ui/activity/sbxdjgl/SbxdjglActivity.java | 27 +++------- .../ui/activity/sbxdjgl/XzjhFragment.java | 52 ++++++------------- .../dywoa/ui/activity/sbxj/XJCJFragment.java | 6 ++- .../ui/activity/sbxj/XzxsjhFragment.java | 2 +- 6 files changed, 49 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/com/rehome/dywoa/Contans.java b/app/src/main/java/com/rehome/dywoa/Contans.java index 95cd107..e55d47d 100644 --- a/app/src/main/java/com/rehome/dywoa/Contans.java +++ b/app/src/main/java/com/rehome/dywoa/Contans.java @@ -3,25 +3,25 @@ package com.rehome.dywoa; public class Contans { - public static String IP = "http://192.168.2.115:8601/"; - public static String IP_INTRANET = "http://192.168.2.115:8601/"; - public static String IP_EXTRANET = "http://192.168.2.115:8601/"; - public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; - public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; +// public static String IP = "http://192.168.2.115:8601/"; +// public static String IP_INTRANET = "http://192.168.2.115:8601/"; +// public static String IP_EXTRANET = "http://192.168.2.115:8601/"; +// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; +// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; //APP登录接口厂内服务器IP -// public static String IP = "https://app.dywzhny.com.cn/"; -// //app内网 -// public static String IP_INTRANET = "https://app.dywzhny.com.cn/"; -// //app外网 -// public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; -// //SIS系统厂内IP -// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; -// //BI -// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; + public static String IP = "https://app.dywzhny.com.cn/"; + //app内网 + public static String IP_INTRANET = "https://app.dywzhny.com.cn/"; + //app外网 + public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; + //SIS系统厂内IP + public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; + //BI + public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; 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 e76d984..f39be23 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 @@ -206,11 +206,13 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etUsername.setText("ceshi1") // binding.etPassword.setText("A000000a.") - binding.etUsername.setText("CY00005") - binding.etPassword.setText("A000000a.") +// binding.etUsername.setText("CY00005") +// binding.etPassword.setText("A000000a.") + + +// binding.etUsername.setText("TD00003") +// binding.etPassword.setText("A000000a.") -// binding.etUsername.setText("CY00011") -// binding.etPassword.setText("A000000a") // binding.etUsername.setText("371543") diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java index cc09c2d..646d708 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java @@ -153,25 +153,14 @@ public class SbxdjglActivity extends BaseActivity2 { } param.put("Action", "DJ_DJGL_GET"); - -// if(firstDeparment!=null&&firstDeparment.equals("工程部")){ -// //工程部 -// if(TextUtils.isEmpty(secondDeparment)){ -// //工程部下无二级部门，工程部领导,查全部数据 -// }else{ -// param.put("firstDeparment", firstDeparment); -// param.put("secondDeparment", secondDeparment); -// param.put("firstDeparmentId", firstDeparmentId); -// param.put("secondDeparmentId", secondDeparmentId); -// } -// }else{ -// //其它部门 -// if(App.getInstance().getUserInfo().getManid().equals("371522")){ -// -// }else{ -// return; -// } -// } + if(!TextUtils.isEmpty(firstDeparment)){ + if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ + param.put("firstDeparment", firstDeparment); + param.put("secondDeparment", secondDeparment); + param.put("firstDeparmentId", firstDeparmentId); + param.put("secondDeparmentId", secondDeparmentId); + } + } String json = new Gson().toJson(param); showLog(json); diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java index e4e0752..a74f64a 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/XzjhFragment.java @@ -279,24 +279,14 @@ public class XzjhFragment extends BaseFragment { } param.put("Action", "DJ_DJGL_GET"); -// if(firstDeparment!=null&&firstDeparment.equals("工程部")){ -// //工程部 -// if(TextUtils.isEmpty(secondDeparment)){ -// //工程部下无二级部门，工程部领导,查全部数据 -// }else{ -// param.put("firstDeparment", firstDeparment); -// param.put("secondDeparment", secondDeparment); -// param.put("firstDeparmentId", firstDeparmentId); -// param.put("secondDeparmentId", secondDeparmentId); -// } -// }else{ -// //其它部门 -// if(App.getInstance().getUserInfo().getManid().equals("371522")){ -// -// }else{ -// return; -// } -// } + if(!TextUtils.isEmpty(firstDeparment)){ + if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ + param.put("firstDeparment", firstDeparment); + param.put("secondDeparment", secondDeparment); + param.put("firstDeparmentId", firstDeparmentId); + param.put("secondDeparmentId", secondDeparmentId); + } + } String json = new Gson().toJson(param); showLog(json); @@ -668,24 +658,14 @@ public class XzjhFragment extends BaseFragment { } param.put("Action", "DJ_DJGL_GET"); -// if(firstDeparment!=null&&firstDeparment.equals("工程部")){ -// //工程部 -// if(TextUtils.isEmpty(secondDeparment)){ -// //工程部下无二级部门，工程部领导,查全部数据 -// }else{ -// param.put("firstDeparment", firstDeparment); -// param.put("secondDeparment", secondDeparment); -// param.put("firstDeparmentId", firstDeparmentId); -// param.put("secondDeparmentId", secondDeparmentId); -// } -// }else{ -// //其它部门 -// if(App.getInstance().getUserInfo().getManid().equals("371522")){ -// -// }else{ -// return; -// } -// } + if(!TextUtils.isEmpty(firstDeparment)){ + if(firstDeparment.equals("设备部")||firstDeparment.equals("承包商")||firstDeparment.equals("粤电服大亚湾项目部")){ + param.put("firstDeparment", firstDeparment); + param.put("secondDeparment", secondDeparment); + param.put("firstDeparmentId", firstDeparmentId); + param.put("secondDeparmentId", secondDeparmentId); + } + } String json = new Gson().toJson(param); showLog(json); diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XJCJFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XJCJFragment.java index 4ecd0cc..03ba3e8 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XJCJFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XJCJFragment.java @@ -185,6 +185,7 @@ public class XJCJFragment extends BaseFragment { if(info!=null){ showLog(GsonUtils.GsonString(info)); + showLog(info.getDw()); } tvBjmc.setText(info.getBJMC()); @@ -203,6 +204,7 @@ public class XJCJFragment extends BaseFragment { tv_lower_action.setText(info.getLOWERACTION()); tv_upper_warning.setText(info.getUPPERWARNING()); tv_lower_warning.setText(info.getLOWERWARNING()); + tv_kks.setText(info.getKksCode()); tv_point_type.setText(info.getPOINTNAME()); tv_kks_desc.setText(info.getKksDesc()); @@ -216,10 +218,10 @@ public class XJCJFragment extends BaseFragment { ll_warnning.setVisibility(View.VISIBLE); ll_check_option.setVisibility(View.VISIBLE); - if(TextUtils.isEmpty(info.getDw())){ + if(TextUtils.isEmpty(info.getUNITOFMEASURE())){ tv_dw.setText(""); }else{ - tv_dw.setText(info.getDw()); + tv_dw.setText(info.getUNITOFMEASURE()); } }else{ tv_dw.setVisibility(View.INVISIBLE); diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java index a0a110d..1025820 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java @@ -342,7 +342,7 @@ public class XzxsjhFragment extends BaseFragment { selectCount = 0; dialog.cancel(); xjjhs.clear(); - xjjhs.addAll(where("download = ?", "0").find(Xjjh.class)); + xjjhs.addAll(where("download = ? and username = ?", "0",username).find(Xjjh.class)); if (adapter != null) { cb.setChecked(false); adapter.notifyDataSetChanged();