diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5d9561d..9121093 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -263,6 +263,7 @@ android:exported="false" android:launchMode="singleInstance" /> + () { if (BuildConfig.LOG_ERROR) { //测试 -// binding.etUsername.setText("371522") -// binding.etPassword.setText("A000000a") + binding.etUsername.setText("371522") + binding.etPassword.setText("A000000a") // binding.etUsername.setText("371543") // binding.etPassword.setText("Dyw@2024") -// binding.etUsername.setText("TD-00002") +// binding.etUsername.setText("TD00002") // binding.etPassword.setText("A000000a") // binding.etUsername.setText("CY-00001") @@ -539,7 +539,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { //val json: String = "Ms97MbjVaypr+CF04BTQ+Y7hbYp+orLZbXM2u+I+PZKSPSSaqR1dcuM3tsig3UpJ7s2qEw5DsJcVd0t4eJM79ABUFWW/0Nplhx37+6jR2YVaSJgA30L0O2FbuyG7SOjP0qfISNaN1L8eC3a7W5oFPpHxkZdxUf5sxJIQHA2c6lCI+Mo/BUgU1MgTIjM3puiWx99mvxOyl9k2oLZUjcjMOygzNUYYD21SQYQ6dtvdVz3iAtqeJ+0EVCtScPXePG/CH/s0Ti/VS54/KSrlRVfdn5s2pHqw5fd2BZX+ZGtIWTGpWb+Wt1ZtrPXPdv/r1Zx84Zcw0EqKicieeuYpfUH+eg=="; val url = Contans.IP + Contans.APPLOGINRSA - //val url = "http://192.168.2.21:8601/" + Contans.APPLOGINRSA + //val url = "http://192.168.2.150:8601/" + Contans.APPLOGINRSA val request = NoHttp.createStringRequest(url, RequestMethod.POST) @@ -940,7 +940,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { param["login"] = "dywoa"; val json = GsonUtils.GsonString(param) val url = Contans.IP + Contans.check_server_connect - //val url = "http://192.168.2.21:8601/" + Contans.check_server_connect + //val url = "http://192.168.2.150:8601/" + Contans.check_server_connect showLog(url) showLog(json) val request = NoHttp.createStringRequest( 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 8bfd70b..b2816f7 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 @@ -282,6 +282,7 @@ class QxgdListActivity : BaseActivityOaToolbarViewBinding infos = DataSupport.findAll(QxgdInfo.class); if (infos.size() != 0) { @@ -605,6 +659,134 @@ public class SQxgdlrfActivity extends BaseActivity { return info.save(); } + public void uploadDataByNoSave() { + finalList.clear(); + for (LocalMedia media : mData) { + //finalList.add(media.getCompressPath()); + if(media.getCompressPath()!=null){ + finalList.add(media.getCompressPath()); + }else{ + if(media.getSandboxPath()!=null){ + finalList.add(media.getSandboxPath()); + } + } + showLog(new Gson().toJson(media)); + } + + showLog(finalList.toString().toLowerCase()); + + QxgdInfo info = new QxgdInfo(); + info.setGzqx(UiUtlis.getText(etMs)); + info.setKks(UiUtlis.getText(et_kks)); + info.setZy(zys.get(et_zy.getSelectedItemPosition()).getKey()); + info.setJz(jzs.get(et_jz.getSelectedItemPosition()).getKey()); + info.setXydj(xydjs.get(et_xydj.getSelectedItemPosition()).getKey()); + info.setGzlx(gzlxs.get(et_gzlx.getSelectedItemPosition()).getKey()); + info.setZyDesc(zys.get(et_zy.getSelectedItemPosition()).getValue()); + info.setJzDesc(jzs.get(et_jz.getSelectedItemPosition()).getValue()); + info.setXydjDesc(xydjs.get(et_xydj.getSelectedItemPosition()).getValue()); + info.setGzlxDesc(gzlxs.get(et_gzlx.getSelectedItemPosition()).getValue()); + info.setBgr(username); + info.setUsername(username); + info.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date())); + + if(finalList.size()>0){ + info.setPhotos(new Gson().toJson(mData)); + } + upLoadQx(info); + } + + //上传单条缺陷工单 + private void upLoadQx(QxgdInfo qxItemUpload) { + String url = Contans.IP + Contans.XJD_UPLOAD_QX; + showLog(url); + Request request = NoHttp.createStringRequest(url, RequestMethod.POST); + request.add("kks", qxItemUpload.getKks()); + request.add("jz", qxItemUpload.getJz()); + request.add("zy", qxItemUpload.getZy()); + request.add("xydj", qxItemUpload.getXydj()); + request.add("gzlx", qxItemUpload.getGzlx()); + request.add("bgr", username); + request.add("gzqx", qxItemUpload.getGzqx()); + request.add("date", qxItemUpload.getDate()); + + + if (App.getInstance().getUserInfo() != null && App.getInstance().getUserInfo().getToken() != null) { + String token = App.getInstance().getUserInfo().getToken(); + String credential = "Bearer "+token; + request.addHeader("Authorization", credential); + request.addHeader("token", token); + showLog(request.url()); + } + + if (!TextUtils.isEmpty(qxItemUpload.getPhotos())) { + //List mDataTemp = GsonUtils.GsonToList(qxItemUpload.getPhotos(),LocalMedia.class); + + Gson gson = new Gson(); + List mDataTemp = gson.fromJson(qxItemUpload.getPhotos(), new TypeToken>() {}.getType()); + + //gson.fromJson(qxItemUpload.getPhotos(),new TypeToken>() {}.getType()); + +// = gson.fromJson>( +// qxItemUpload.photos, +// object : TypeToken?>() {}.type +// ) + + for (LocalMedia localMedia : mDataTemp) { + showLog(new Gson().toJson(localMedia)); + if(localMedia.getCompressPath()!=null){ + request.add("file", new File(localMedia.getCompressPath())); + }else{ + if(localMedia.getSandboxPath()!=null){ + request.add("file", new File(localMedia.getSandboxPath())); + } + } + } + } + + if (dialog != null) { + dialog.show(); + } + + queue.add(5, request, new HttpResponseListener<>(SQxgdlrfActivity.this, request, new HttpListener() { + + @Override + public void onSucceed(int what, Response response) { + + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + + String result = response.get(); + showLog(result); + com.rehome.dywoa.bean.StatusInfo info = GsonUtils.GsonToBean(result, com.rehome.dywoa.bean.StatusInfo.class); + if (info != null&&info.getState() == 1) { + showLog("缺陷工单上传成功"); + showToast("缺陷工单上传成功"); + clearView(); + }else if (info != null&&info.getState() != 1) { + if(TextUtils.isEmpty(info.getMsg())){ + showLog("缺陷工单上传失败"); + showToast("缺陷工单上传失败"); + }else{ + showLog(info.getMsg()); + showToast(info.getMsg()); + } + }else{ + showLog("缺陷工单上传失败"); + showToast("缺陷工单上传失败"); + } + } + + @Override + public void onFailed(int what, Response response) { + if (dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + } + }, true, false, "")); + } + public boolean updateData() { finalList.clear(); for (LocalMedia media : mData) { diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SbxjcjsbActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SbxjcjsbActivity.java index 19b3af3..9a4250c 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SbxjcjsbActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SbxjcjsbActivity.java @@ -5,6 +5,7 @@ import android.content.ContentValues; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; +import android.os.Handler; import android.util.Log; import android.view.KeyEvent; import android.view.View; @@ -310,6 +311,33 @@ public class SbxjcjsbActivity extends BaseActivity { //更新编辑的内容 updateItem(xjcjFragment.getCJJG(), item - 1); } + + if(xsjjhDataBeanArrayList!=null&&xsjjhDataBeanArrayList.size()==1){ + //只有一条数据 + if(item==xsjjhDataBeanArrayList.size()){ + Handler handler = new Handler(); + handler.postDelayed(new Runnable(){ + @Override + public void run() { + finish(); + } + }, 2000); + } + } + if(xsjjhDataBeanArrayList!=null&&xsjjhDataBeanArrayList.size()>1){ + //有多条数据 + //只有一条数据 + if(item==xsjjhDataBeanArrayList.size()){ + Handler handler = new Handler(); + handler.postDelayed(new Runnable(){ + @Override + public void run() { + finish(); + } + }, 2000); + } + } + } else { showToast("没有采集结果"); } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SxgzActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SxgzActivity.java index d0ba70f..7054ca4 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SxgzActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/SxgzActivity.java @@ -419,7 +419,7 @@ public class SxgzActivity extends BaseActivity { public void handleNfc(String result) { // result = "045997529E0F91"; - //result = "04818DEAC21B91"; + result = "043F9CEAC21B91"; if(TextUtils.isEmpty(result)){ return; diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java index 235ab63..f1f4706 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java @@ -24,6 +24,7 @@ import com.rehome.dywoa.DBModel.XjjhList; import com.rehome.dywoa.R; import com.rehome.dywoa.bean.GridViewBean; import com.rehome.dywoa.bean.XsRequestInfo; +import com.rehome.dywoa.ui.activity.sbxdjgl.SQxgdlrfActivity; import com.rehome.dywoa.utils.GsonUtils; import com.rehome.dywoa.utils.HttpListener; import com.rehome.dywoa.utils.NoProgresshttpUtils; @@ -50,9 +51,9 @@ public class XscbglActivity extends BaseActivity2 { private String username; - private String[] str = {"待办任务", "巡检工作", "读取NFC数据"}; - private int[] imageId = {R.mipmap.icon_xs1, R.mipmap.icon6, R.mipmap.icon11}; - private int[] colors = {R.drawable.radius_b1, R.drawable.radius_a4, R.drawable.radius_d1}; + private String[] str = {"待办任务", "巡检工作", "读取NFC数据", "缺陷工单录入"}; + private int[] imageId = {R.mipmap.icon_xs1, R.mipmap.icon6, R.mipmap.icon11, R.drawable.icon15}; + private int[] colors = {R.drawable.radius_b1, R.drawable.radius_a4, R.drawable.radius_d1, R.drawable.radius_e4}; private GridViewAdapter adapter; private BroadcastReceiver myReceiver = new BroadcastReceiver() { @@ -111,6 +112,10 @@ public class XscbglActivity extends BaseActivity2 { intent = new Intent(XscbglActivity.this, NFCInfoActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); break; + case 3: + intent = new Intent(XscbglActivity.this, SQxgdlrfActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); + break; } if (intent != null) { startActivity(intent); diff --git a/app/src/main/res/drawable/radius_e4.xml b/app/src/main/res/drawable/radius_e4.xml new file mode 100755 index 0000000..f57a51c --- /dev/null +++ b/app/src/main/res/drawable/radius_e4.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_kks_search.xml b/app/src/main/res/layout/activity_kks_search.xml index 8e29239..cd955d1 100644 --- a/app/src/main/res/layout/activity_kks_search.xml +++ b/app/src/main/res/layout/activity_kks_search.xml @@ -86,6 +86,36 @@ android:textColor="@color/black" android:textSize="18sp"/> + + + + + + + + diff --git a/app/src/main/res/layout/adapter_kks_search_gong_dan.xml b/app/src/main/res/layout/adapter_kks_search_gong_dan.xml index b0069fe..c498223 100644 --- a/app/src/main/res/layout/adapter_kks_search_gong_dan.xml +++ b/app/src/main/res/layout/adapter_kks_search_gong_dan.xml @@ -101,7 +101,7 @@ style="@style/dagerDetailLeftStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="漏检点数:" /> + android:text="缺陷编号:" />