diff --git a/BHDXJ/app/src/main/AndroidManifest.xml b/BHDXJ/app/src/main/AndroidManifest.xml
index 3aa97fe..0f9526b 100755
--- a/BHDXJ/app/src/main/AndroidManifest.xml
+++ b/BHDXJ/app/src/main/AndroidManifest.xml
@@ -76,9 +76,8 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
-
+
+
+
+
call, Response response) {
JzBean bean1 = response.body();
+ showLog(GsonUtils.GsonString(bean1));
if (bean1 != null) {
JzDatas.clear();
JzDatas.addAll(bean1.getResult());
+ showLog(GsonUtils.GsonString(JzDatas));
initJZdatas();
}
diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt
index efcf5f0..7b6d99a 100644
--- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt
+++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt
@@ -1,35 +1,51 @@
package com.rehome.bhdxj.activity
-import android.os.Bundle
+import android.content.Intent
import android.text.TextUtils
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.rehome.bhdxj.R
+import android.view.View
import com.rehome.bhdxj.base.BaseActivityOaToolbarViewBinding
+import com.rehome.bhdxj.bean.ZyNewBean
import com.rehome.bhdxj.contans.Contans
import com.rehome.bhdxj.databinding.ActivityQxgdNewBinding
import com.rehome.bhdxj.utils.GsonUtils
-import com.rehome.bhdxj.utils.OAToolbar
+import com.rehome.bhdxj.utils.HttpListener
+import com.rehome.bhdxj.utils.NohttpUtils
import com.rehome.bhdxj.utils.RSAUtils
import com.rehome.bhdxj.utils.SPUtils
+import com.rehome.bhdxj.weight.ListDialog
import com.yolanda.nohttp.NoHttp
import com.yolanda.nohttp.RequestMethod
import com.yolanda.nohttp.rest.OnResponseListener
import com.yolanda.nohttp.rest.RequestQueue
import com.yolanda.nohttp.rest.Response
-import org.litepal.crud.DataSupport
class QxgdNewActivity : BaseActivityOaToolbarViewBinding() {
private lateinit var queueNoHttp: RequestQueue
private lateinit var username: String
private lateinit var usernames: String
+ private val jzList: MutableList = mutableListOf()
+ private val zyList: MutableList = mutableListOf()
+ private val gzlxList: MutableList = mutableListOf()
+ private val gdjbList: MutableList = mutableListOf()
+// private val zyList: MutableList = mutableListOf()
+// private val zyList: MutableList = mutableListOf()
+
+
+
+ private val jzDialogDatas: MutableList = mutableListOf()
+ private val zyDialogDatas: MutableList = mutableListOf()
+ private val gzlxDialogDatas: MutableList = mutableListOf()
+ private val gdjbDialogDatas: MutableList = mutableListOf()
+
+ private var jzValue: String? = null
+ private var zyValue: kotlin.String? = null
+ private var lxvalue: kotlin.String? = null
+ private var qxdjValue: kotlin.String? = null
override fun getViewBinding() = ActivityQxgdNewBinding.inflate(layoutInflater)
- override fun getToolbar()= binding.toolbarView.toolbar
+ override fun getToolbar() = binding.toolbarView.toolbar
override fun initView() {
initToolbar("缺陷工单提交", "提交") {
@@ -44,19 +60,118 @@ class QxgdNewActivity : BaseActivityOaToolbarViewBinding
username = ""
}
usernames = SPUtils.get(this, Contans.USERNAME, "") as String
+ if(!TextUtils.isEmpty(usernames)){
+ binding.ilFxr.content = usernames
+ }
+
+ binding.etQxms.setContentTextSize(54)
+
+ binding.ilJz.setOnClickListener(View.OnClickListener { v: View? ->
+ val dialog = ListDialog(
+ context, jzDialogDatas
+ ) { _: String?, position: Int ->
+ jzValue = jzList[position].value
+ binding.ilJz.content = jzList[position].description
+ }
+ dialog.show()
+ })
+
+ binding.ilZy.setOnClickListener(View.OnClickListener { v: View? ->
+ val dialog = ListDialog(
+ context, zyDialogDatas
+ ) { _: String?, position: Int ->
+ zyValue = zyList[position].value
+ binding.ilZy.content = zyList[position].description
+ }
+ dialog.show()
+ })
+
+ binding.ilQxlx.setOnClickListener(View.OnClickListener { v: View? ->
+ val dialog = ListDialog(
+ context, gzlxDialogDatas
+ ) { _: String?, position: Int ->
+ lxvalue = gzlxList[position].value
+ binding.ilQxlx.content = gzlxList[position].description
+ }
+ dialog.show()
+ })
+
+ binding.ilQxdj.setOnClickListener(View.OnClickListener { v: View? ->
+ val dialog = ListDialog(
+ context, gdjbDialogDatas
+ ) { _: String?, position: Int ->
+ qxdjValue = gdjbList[position].value
+ binding.ilQxdj.content = gdjbList[position].description
+ }
+ dialog.show()
+ })
+
+ binding.ilWz.setOnClickListener(View.OnClickListener { v: View? ->
+ val intent = Intent(context, QxgdSearchAddressActivity::class.java)
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+ startActivity(intent)
+ })
+
+
}
override fun initData() {
- //缺陷工单下拉数据
- getZyDropDown();
+ //检查网络连接
+ checkConnectServer()
+ }
+
+ private fun initJZdatas() {
+ jzDialogDatas.clear()
+ for (bean in jzList) {
+ jzDialogDatas.add(bean.description)
+ }
+ }
+
+ private fun initZYdatas() {
+ zyDialogDatas.clear()
+ for (bean in zyList) {
+ zyDialogDatas.add(bean.description)
+ }
+ }
+ private fun initLXdatas() {
+ gzlxDialogDatas.clear()
+ for (bean in gzlxList) {
+ gzlxDialogDatas.add(bean.description)
+ }
+ }
+
+ private fun initQXDJdatas() {
+ gdjbDialogDatas.clear()
+ for (bean in gdjbList) {
+ gdjbDialogDatas.add(bean.description)
+ }
}
- private fun getZyDropDown() {
+ private fun getDropDown(type:String) {
var param = HashMap()
- param["action"] = "QXGD_ZY_GET";
+ if(type=="jz"){
+ //机组
+ param["action"] = "QXGD_JZ_GET";
+ }else if(type=="zy"){
+ //专业
+ param["action"] = "QXGD_ZY_GET";
+ }else if(type=="gdjb"){
+ //工单级别
+ param["action"] = "QXGD_QXDJ_GET";
+ }else if(type=="gzlx"){
+ //工作类型
+ param["action"] = "QXGD_GZLX_GET";
+ }else if(type=="gzlb"){
+ //故障类别
+ param["action"] = "QXGD_GZLB_GET";
+ }else if(type=="gzxx"){
+ //故障现象
+ param["action"] = "QXGD_GZXX_GET";
+ }
+
val json = GsonUtils.GsonString(param)
@@ -73,6 +188,45 @@ class QxgdNewActivity : BaseActivityOaToolbarViewBinding
override fun onSucceed(what: Int, response: Response?) {
val result = response?.get()
showLog(result)
+
+ val bean = GsonUtils.GsonToBean(
+ result,
+ ZyNewBean::class.java
+ )
+ if (bean != null && bean.state == 1 && bean.data != null&& bean.data.size>0) {
+
+ if(type=="jz"){
+ //机组
+ showLog("机组")
+ jzList.clear()
+ jzList.addAll(bean.data)
+ initJZdatas()
+ }else if(type=="zy"){
+ //专业
+ showLog("专业")
+ zyList.clear()
+ zyList.addAll(bean.data)
+ initZYdatas()
+ }else if(type=="gdjb"){
+ //工单级别
+ showLog("工单级别")
+ gdjbList.clear()
+ gdjbList.addAll(bean.data)
+ initQXDJdatas()
+ }else if(type=="gzlx"){
+ //工作类型
+ showLog("工作类型")
+ gzlxList.clear()
+ gzlxList.addAll(bean.data)
+ initLXdatas()
+ }else if(type=="gzlb"){
+ //故障类别
+ showLog("故障类别")
+ }else if(type=="gzxx"){
+ //故障现象
+ showLog("故障现象")
+ }
+ }
/**
* {"state": 1,"msg":"查询成功","data":[
* {"description":"保卫","value":"保卫"},
@@ -136,4 +290,114 @@ class QxgdNewActivity : BaseActivityOaToolbarViewBinding
})
}
+
+ private fun checkConnectServer() {
+ var param = HashMap()
+ val json = GsonUtils.GsonString(param)
+ val url = Contans.MAXIMOIP + Contans.check_server_connect
+ showLog(url)
+ showLog(json)
+ val request = NoHttp.createStringRequest(
+ url,
+ RequestMethod.POST
+ )
+ request.setDefineRequestBodyForJson(json)
+ NohttpUtils.getInstance().add(this, 0, request, object : HttpListener {
+ override fun onSucceed(what: Int, response: Response?) {
+ val result = response?.get()
+ if (result != null) {
+ showLog("-----checkConnectServer onSucceed----")
+ showLog(result)
+ if(result == "1"){
+ showLog("connect server success")
+ //缺陷工单下拉数据
+ //机组
+ getDropDown("jz")
+ //专业
+ getDropDown("zy")
+ //工单级别
+ getDropDown("gdjb")
+ //工作类型
+ getDropDown("gzlx")
+ }else{
+ showToast("无法连接到服务器，请检查网络环境")
+ }
+ }
+ }
+
+ override fun onFailed(what: Int, response: Response?) {
+ showLog("connect server onFailed")
+ showToast("无法连接到服务器，请检查网络环境")
+ }
+ }, true, true, "连接服务器...")
+ }
+
+ private fun checkConnectServerGzlb() {
+ var param = HashMap()
+ val json = GsonUtils.GsonString(param)
+ val url = Contans.MAXIMOIP + Contans.check_server_connect
+ showLog(url)
+ showLog(json)
+ val request = NoHttp.createStringRequest(
+ url,
+ RequestMethod.POST
+ )
+ request.setDefineRequestBodyForJson(json)
+ NohttpUtils.getInstance().add(this, 0, request, object : HttpListener {
+ override fun onSucceed(what: Int, response: Response?) {
+ val result = response?.get()
+ if (result != null) {
+ showLog("-----checkConnectServer onSucceed----")
+ showLog(result)
+ if(result == "1"){
+ showLog("connect server success")
+ //缺陷工单下拉数据
+ //故障类别
+ getDropDown("gzlb")
+ }else{
+ showToast("无法连接到服务器，请检查网络环境")
+ }
+ }
+ }
+
+ override fun onFailed(what: Int, response: Response?) {
+ showLog("connect server onFailed")
+ showToast("无法连接到服务器，请检查网络环境")
+ }
+ }, true, true, "连接服务器...")
+ }
+ private fun checkConnectServerGzxx() {
+ var param = HashMap()
+ val json = GsonUtils.GsonString(param)
+ val url = Contans.MAXIMOIP + Contans.check_server_connect
+ showLog(url)
+ showLog(json)
+ val request = NoHttp.createStringRequest(
+ url,
+ RequestMethod.POST
+ )
+ request.setDefineRequestBodyForJson(json)
+ NohttpUtils.getInstance().add(this, 0, request, object : HttpListener {
+ override fun onSucceed(what: Int, response: Response?) {
+ val result = response?.get()
+ if (result != null) {
+ showLog("-----checkConnectServer onSucceed----")
+ showLog(result)
+ if(result == "1"){
+ showLog("connect server success")
+ //缺陷工单下拉数据
+ //故障现象
+ getDropDown("gzxx")
+ }else{
+ showToast("无法连接到服务器，请检查网络环境")
+ }
+ }
+ }
+
+ override fun onFailed(what: Int, response: Response?) {
+ showLog("connect server onFailed")
+ showToast("无法连接到服务器，请检查网络环境")
+ }
+ }, true, true, "连接服务器...")
+ }
}
\ No newline at end of file
diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdSearchAddressActivity.kt b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdSearchAddressActivity.kt
new file mode 100644
index 0000000..a6695bb
--- /dev/null
+++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdSearchAddressActivity.kt
@@ -0,0 +1,28 @@
+package com.rehome.bhdxj.activity
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.rehome.bhdxj.R
+import com.rehome.bhdxj.base.BaseActivityOaToolbarViewBinding
+import com.rehome.bhdxj.databinding.ActivityQxgdSearchAddressBinding
+import com.rehome.bhdxj.utils.OAToolbar
+
+class QxgdSearchAddressActivity : BaseActivityOaToolbarViewBinding() {
+ override fun getViewBinding() = ActivityQxgdSearchAddressBinding.inflate(layoutInflater)
+
+ override fun getToolbar() = binding.toolbarView.toolbar
+
+ override fun initView() {
+ initToolbar("选择位置", "") {
+
+ }
+ }
+
+ override fun initData() {
+
+ }
+
+}
\ No newline at end of file
diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/bean/ZyNewBean.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/bean/ZyNewBean.java
new file mode 100644
index 0000000..89d14a9
--- /dev/null
+++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/bean/ZyNewBean.java
@@ -0,0 +1,57 @@
+package com.rehome.bhdxj.bean;
+
+import android.os.Parcelable;
+
+import java.util.List;
+
+public class ZyNewBean {
+
+ private int state;
+ private String msg;
+ private List data;
+
+ public int getState() {
+ return state;
+ }
+
+ public void setState(int state) {
+ this.state = state;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+
+ public static class DataBean {
+ private String description;
+ private String value;
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+ }
+}
diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java
index 6bf73a0..ad1d926 100755
--- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java
+++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java
@@ -6,12 +6,13 @@ public class Contans {
public static String LOGIN = "AppLogin/GetData.aspx";
public static String CHECK_UPDATA_APK = "ApkUpdate/GetData.aspx";
// public static String IP = "http://10.46.0.164:8002/";
- //public static String MAXIMOIP = "http://10.46.0.152:7001/";
// public static String MAXIMOIP = "http://10.46.0.15:7001/";
+
public static String IP = "http://10.46.0.164:8003/";
public static String MAXIMOIP = "http://10.46.0.164:8003/";
+ // public static String MAXIMOIP = "http://10.46.0.152:7001/";
// public static String IP = "http://192.168.2.116:3028/";
@@ -26,6 +27,8 @@ public class Contans {
//缺陷工单专业下拉
public static String QX_GET_ZY_DROP = "QXGD/QXGD_JCSJ.ashx";
+ //连接服务器测试，看客户端是否能连接到服务器，如果能就响应个1
+ public static final String check_server_connect = "WL/WLPD.ashx";
//-----------------------点检--------------------------//
public static String DJJHLIST = "DJGL/DJGL_GWDJ.ashx";//prame BZMC = 测试班组
diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/weight/ListDialog.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/weight/ListDialog.java
index 91c23c5..f287943 100755
--- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/weight/ListDialog.java
+++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/weight/ListDialog.java
@@ -43,6 +43,7 @@ public class ListDialog extends Dialog {
Window window = getWindow();
WindowManager.LayoutParams lp = window.getAttributes();
lp.width = (getScreenWidth(context)) * 2 / 3;
+ lp.height = (getScreenHigh(context)) * 2 / 3;
window.setGravity(Gravity.CENTER);
this.datas = datas;
@@ -99,6 +100,13 @@ public class ListDialog extends Dialog {
Display display = manager.getDefaultDisplay();
return display.getWidth();
}
+ //获取屏幕宽度
+ public static int getScreenHigh(Context context) {
+ WindowManager manager = (WindowManager) context
+ .getSystemService(Context.WINDOW_SERVICE);
+ Display display = manager.getDefaultDisplay();
+ return display.getHeight();
+ }
public interface ListDialogListener {
void selectText(String text, int position);
diff --git a/BHDXJ/app/src/main/res/drawable/bg_edittext_search_device.xml b/BHDXJ/app/src/main/res/drawable/bg_edittext_search_device.xml
new file mode 100644
index 0000000..a789c54
--- /dev/null
+++ b/BHDXJ/app/src/main/res/drawable/bg_edittext_search_device.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BHDXJ/app/src/main/res/layout/activity_qxgd_new.xml b/BHDXJ/app/src/main/res/layout/activity_qxgd_new.xml
index 1ac3175..db1a600 100644
--- a/BHDXJ/app/src/main/res/layout/activity_qxgd_new.xml
+++ b/BHDXJ/app/src/main/res/layout/activity_qxgd_new.xml
@@ -40,86 +40,85 @@
+ app:tv_title="机组" />
+ app:tv_title="专业" />
+ app:tv_title="工作类型" />
-
-
+ app:tv_title="工单级别" />
-
+ app:tv_title="位置" />
+ app:tv_title="设备" />
+
+
-
-
-
-
diff --git a/BHDXJ/app/src/main/res/layout/activity_qxgd_search_address.xml b/BHDXJ/app/src/main/res/layout/activity_qxgd_search_address.xml
new file mode 100644
index 0000000..46a6d0f
--- /dev/null
+++ b/BHDXJ/app/src/main/res/layout/activity_qxgd_search_address.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BHDXJ/app/src/main/res/layout/layout_take_out_time.xml b/BHDXJ/app/src/main/res/layout/layout_take_out_time.xml
index 1a2c748..ada9d4f 100755
--- a/BHDXJ/app/src/main/res/layout/layout_take_out_time.xml
+++ b/BHDXJ/app/src/main/res/layout/layout_take_out_time.xml
@@ -26,10 +26,15 @@
android:background="@color/gray" />
-
+ android:layout_height="match_parent"
+ android:scrollbars="vertical">
+
+
\ No newline at end of file
diff --git a/BHDXJ/app/src/main/res/values/styles.xml b/BHDXJ/app/src/main/res/values/styles.xml
index 22d23f4..7f1b17c 100755
--- a/BHDXJ/app/src/main/res/values/styles.xml
+++ b/BHDXJ/app/src/main/res/values/styles.xml
@@ -62,7 +62,7 @@
@@ -109,4 +109,11 @@
- 8dp
+
+