diff --git a/app/src/main/assets/litepal.xml b/app/src/main/assets/litepal.xml
index 4c3d29c..f9a3cb3 100755
--- a/app/src/main/assets/litepal.xml
+++ b/app/src/main/assets/litepal.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/app/src/main/java/com/rehome/dywoa/Contans.java b/app/src/main/java/com/rehome/dywoa/Contans.java
index e5e32ee..c83cd41 100644
--- a/app/src/main/java/com/rehome/dywoa/Contans.java
+++ b/app/src/main/java/com/rehome/dywoa/Contans.java
@@ -77,6 +77,7 @@ public class Contans {
//海康人脸识别
public static final String FACE_RECOGNITION_APP_URL = "api/app/face/faceRecognition";
+
public static String YHPC = "AJH/AJH_YHPCSC.ashx";//隐患排查
//-----------------------免检申请---------------------//
@@ -125,7 +126,7 @@ public class Contans {
public static final String HISTORY_DJ_FINISH_TJ = "api/app/pointTask/getPointTaskHistoryState";
//点检过程单条数据上传
public static String DJ_SINGLE_SC = "api/app/pointTask/uploadTaskOne";
-
+ public static String GET_SIS_DATA_DJ = "api/app/pointTask/getSisValue";//点检获取sis数据
//-----------------------点检结束--------------------------//
//==============================巡视抄表=========================================//
@@ -136,6 +137,7 @@ public class Contans {
public final static String XSCB_PLAN_UPLOAD_TASK_ONE = "api/app/task/uploadTaskOne";//上传单个巡检点数据
public final static String XJ_GET_DROWDOWN_DATA = "api/app/task/getInspectionBasicData";//巡检统计获取下拉数据,专业,类型,值次
public final static String XJ_GET_ZH_TJ = "api/app/task/getIntegrativeStatisticsData";//巡检终合统计
+ public static String GET_SIS_DATA_XJ = "api/app/task/getSisValue";//巡检获取sis数据
//==============================巡视抄表结束=========================================//
//==============================缺陷工单=========================================//
diff --git a/app/src/main/java/com/rehome/dywoa/DBModel/DjjhRwQy.java b/app/src/main/java/com/rehome/dywoa/DBModel/DjjhRwQy.java
index fe21519..cc834df 100644
--- a/app/src/main/java/com/rehome/dywoa/DBModel/DjjhRwQy.java
+++ b/app/src/main/java/com/rehome/dywoa/DBModel/DjjhRwQy.java
@@ -55,6 +55,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable {
private String username;
private String second;
+ private String sisno;//sis编号
public boolean isBYZT() {
return BYZT;
@@ -377,6 +378,14 @@ public class DjjhRwQy extends DataSupport implements Parcelable {
this.status = status;
}
+ public String getSisno() {
+ return sisno;
+ }
+
+ public void setSisno(String sisno) {
+ this.sisno = sisno;
+ }
+
public DjjhRwQy() {
}
@@ -427,6 +436,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable {
dest.writeString(this.username);
dest.writeString(this.second);
dest.writeString(this.status);
+ dest.writeString(this.sisno);
}
protected DjjhRwQy(Parcel in) {
@@ -470,6 +480,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable {
this.username = in.readString();
this.second = in.readString();
this.status = in.readString();
+ this.sisno = in.readString();
}
public static final Creator CREATOR = new Creator() {
diff --git a/app/src/main/java/com/rehome/dywoa/DBModel/XSJJHDataBean.java b/app/src/main/java/com/rehome/dywoa/DBModel/XSJJHDataBean.java
index 5397272..06c996c 100755
--- a/app/src/main/java/com/rehome/dywoa/DBModel/XSJJHDataBean.java
+++ b/app/src/main/java/com/rehome/dywoa/DBModel/XSJJHDataBean.java
@@ -85,6 +85,7 @@ public class XSJJHDataBean extends DataSupport implements Parcelable {
private String LOWERWARNINGSTOP;//停机报警下限
private String firstAssembling;//#1机组运行状态 0:停机,1:开机
private String secondAssembling;//#2机组运行状态 0:停机,1:开机
+ private String sisno;//sis编号
public long getId() {
@@ -576,6 +577,14 @@ public class XSJJHDataBean extends DataSupport implements Parcelable {
this.secondAssembling = secondAssembling;
}
+ public String getSisno() {
+ return sisno;
+ }
+
+ public void setSisno(String sisno) {
+ this.sisno = sisno;
+ }
+
@Override
public int describeContents() {
return 0;
@@ -644,6 +653,7 @@ public class XSJJHDataBean extends DataSupport implements Parcelable {
dest.writeString(this.LOWERWARNINGSTOP);
dest.writeString(this.firstAssembling);
dest.writeString(this.secondAssembling);
+ dest.writeString(this.sisno);
}
@@ -713,6 +723,7 @@ public class XSJJHDataBean extends DataSupport implements Parcelable {
this.LOWERWARNINGSTOP = in.readString();
this.firstAssembling = in.readString();
this.secondAssembling = in.readString();
+ this.sisno = in.readString();
}
diff --git a/app/src/main/java/com/rehome/dywoa/bean/DjZhTjBean.java b/app/src/main/java/com/rehome/dywoa/bean/DjZhTjBean.java
index cd9d34a..6acf3ec 100644
--- a/app/src/main/java/com/rehome/dywoa/bean/DjZhTjBean.java
+++ b/app/src/main/java/com/rehome/dywoa/bean/DjZhTjBean.java
@@ -97,4 +97,4 @@ public class DjZhTjBean extends BaseListBean{
this.MJDS = MJDS;
}
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java b/app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java
index 7684f51..75ab71b 100644
--- a/app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java
+++ b/app/src/main/java/com/rehome/dywoa/bean/KksDataBean.java
@@ -21,6 +21,7 @@ public class KksDataBean extends BaseListBean{
private String equipmentDesc;
private String clasessCode;
private String parentCode;
+ private String sisno;
public String getId() {
return id;
@@ -77,5 +78,13 @@ public class KksDataBean extends BaseListBean{
public void setKksDesc(String kksDesc) {
this.kksDesc = kksDesc;
}
+
+ public String getSisno() {
+ return sisno;
+ }
+
+ public void setSisno(String sisno) {
+ this.sisno = sisno;
+ }
}
}
diff --git a/app/src/main/java/com/rehome/dywoa/bean/SisReaultBean.java b/app/src/main/java/com/rehome/dywoa/bean/SisReaultBean.java
new file mode 100644
index 0000000..3f0e583
--- /dev/null
+++ b/app/src/main/java/com/rehome/dywoa/bean/SisReaultBean.java
@@ -0,0 +1,47 @@
+package com.rehome.dywoa.bean;
+
+import java.util.List;
+
+public class SisReaultBean extends BaseListBean{
+
+ private List Rows;
+
+ public List getRows() {
+ return Rows;
+ }
+
+ public void setRows(List rows) {
+ Rows = rows;
+ }
+
+
+ public static class Row {
+ private String sisDesc;
+ private String sisValue;
+ private String dw;
+
+ public String getSisDesc() {
+ return sisDesc;
+ }
+
+ public void setSisDesc(String sisDesc) {
+ this.sisDesc = sisDesc;
+ }
+
+ public String getDw() {
+ return dw;
+ }
+
+ public void setDw(String dw) {
+ this.dw = dw;
+ }
+
+ public String getSisValue() {
+ return sisValue;
+ }
+
+ public void setSisValue(String sisValue) {
+ this.sisValue = sisValue;
+ }
+ }
+}
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt
index f0a41fe..16ecb6c 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/KksSearchActivity.kt
@@ -138,6 +138,9 @@ class KksSearchActivity : BaseActivityOaToolbarViewBinding param = new HashMap<>();
+ param.put("sisno",sisNo);
+ String json = GsonUtils.GsonString(param);
+ String url = Contans.IP + Contans.GET_SIS_DATA_XJ;
+ showLog(url);
+ showLog(json);
+ Request request = NoHttp.createStringRequest(
+ url,
+ RequestMethod.POST
+ );
+ request.setDefineRequestBodyForJson(json);
+ NoProgresshttpUtils.getInstance().add(requireActivity(), 3, request, new HttpListener() {
+
+ @Override
+ public void onSucceed(int what, Response response) {
+ String result = response.get();
+ showLog("-----onSucceed----");
+ showLog(result);
+ SisReaultBean sisReaultBean = GsonUtils.GsonToBean(result,SisReaultBean.class);
+ if(sisReaultBean!=null&&sisReaultBean.getTotal()>0&&sisReaultBean.getRows()!=null&& !sisReaultBean.getRows().isEmpty()){
+ SisReaultBean.Row itemSis = sisReaultBean.getRows().get(0);
+ if(itemSis!=null&&itemSis.getSisValue()!=null){
+ tv_sis_value.setText(itemSis.getSisValue());
+ }
+ }
+ }
+
+ @Override
+ public void onFailed(int what, Response response) {
+ showLog("connect server onFailed");
+ }
+ });
+ }
+
+ //检查服务器连接状态
+ private void checkServerConnectStatus(String sisNo) {
+ 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(requireActivity(), 3, 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");
+ //可以连接到服务器,请求数据
+ getSisDate(sisNo);
+ }
+ }
+
+ @Override
+ public void onFailed(int what, Response response) {
+ showLog("connect server onFailed");
+ }
+ });
+ }
+
/**
* 更新数据
@@ -230,6 +313,10 @@ public class CJFragment extends BaseFragment {
tv_dw.setVisibility(View.GONE);
}
+ if(!TextUtils.isEmpty(info.getSisno())){
+ checkServerConnectStatus(info.getSisno());
+ }
+
if(!TextUtils.isEmpty(info.getMEAMETHOD())){
if(info.getMEAMETHOD().equals("抄表")){
//android:digits="0123456789.-"
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/QxgdListActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/QxgdListActivity.kt
index b2816f7..b3130e4 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/QxgdListActivity.kt
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/QxgdListActivity.kt
@@ -346,16 +346,19 @@ class QxgdListActivity : BaseActivityOaToolbarViewBinding?) {
+ showLog("缺陷工单上传失败,无法连接到服务器,请检查网络环境")
+ showToast("缺陷工单上传失败,无法连接到服务器,请检查网络环境")
dialog.dismiss()
}
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java
index 2701b0f..ca1a8d0 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SQxgdlrfActivity.java
@@ -476,47 +476,47 @@ public class SQxgdlrfActivity extends BaseActivity {
}
}
- private void scData() {
-
-
- //缺陷工单,如果缺陷工单为空,就没有上传
- List infos = DataSupport.findAll(QxgdInfo.class);
- if (infos.size() != 0) {
- Request request1 = NoHttp.createStringRequest(Contans.IP + Contans.DJJHQXGD, RequestMethod.POST);
- String qxgdjson = "{\"Rows\":" + GsonUtils.GsonString(infos) + ",\"Total\": " + infos.size() + "}";
- showLog(qxgdjson);
- System.out.println(qxgdjson);
- qxgdjson = new String(qxgdjson.getBytes(), StandardCharsets.UTF_8);
- request1.setDefineRequestBodyForJson(UiUtlis.encoder(qxgdjson));
- NohttpUtils.getInstance().add(this, 1, request1, callback, true, true, "上传中...");
- }
- }
-
- private HttpListener callback = new HttpListener() {
- @Override
- public void onSucceed(int what, Response response) {
- try {
- StatusInfo info = GsonUtils.GsonToBean(response.get(), StatusInfo.class);
- if (info != null) {
- if (info.getTotal() != 0) {
- if (info.getRows().get(0).getStatus().equals("1")) {
- showToast("上传成功");
- DataSupport.deleteAll(QxgdInfo.class);
- } else {
- showToast("上传失败");
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void onFailed(int what, Response response) {
-
- }
- };
+// private void scData() {
+//
+//
+// //缺陷工单,如果缺陷工单为空,就没有上传
+// List infos = DataSupport.findAll(QxgdInfo.class);
+// if (infos.size() != 0) {
+// Request request1 = NoHttp.createStringRequest(Contans.IP + Contans.DJJHQXGD, RequestMethod.POST);
+// String qxgdjson = "{\"Rows\":" + GsonUtils.GsonString(infos) + ",\"Total\": " + infos.size() + "}";
+// showLog(qxgdjson);
+// System.out.println(qxgdjson);
+// qxgdjson = new String(qxgdjson.getBytes(), StandardCharsets.UTF_8);
+// request1.setDefineRequestBodyForJson(UiUtlis.encoder(qxgdjson));
+// NohttpUtils.getInstance().add(this, 1, request1, callback, true, true, "上传中...");
+// }
+// }
+
+// private HttpListener callback = new HttpListener() {
+// @Override
+// public void onSucceed(int what, Response response) {
+// try {
+// StatusInfo info = GsonUtils.GsonToBean(response.get(), StatusInfo.class);
+// if (info != null) {
+// if (info.getTotal() != 0) {
+// if (info.getRows().get(0).getStatus().equals("1")) {
+// showToast("上传成功");
+// DataSupport.deleteAll(QxgdInfo.class);
+// } else {
+// showToast("上传失败");
+// }
+// }
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+//
+// @Override
+// public void onFailed(int what, Response response) {
+//
+// }
+// };
//加载数据库中已经下载的计划
private void getDataInSqlite() {
@@ -757,8 +757,11 @@ public class SQxgdlrfActivity extends BaseActivity {
showLog("缺陷工单上传失败");
showToast("缺陷工单上传失败");
}else{
+// showLog(info.getMsg());
+// showToast(info.getMsg());
+ showLog("服务端异常,缺陷工单上传失败");
showLog(info.getMsg());
- showToast(info.getMsg());
+ showToast("服务端异常,缺陷工单上传失败");
}
}else{
showLog("缺陷工单上传失败");
@@ -768,6 +771,8 @@ public class SQxgdlrfActivity extends BaseActivity {
@Override
public void onFailed(int what, Response response) {
+ showLog("缺陷工单上传失败,无法连接到服务器,请检查网络环境");
+ showToast("缺陷工单上传失败,无法连接到服务器,请检查网络环境");
if (dialog != null && dialog.isShowing()) {
dialog.dismiss();
}
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 bbd4697..ec7591c 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
@@ -16,11 +16,21 @@ import com.rehome.dywoa.Contans;
import com.rehome.dywoa.DBModel.XSJJHDataBean;
import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseFragment;
+import com.rehome.dywoa.bean.SisReaultBean;
import com.rehome.dywoa.utils.GsonUtils;
+import com.rehome.dywoa.utils.HttpListener;
+import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.SPUtils;
import com.rehome.dywoa.weiget.ListDialog;
+import com.yolanda.nohttp.NoHttp;
+import com.yolanda.nohttp.RequestMethod;
+import com.yolanda.nohttp.rest.Request;
+import com.yolanda.nohttp.rest.Response;
+
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class XJCJFragment extends BaseFragment {
@@ -54,6 +64,8 @@ public class XJCJFragment extends BaseFragment {
TextView tv_kks;
TextView tv_point_type;
TextView tv_kks_desc;
+ TextView tv_sis_value;
+
// LinearLayout ll_action;
// LinearLayout ll_warnning;
@@ -147,6 +159,7 @@ public class XJCJFragment extends BaseFragment {
tv_kks = view.findViewById(R.id.tv_kks);
tv_point_type = view.findViewById(R.id.tv_point_type);
tv_kks_desc = view.findViewById(R.id.tv_kks_desc);
+ tv_sis_value = view.findViewById(R.id.tv_sis_value);
// ll_action = view.findViewById(R.id.ll_action);
// ll_warnning = view.findViewById(R.id.ll_warnning);
@@ -214,6 +227,75 @@ public class XJCJFragment extends BaseFragment {
}
+ private void getSisDate(String sisNo){
+ Map param = new HashMap<>();
+ param.put("sisno",sisNo);
+ String json = GsonUtils.GsonString(param);
+ String url = Contans.IP + Contans.GET_SIS_DATA_XJ;
+ showLog(url);
+ showLog(json);
+ Request request = NoHttp.createStringRequest(
+ url,
+ RequestMethod.POST
+ );
+ request.setDefineRequestBodyForJson(json);
+ NoProgresshttpUtils.getInstance().add(requireActivity(), 3, request, new HttpListener() {
+
+ @Override
+ public void onSucceed(int what, Response response) {
+ String result = response.get();
+ showLog("-----onSucceed----");
+ showLog(result);
+ SisReaultBean sisReaultBean = GsonUtils.GsonToBean(result,SisReaultBean.class);
+ if(sisReaultBean!=null&&sisReaultBean.getTotal()>0&&sisReaultBean.getRows()!=null&& !sisReaultBean.getRows().isEmpty()){
+ SisReaultBean.Row itemSis = sisReaultBean.getRows().get(0);
+ if(itemSis!=null&&itemSis.getSisValue()!=null){
+ tv_sis_value.setText(itemSis.getSisValue());
+ }
+ }
+ }
+
+ @Override
+ public void onFailed(int what, Response response) {
+ showLog("connect server onFailed");
+ }
+ });
+ }
+
+ //检查服务器连接状态
+ private void checkServerConnectStatus(String sisNo) {
+ 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(requireActivity(), 3, 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");
+ //可以连接到服务器,请求数据
+ getSisDate(sisNo);
+ }
+ }
+
+ @Override
+ public void onFailed(int what, Response response) {
+ showLog("connect server onFailed");
+ }
+ });
+ }
+
/**
* 更新数据
*/
@@ -250,6 +332,10 @@ public class XJCJFragment extends BaseFragment {
tv_point_type.setText(info.getPOINTNAME());
tv_kks_desc.setText(info.getKksDesc());
+ if(!TextUtils.isEmpty(info.getSisno())){
+ checkServerConnectStatus(info.getSisno());
+ }
+
// Log.e("XJCJFragment", "lrlx = " + info.getLRFS() + ", cjjg=" + info.getCJJG());
if(!TextUtils.isEmpty(info.getDlxmc())){
diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java
index a3537f8..c01e9ff 100644
--- a/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java
+++ b/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java
@@ -46,7 +46,10 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis
// private String mUserPassword = "test@1234"; //密码
//服务器地址
- private String mServerAddress = "https://vpn.dywzhny.com.cn:8443";
+ //private String mServerAddress = "https://vpn.dywzhny.com.cn:8443";
+ private String mServerAddress = "https://vpn2.dywzhny.com.cn:9443";
+
+
//用户名
private String mUserName = "";
//密码
diff --git a/app/src/main/res/layout/activity_kks_search.xml b/app/src/main/res/layout/activity_kks_search.xml
index e0169ef..6093062 100644
--- a/app/src/main/res/layout/activity_kks_search.xml
+++ b/app/src/main/res/layout/activity_kks_search.xml
@@ -241,6 +241,34 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_cj.xml b/app/src/main/res/layout/fragment_cj.xml
index d199870..6181c59 100644
--- a/app/src/main/res/layout/fragment_cj.xml
+++ b/app/src/main/res/layout/fragment_cj.xml
@@ -80,7 +80,27 @@
android:text=""
android:textSize="@dimen/sbtextSize" />
+
+
+
+
+
+
+
+
+
+
-