From dc4e57793420f82b2d3488eb36513e97da4901d5 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Fri, 9 Aug 2024 18:35:47 +0800 Subject: [PATCH] =?UTF-8?q?1.1.3=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.1.3发布 --- app/src/main/AndroidManifest.xml | 6 +- app/src/main/assets/litepal.xml | 2 +- .../main/java/com/rehome/dywoa/Contans.java | 28 ++- .../com/rehome/dywoa/DBModel/DjjhRwQy.java | 24 ++- .../rehome/dywoa/adapter/YjyaListAdapter.kt | 41 +++++ .../com/rehome/dywoa/bean/YjyaListBean.java | 83 +++++++++ .../com/rehome/dywoa/entity/ScDjjhInfo.java | 9 + .../rehome/dywoa/ui/activity/HomeActivity.kt | 1 + .../rehome/dywoa/ui/activity/LoginActivity.kt | 4 +- .../dywoa/ui/activity/UseCarActivity.kt | 5 +- .../dywoa/ui/activity/UseSealActivity.kt | 6 +- .../rehome/dywoa/ui/activity/YjyaActivity.kt | 133 ++++++++++++++ .../dywoa/ui/activity/sbxdjgl/CJFragment.java | 118 ++++++++++--- .../ui/activity/sbxdjgl/DjdscFragment.java | 29 +++- .../ui/activity/sbxdjgl/SdjgzActivity.java | 2 +- .../ui/activity/sbxdjgl/SjcjFragment.java | 89 +++------- .../dywoa/ui/activity/sbxdjgl/WjFragment.java | 54 +++--- .../dywoa/ui/activity/sbxj/SxgzActivity.java | 2 +- .../ui/activity/vpn/PrimaryAuthActivity.java | 17 +- .../dywoa/ui/fragment/HomeFragment.java | 54 ++++-- .../dywoa/ui/fragment/MineFragment.java | 2 +- app/src/main/res/drawable-xhdpi/icon_yjya.png | Bin 0 -> 2338 bytes .../main/res/drawable-xxhdpi/icon_yjya.png | Bin 0 -> 3354 bytes .../main/res/drawable-xxxhdpi/icon_yjya.png | Bin 0 -> 4511 bytes app/src/main/res/layout/activity_yjya.xml | 36 ++++ app/src/main/res/layout/adapter_yjya_list.xml | 162 ++++++++++++++++++ app/src/main/res/layout/fragment_cj.xml | 94 +++++++--- app/src/main/res/layout/fragment_home.xml | 1 + app/src/main/res/layout/fragment_mine.xml | 7 +- app/src/main/res/layout/item_content.xml | 3 +- .../main/res/layout/layout_take_out_time.xml | 3 +- 31 files changed, 824 insertions(+), 191 deletions(-) create mode 100644 app/src/main/java/com/rehome/dywoa/adapter/YjyaListAdapter.kt create mode 100644 app/src/main/java/com/rehome/dywoa/bean/YjyaListBean.java create mode 100644 app/src/main/java/com/rehome/dywoa/ui/activity/YjyaActivity.kt create mode 100644 app/src/main/res/drawable-xhdpi/icon_yjya.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_yjya.png create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_yjya.png create mode 100644 app/src/main/res/layout/activity_yjya.xml create mode 100644 app/src/main/res/layout/adapter_yjya_list.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 23f694e..7a73dc0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -78,7 +78,6 @@ tools:replace="android:allowBackup" tools:targetApi="s"> - + - + diff --git a/app/src/main/java/com/rehome/dywoa/Contans.java b/app/src/main/java/com/rehome/dywoa/Contans.java index 2d7be0d..72adbf0 100644 --- a/app/src/main/java/com/rehome/dywoa/Contans.java +++ b/app/src/main/java/com/rehome/dywoa/Contans.java @@ -44,21 +44,31 @@ public class Contans { //APP登录接口厂内服务器IP - public static String IP = "http://10.25.188.126:8601/"; +// public static String IP = "http://10.25.188.126:8601/"; +// //app内网 +// public static String IP_INTRANET = "http://10.25.188.126:8601/"; +// //app外网 +// public static String IP_EXTRANET = "http://10.25.188.126:8601/"; +// //SIS系统厂内IP +// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; + + + + + //APP登录接口厂内服务器IP + public static String IP = "https://app.dywzhny.com.cn/"; //app内网 - public static String IP_INTRANET = "http://10.25.188.126:8601/"; + public static String IP_INTRANET = "https://app.dywzhny.com.cn/"; //app外网 - public static String IP_EXTRANET = "http://10.25.188.126:8601/"; + public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; //SIS系统厂内IP public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; - - //APP登录接口厂内服务器IP -// public static String IP = "https://app.dywzhny.com.cn/"; +// public static String IP = "https://oa.dywzhny.com.cn/"; // //app内网 -// public static String IP_INTRANET = "https://app.dywzhny.com.cn/"; +// public static String IP_INTRANET = "https://oa.dywzhny.com.cn/"; // //app外网 -// public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; +// public static String IP_EXTRANET = "https://oa.dywzhny.com.cn/"; // //SIS系统厂内IP // public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; @@ -90,6 +100,8 @@ public class Contans { public static final String GET_KKS_INFO = "api/app/pointTask/getDeviceInfo"; //KKS码查工单消缺 public static final String KKS_SEARCH_GDXQ = "api/app/pointTask/getDefectWorkOrderInfo"; + //获取应急预案 + public static final String YJYA_GET_LIST_TJ = "api/emergency/getPlan"; public static String YHPC = "AJH/AJH_YHPCSC.ashx";//隐患排查 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 73b4074..fe21519 100644 --- a/app/src/main/java/com/rehome/dywoa/DBModel/DjjhRwQy.java +++ b/app/src/main/java/com/rehome/dywoa/DBModel/DjjhRwQy.java @@ -32,6 +32,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable { private String MEAPOS; private String MEASTATUS; private String MEASTANDARD; + private String MEASTANDARDSELECT; private boolean checked;//是否已经检查 private String CJJG; private String fxnr; @@ -40,10 +41,11 @@ public class DjjhRwQy extends DataSupport implements Parcelable { private String JHDW; private boolean SMFX;//扫描方式，0 NFC 1 一维码二维码 private String AREACODE; - private String ASSETNUM;//设备编号 + private String ASSETNUM;//kks码 private boolean SBZT = true;// private String DATE;//保存时间 private boolean BYZT;//备用状态 + private String status;//设备状态： 0：停用 1:运行中 2:备用 //上传ID private String SCID; @@ -310,6 +312,14 @@ public class DjjhRwQy extends DataSupport implements Parcelable { this.MEASTANDARD = MEASTANDARD; } + public String getMEASTANDARDSELECT() { + return MEASTANDARDSELECT; + } + + public void setMEASTANDARDSELECT(String MEASTANDARDSELECT) { + this.MEASTANDARDSELECT = MEASTANDARDSELECT; + } + public String getSCID() { return SCID; } @@ -359,6 +369,14 @@ public class DjjhRwQy extends DataSupport implements Parcelable { this.second = second; } + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + public DjjhRwQy() { } @@ -389,6 +407,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable { dest.writeString(this.MEAPOS); dest.writeString(this.MEASTATUS); dest.writeString(this.MEASTANDARD); + dest.writeString(this.MEASTANDARDSELECT); dest.writeByte(this.checked ? (byte) 1 : (byte) 0); dest.writeString(this.CJJG); dest.writeString(this.fxnr); @@ -407,6 +426,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable { dest.writeString(this.txm); dest.writeString(this.username); dest.writeString(this.second); + dest.writeString(this.status); } protected DjjhRwQy(Parcel in) { @@ -430,6 +450,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable { this.MEAPOS = in.readString(); this.MEASTATUS = in.readString(); this.MEASTANDARD = in.readString(); + this.MEASTANDARDSELECT = in.readString(); this.checked = in.readByte() != 0; this.CJJG = in.readString(); this.fxnr = in.readString(); @@ -448,6 +469,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable { this.txm = in.readString(); this.username = in.readString(); this.second = in.readString(); + this.status = in.readString(); } public static final Creator CREATOR = new Creator() { diff --git a/app/src/main/java/com/rehome/dywoa/adapter/YjyaListAdapter.kt b/app/src/main/java/com/rehome/dywoa/adapter/YjyaListAdapter.kt new file mode 100644 index 0000000..e42a295 --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/adapter/YjyaListAdapter.kt @@ -0,0 +1,41 @@ +package com.rehome.dywoa.adapter + + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import com.rehome.dywoa.base.BaseViewBindingAdapter +import com.rehome.dywoa.bean.CurrentDayDjBean +import com.rehome.dywoa.bean.YjyaListBean +import com.rehome.dywoa.databinding.AdapterCurrentDayDjBinding +import com.rehome.dywoa.databinding.AdapterYjyaListBinding + +class YjyaListAdapter(var context: Context, + var data: MutableList) : BaseViewBindingAdapter(context) { + + override fun getCount(): Int { + return data.count() + } + + override fun getItem(position: Int): Any { + return data[position] + } + + override fun getItemId(position: Int): Long { + return position.toLong() + } + + override fun getBinding( + inflater: LayoutInflater, + parent: ViewGroup? + ) = AdapterYjyaListBinding.inflate(inflater, parent, false) + override fun handleData(position: Int, binding: AdapterYjyaListBinding) { + val item: YjyaListBean.Row = data[position] + binding.tvYamc.text = item.title + binding.tvType.text = item.type + binding.tvLevel.text = item.yadj + binding.tvZt.text = item.zt + binding.tvQdr.text = item.qdr + binding.tvEndDate.text = item.startDate + } +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/dywoa/bean/YjyaListBean.java b/app/src/main/java/com/rehome/dywoa/bean/YjyaListBean.java new file mode 100644 index 0000000..6cea6fe --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/bean/YjyaListBean.java @@ -0,0 +1,83 @@ +package com.rehome.dywoa.bean; + + +import java.util.List; + +public class YjyaListBean extends BaseListBean{ + + private List Rows; + + public List getRows() { + return Rows; + } + + public void setRows(List rows) { + Rows = rows; + } + + public static class Row { + private String ID; + private String TITLE; + private String ZT; + private String QDR; + private String TYPE; + private String YADJ; + private String startDate; + + public String getID() { + return ID; + } + + public void setID(String ID) { + this.ID = ID; + } + + public String getTITLE() { + return TITLE; + } + + public void setTITLE(String TITLE) { + this.TITLE = TITLE; + } + + public String getZT() { + return ZT; + } + + public void setZT(String ZT) { + this.ZT = ZT; + } + + public String getQDR() { + return QDR; + } + + public void setQDR(String QDR) { + this.QDR = QDR; + } + + public String getTYPE() { + return TYPE; + } + + public void setTYPE(String TYPE) { + this.TYPE = TYPE; + } + + public String getYADJ() { + return YADJ; + } + + public void setYADJ(String YADJ) { + this.YADJ = YADJ; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/dywoa/entity/ScDjjhInfo.java b/app/src/main/java/com/rehome/dywoa/entity/ScDjjhInfo.java index b2dbbe5..a289466 100644 --- a/app/src/main/java/com/rehome/dywoa/entity/ScDjjhInfo.java +++ b/app/src/main/java/com/rehome/dywoa/entity/ScDjjhInfo.java @@ -19,6 +19,7 @@ public class ScDjjhInfo { private String ASSETNUM; private String SBZT; + private String status; private String SCID; public String getASSETNUM() { @@ -117,4 +118,12 @@ public class ScDjjhInfo { public void setSCID(String SCID) { this.SCID = SCID; } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } } 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 7516cc9..4fee441 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 @@ -354,6 +354,7 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() { private fun checkUpdateApk() { val url = Contans.IP + Contans.CHECK_UPDATE_APK_URL + showLog(url) val appUpdateCommit = AppUpdateCommit() appUpdateCommit.type = "安卓" val json = GsonUtils.GsonString(appUpdateCommit) 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 4d5f47d..0379a21 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,7 +207,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("Wq248655") } - + //http://10.25.188.126:8600/apkFiles/release/dywoaapp.apk + //https://oa.dywzhny.com.cn/apkFiles/release/dywoaapp.apk binding.btnLogin.setOnClickListener(View.OnClickListener { @@ -408,6 +409,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { private fun checkUpdateApk() { val url = Contans.IP + Contans.CHECK_UPDATE_APK_URL + showLog(url) val appUpdateCommit = AppUpdateCommit() appUpdateCommit.type = "安卓" val json = GsonUtils.GsonString(appUpdateCommit) diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/UseCarActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/UseCarActivity.kt index 32a0604..cefb511 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/UseCarActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/UseCarActivity.kt @@ -84,6 +84,7 @@ class UseCarActivity : BaseAgentWebActivity() { mAgentWeb.webCreator.webView.settings.builtInZoomControls = true mAgentWeb.webCreator.webView.settings.displayZoomControls = false mAgentWeb.webCreator.webView.settings.setSupportZoom(true) + mAgentWeb.webCreator.webView.settings.cacheMode = WebSettings.LOAD_NO_CACHE checkServerConnectStatus() } @@ -91,10 +92,10 @@ class UseCarActivity : BaseAgentWebActivity() { private fun getSingleLoginToken() { - val url = Contans.IP + urlToken + App.getInstance().userInfo.manid; + var url = Contans.IP + urlToken + App.getInstance().userInfo.manid; - //url = Contans.IP + urlToken + "280846"; + //url = Contans.IP + urlToken + "832019"; val request = NoHttp.createStringRequest(url, RequestMethod.GET) showLog(url) diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/UseSealActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/UseSealActivity.kt index 320f9b9..e429908 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/UseSealActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/UseSealActivity.kt @@ -10,6 +10,7 @@ import android.util.Log import android.view.KeyEvent import android.view.View import android.view.ViewGroup +import android.webkit.WebSettings import android.webkit.WebView import android.widget.TextView import android.widget.Toast @@ -74,6 +75,7 @@ class UseSealActivity : BaseAgentWebActivity() { mAgentWeb.webCreator.webView.settings.builtInZoomControls = true mAgentWeb.webCreator.webView.settings.displayZoomControls = false mAgentWeb.webCreator.webView.settings.setSupportZoom(true) + mAgentWeb.webCreator.webView.settings.cacheMode = WebSettings.LOAD_NO_CACHE checkServerConnectStatus() } @@ -81,10 +83,10 @@ class UseSealActivity : BaseAgentWebActivity() { private fun getSingleLoginToken() { - val url = Contans.IP + urlToken + App.getInstance().userInfo.manid; + var url = Contans.IP + urlToken + App.getInstance().userInfo.manid; - //url = Contans.IP + urlToken + "280846"; + //url = Contans.IP + urlToken + "125106"; val request = NoHttp.createStringRequest(url, RequestMethod.GET) showLog(url) diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/YjyaActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/YjyaActivity.kt new file mode 100644 index 0000000..5e103cb --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/YjyaActivity.kt @@ -0,0 +1,133 @@ +package com.rehome.dywoa.ui.activity + +import android.os.Bundle +import android.util.Log +import android.view.View +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import com.rehome.dywoa.App +import com.rehome.dywoa.Contans +import com.rehome.dywoa.R +import com.rehome.dywoa.adapter.CurrentDayDjAdapter +import com.rehome.dywoa.adapter.YjyaListAdapter +import com.rehome.dywoa.base.BaseActivityOaToolbarViewBinding +import com.rehome.dywoa.bean.CurrentDayDjBean +import com.rehome.dywoa.bean.YjyaListBean +import com.rehome.dywoa.databinding.ActivityYjyaBinding +import com.rehome.dywoa.utils.GsonUtils +import com.rehome.dywoa.utils.HttpListener +import com.rehome.dywoa.utils.NoProgresshttpUtils +import com.rehome.dywoa.utils.NohttpUtils +import com.rehome.dywoa.weiget.OAToolbar +import com.yolanda.nohttp.NoHttp +import com.yolanda.nohttp.RequestMethod +import com.yolanda.nohttp.rest.Response + +class YjyaActivity : BaseActivityOaToolbarViewBinding() { + + private lateinit var adapter: YjyaListAdapter + private var datas: MutableList = mutableListOf() + private lateinit var username: String + + override fun getViewBinding() = ActivityYjyaBinding.inflate(layoutInflater) + + override fun getToolbar() = binding.toolbarView.toolbar + + override fun initView() { + + initToolbar("应急预案", "") { + + } + + username = App.getInstance().userInfo.manid + adapter = YjyaListAdapter(context, datas) + binding.lv.adapter = adapter + + binding.tvNodata.visibility= View.VISIBLE + binding.lv.visibility= View.GONE + + + } + + override fun initData() { + //检查服务器连接状态 + checkServerConnectStatus() + } + + //检查服务器连接状态 + private fun checkServerConnectStatus() { + var param = HashMap() + param["login"] = "dywoa"; + val json = GsonUtils.GsonString(param) + val url = Contans.IP + Contans.check_server_connect + Log.i("app",url) + Log.i("app",json) + val request = NoHttp.createStringRequest( + url, + RequestMethod.POST + ) + request.setDefineRequestBodyForJson(json) + NoProgresshttpUtils.getInstance().add(this, 0, request, object : HttpListener { + override fun onSucceed(what: Int, response: Response?) { + val result = response?.get() + if (result != null) { + showLog("-----onSucceed----") + showLog(result) + if(result == "1"){ + showLog("connect server success") + //获取数据 + getListData() + } + } + } + + override fun onFailed(what: Int, response: Response?) { + showLog("connect server onFailed") + showToast("无法连接到服务器，请检查网络环境") + } + }) + } + + fun getListData() { + + var param = HashMap() + //param["GH"] = username + param["GH"] = "sysadmin" + val json = GsonUtils.GsonString(param) + + val url: String = Contans.IP + Contans.YJYA_GET_LIST_TJ + 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?) { + if (response != null) { + val result = response.get() + showLog(result) + val bean = GsonUtils.GsonToBean(result, YjyaListBean::class.java) + if (bean != null && bean.total != 0) { + if (bean.rows != null && bean.rows.size>0) { + datas.clear() + datas.addAll(bean.rows) + adapter.notifyDataSetChanged() + binding.tvNodata.visibility= View.GONE + binding.lv.visibility=View.VISIBLE + }else { + datas.clear() + adapter.notifyDataSetChanged() + binding.tvNodata.visibility= View.VISIBLE + binding.lv.visibility=View.GONE + } + } + } + } + + override fun onFailed(what: Int, response: Response?) { + + } + + }, true, true, "正在加载数据...") + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java index 32abd31..68434fd 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/CJFragment.java @@ -3,6 +3,9 @@ package com.rehome.dywoa.ui.activity.sbxdjgl; import android.os.Bundle; import android.text.Editable; +import android.text.InputFilter; +import android.text.InputType; +import android.text.Spanned; import android.text.TextUtils; import android.text.TextWatcher; import android.view.View; @@ -17,6 +20,12 @@ import com.rehome.dywoa.DBModel.DjjhRwQy; import com.rehome.dywoa.R; import com.rehome.dywoa.base.BaseFragment; import com.rehome.dywoa.utils.UiUtlis; +import com.rehome.dywoa.weiget.ListDialog; + +import java.util.Arrays; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Created by ruihong on 2017/10/30. @@ -44,9 +53,12 @@ public class CJFragment extends BaseFragment { RadioGroup rg; RadioButton rb3; TextView tv_bz; - Button btn_next; + TextView tv_kks; + //Button btn_next; + Button btn_selectCheckResult; LinearLayout ll_bz; + LinearLayout ll_et_jg; ScrollView sv; private boolean isEdit; @@ -87,6 +99,7 @@ public class CJFragment extends BaseFragment { } findView(); et_jg.setEnabled(isEdit); + btn_selectCheckResult.setEnabled(isEdit); et_jg.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -123,26 +136,43 @@ public class CJFragment extends BaseFragment { tv_dw = view.findViewById(R.id.tv_dw); etFxnr = view.findViewById(R.id.et_fxnr); llFxnr = view.findViewById(R.id.ll_fxnr); + tv_kks = view.findViewById(R.id.tv_kks); rb1 = view.findViewById(R.id.rb1); rb2 = view.findViewById(R.id.rb2); rb3 = view.findViewById(R.id.rb3); rg = view.findViewById(R.id.rg); tv_bz = view.findViewById(R.id.tv_bz); - btn_next = view.findViewById(R.id.btn_next); + //btn_next = view.findViewById(R.id.btn_next); + btn_selectCheckResult = view.findViewById(R.id.btn_selectCheckResult); ll_bz = view.findViewById(R.id.ll_bz); + ll_et_jg = view.findViewById(R.id.ll_et_jg); sv = view.findViewById(R.id.sv); - btn_next.setOnClickListener(new View.OnClickListener() { +// btn_next.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// //下一条 +// if (getActivity() instanceof ScjsjActivity) { +// ScjsjActivity activity = (ScjsjActivity) getActivity(); +// activity.getSjcjNext(); +// } +// if (getActivity() instanceof AjhAndSbjdActivity) { +// AjhAndSbjdActivity activity = (AjhAndSbjdActivity) getActivity(); +// activity.getSjcjNext(); +// } +// } +// }); + btn_selectCheckResult.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - //下一条 - if (getActivity() instanceof ScjsjActivity) { - ScjsjActivity activity = (ScjsjActivity) getActivity(); - activity.getSjcjNext(); - } - if (getActivity() instanceof AjhAndSbjdActivity) { - AjhAndSbjdActivity activity = (AjhAndSbjdActivity) getActivity(); - activity.getSjcjNext(); - } + ListDialog dialog = new ListDialog(context, stringToList(info.getMEASTANDARDSELECT()), new ListDialog.ListDialogListener() { + + @Override + public void selectText(String text, int position) { + btn_selectCheckResult.setText(text); + et_jg.setText(text); + } + }); + dialog.show(); } }); } @@ -185,6 +215,8 @@ public class CJFragment extends BaseFragment { * 更新数据 */ public void updata(DjjhRwQy info, int item, int size) { + this.info = info; + btn_selectCheckResult.setText("点击选择采集结果"); tv_dmc.setText(info.getPOINTNAME()); tv_ff.setText(info.getMEAMETHOD()); tv_bw.setText(info.getMEAPOS()); @@ -201,6 +233,12 @@ public class CJFragment extends BaseFragment { tv_dw.setText(info.getUNITOFMEASURE()); etFxnr.setText(info.getFxnr()); tv_bz.setText(info.getMEASTANDARD()); + if(TextUtils.isEmpty(info.getASSETNUM())){ + tv_kks.setText(""); + }else{ + tv_kks.setText(info.getASSETNUM()); + } + if(!TextUtils.isEmpty(info.getUNITOFMEASURE())){ tv_dw.setVisibility(View.VISIBLE); @@ -210,24 +248,55 @@ public class CJFragment extends BaseFragment { if(!TextUtils.isEmpty(info.getMEAMETHOD())){ if(info.getMEAMETHOD().equals("抄表")){ + //android:digits="0123456789.-" ll_bz.setVisibility(View.GONE); + tv_dw.setVisibility(View.VISIBLE); + ll_et_jg.setVisibility(View.VISIBLE); + btn_selectCheckResult.setVisibility(View.GONE); + //et_jg.setText("正常"); }else{ - ll_bz.setVisibility(View.VISIBLE); + ll_bz.setVisibility(View.GONE); tv_dw.setVisibility(View.GONE); + ll_et_jg.setVisibility(View.GONE); + btn_selectCheckResult.setVisibility(View.VISIBLE); + et_jg.setInputType(InputType.TYPE_CLASS_TEXT); } } if (info.isChecked()) { - if (info.isBYZT()) { - rb3.setChecked(true); - rb1.setChecked(false); - rb2.setChecked(false); - } else { - rb1.setChecked(info.isSBZT()); - rb2.setChecked(!rb1.isChecked()); - rb3.setChecked(false); + if(!TextUtils.isEmpty(info.getStatus())){ + if(info.getStatus().equals("0")){ + //停用 + rb1.setChecked(false); + rb2.setChecked(true); + rb3.setChecked(false); + } + if(info.getStatus().equals("1")){ + //运行 + rb1.setChecked(true); + rb2.setChecked(false); + rb3.setChecked(false); + } + if(info.getStatus().equals("2")){ + //备用 + rb1.setChecked(false); + rb2.setChecked(false); + rb3.setChecked(true); + } + } +// if (info.isBYZT()) { +// rb3.setChecked(true); +// rb1.setChecked(false); +// rb2.setChecked(false); +// } else { +// rb1.setChecked(info.isSBZT()); +// rb2.setChecked(!rb1.isChecked()); +// rb3.setChecked(false); +// } + if(!TextUtils.isEmpty(info.getCJJG())){ + btn_selectCheckResult.setText(info.getCJJG()); } } else { rb1.setChecked(true); @@ -281,7 +350,7 @@ public class CJFragment extends BaseFragment { } else if (rb2.isChecked()) { flag = false; } else if (rb3.isChecked()) { - flag = true; + flag = false; } return flag; } @@ -289,4 +358,9 @@ public class CJFragment extends BaseFragment { public boolean getRB3() { return rb3.isChecked(); } + + private List stringToList(String strs) { + String str[] = strs.split(";"); + return Arrays.asList(str); + } } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/DjdscFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/DjdscFragment.java index 21e87a0..31d3529 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/DjdscFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/DjdscFragment.java @@ -4,6 +4,7 @@ package com.rehome.dywoa.ui.activity.sbxdjgl; import android.content.ContentValues; import android.content.DialogInterface; import android.content.Intent; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -430,7 +431,7 @@ public class DjdscFragment extends BaseFragment { } - queue.add(0, request, new HttpResponseListener<>(getActivity(), request, callback, false, false, "")); + queue.add(0, request, new HttpResponseListener<>(getActivity(), request, callback, true, false, "")); } @@ -511,11 +512,29 @@ public class DjdscFragment extends BaseFragment { info.setFxnr(rwqy.getFxnr() == null ? "" : rwqy.getFxnr()); info.setSmfx(rwqy.isSMFX() ? "QRCode" : "NFC"); info.setASSETNUM(rwqy.getASSETNUM()); - if (!rwqy.isBYZT()) { - info.setSBZT(rwqy.isSBZT() ? (1 + "") : (0 + "")); - } else { - info.setSBZT("2"); + info.setSBZT("1"); + info.setStatus("1"); + + if(!TextUtils.isEmpty(rwqy.getStatus())){ + if(rwqy.getStatus().equals("0")){ + info.setStatus("0"); + if(TextUtils.isEmpty(rwqy.getCJJG())){ + info.setCjjg("停用"); + } + } + if(rwqy.getStatus().equals("2")){ + info.setStatus("2"); + if(TextUtils.isEmpty(rwqy.getCJJG())){ + info.setCjjg("备用"); + } + } } + +// if (!rwqy.isBYZT()) { +// info.setSBZT(rwqy.isSBZT() ? (1 + "") : (0 + "")); +// } else { +// info.setSBZT("1"); +// } scs.add(info); } String json = "{\"Rows\":" + GsonUtils.GsonString(scs) + ",\"Total\": " + scs.size() + "}"; diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java index 6667145..f233bf3 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SdjgzActivity.java @@ -418,7 +418,7 @@ public class SdjgzActivity extends BaseActivity { public void handleNfc(String result) { //super.handleNfc(result); // tvNodata.setText(result); - //result = "04D49CEAC21B90"; + //result = "04351EEA211991"; if (list.size() != 0) { showLog("--------"); showLog(GsonUtils.GsonString(list)); diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java index 7834c75..7092c41 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SjcjFragment.java @@ -87,7 +87,7 @@ public class SjcjFragment extends BaseFragment { public void onClick(View v) { Intent intent = new Intent(requireActivity(), SQxgdlrfActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); - if(!TextUtils.isEmpty(lists.get(item - 1).getASSETNUM())){ + if (!TextUtils.isEmpty(lists.get(item - 1).getASSETNUM())) { intent.putExtra("kks", lists.get(item - 1).getASSETNUM()); } startActivity(intent); @@ -274,7 +274,7 @@ public class SjcjFragment extends BaseFragment { values.put("checked", true); values.put("CJJG", cj.getCJJG()); values.put("fxnr", cj.getFxnr()); - values.put("byzt", cj.getRB3() ? 1 : 0); + values.put("status", "1"); values.put("date", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); //更新数据库数据 int i = DataSupport.updateAll(DjjhRwQy.class, values, "POINTNUM = ? and jhid = ? ", lists.get(item - 1).getPOINTNUM(), lists.get(item - 1).getJHID()); @@ -282,87 +282,38 @@ public class SjcjFragment extends BaseFragment { lists.get(item - 1).setChecked(true); lists.get(item - 1).setCJJG(cj.getCJJG()); lists.get(item - 1).setFxnr(cj.getFxnr()); - lists.get(item - 1).setBYZT(cj.getRB3()); + lists.get(item - 1).setStatus("1"); showToast("保存成功"); } } else { showToast("你没有数据采集结果"); } } else { - //停用被选中 - if (!cj.getCJJG().equals("")) { - ContentValues values = new ContentValues(); - values.put("checked", true); - values.put("CJJG", cj.getCJJG()); - values.put("fxnr", cj.getFxnr()); - values.put("byzt", cj.getRB3() ? 1 : 0); - values.put("sbzt", 0); - values.put("date", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - //更新数据库数据 - int i = DataSupport.updateAll(DjjhRwQy.class, values, "POINTNUM = ? and jhid = ? ", lists.get(item - 1).getPOINTNUM(), lists.get(item - 1).getJHID()); - if (i != 0) { - lists.get(item - 1).setChecked(true); - lists.get(item - 1).setCJJG(cj.getCJJG()); - lists.get(item - 1).setFxnr(cj.getFxnr()); - lists.get(item - 1).setBYZT(cj.getRB3()); - showToast("保存成功"); - } - } else { - showToast("你没有数据采集结果"); + //停用和备用被选中,可以不用填写采集结果 + ContentValues values = new ContentValues(); + values.put("checked", true); + values.put("CJJG", cj.getCJJG()); + values.put("fxnr", cj.getFxnr()); + values.put("status", cj.getRB3() ? "2" : "0"); + values.put("date", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + //更新数据库数据 + int i = DataSupport.updateAll(DjjhRwQy.class, values, "POINTNUM = ? and jhid = ? ", lists.get(item - 1).getPOINTNUM(), lists.get(item - 1).getJHID()); + + if (i != 0) { + lists.get(item - 1).setChecked(true); + lists.get(item - 1).setCJJG(cj.getCJJG()); + lists.get(item - 1).setFxnr(cj.getFxnr()); + lists.get(item - 1).setStatus(cj.getRB3() ? "2" : "0"); + showToast("保存成功"); } if (!TextUtils.isEmpty(lists.get(item - 1).getASSETNUM())) { //更新数据库数据,把相同kks码的数据设备状态改成停用 ContentValues valuesStop = new ContentValues(); - valuesStop.put("sbzt", 0); + valuesStop.put("status", cj.getRB3() ? "2" : "0"); DataSupport.updateAll(DjjhRwQy.class, valuesStop, "jhid = ? and assetnum = ?", lists.get(item - 1).getJHID(), lists.get(item - 1).getASSETNUM()); } -// List rwqys = new ArrayList<>(); -// //更新所有被停用的机器 -// for (DjjhRwQy qy : lists) { -// showLog("---------"); -// showLog(GsonUtils.GsonString(qy)); -// if (!TextUtils.isEmpty(qy.getASSETNUM())) { -// if (qy.getPOINTNUM().equals(lists.get(item - 1).getPOINTNUM())) { -// qy.setSBZT(false); -// qy.setChecked(true); -// rwqys.add(qy); -// } -// } -// } -// -// ContentValues values = new ContentValues(); -// values.put("checked", true); -// values.put("CJJG", cj.getCJJG()); -// values.put("fxnr", cj.getFxnr()); -// values.put("byzt", cj.getRB3() ? 1 : 0); -// values.put("sbzt", 0); -// values.put("date", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); -// -// //更新数据库数据 -// int i = DataSupport.updateAll(DjjhRwQy.class, values, "jhid = ? and POINTNUM = ?", lists.get(item - 1).getJHID(), lists.get(item - 1).getPOINTNUM()); -// -// if (i != 0) { -// if (lists.size() != rwqys.size()) { -// lists.removeAll(rwqys); -// -// int check = 0; -// for (int j = 0; j < lists.size(); j++) { -// if (lists.get(j).isChecked()) { -// check++; -// } -// } -// item = check; -// showToast("保存成功"); -// } else { -// item = lists.size(); -// lists.get(item - 1).setChecked(true); -// lists.get(item - 1).setCJJG(cj.getCJJG()); -// lists.get(item - 1).setFxnr(cj.getFxnr()); -// } -// } - } ++item; if (item > lists.size()) { diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java index 42fb57d..ceaeca1 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/WjFragment.java @@ -92,33 +92,33 @@ public class WjFragment extends BaseFragment { /** * 质控点 */ - private void initZkd() { - - zList = new ArrayList<>(); - - ZkdInfo info = new ZkdInfo(1, "H-2：传热元件", "未完成", "H", "质检A", "质检B", "质检C", "监理"); - ZkdInfo info2 = new ZkdInfo(2, "W-3：驱动装置检查", "未完成", "w", "质检A", "质检B", "质检C", "监理"); - zList.add(info); - zList.add(info2); - - headView = View.inflate(mActivity, R.layout.zkd_item, null); - headView.findViewById(R.id.head).setVisibility(View.VISIBLE); - - tv_project.setVisibility(View.VISIBLE); - zAdapter = new ZkdAdapter(context, zList); - lv.addHeaderView(headView, null, false); - lv.setAdapter(zAdapter); - lv.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView adapterView, View view, int i, long l) { - Intent intent = new Intent(mActivity, SqdActivity.class); - intent.putExtra(Contans.KEY_IS_EDIT, true); - intent.putExtra(Contans.NFCOREWM, true); - intent.putExtra(Contans.KEY_BQBM, num); - startActivity(intent); - } - }); - } +// private void initZkd() { +// +// zList = new ArrayList<>(); +// +// ZkdInfo info = new ZkdInfo(1, "H-2：传热元件", "未完成", "H", "质检A", "质检B", "质检C", "监理"); +// ZkdInfo info2 = new ZkdInfo(2, "W-3：驱动装置检查", "未完成", "w", "质检A", "质检B", "质检C", "监理"); +// zList.add(info); +// zList.add(info2); +// +// headView = View.inflate(mActivity, R.layout.zkd_item, null); +// headView.findViewById(R.id.head).setVisibility(View.VISIBLE); +// +// tv_project.setVisibility(View.VISIBLE); +// zAdapter = new ZkdAdapter(context, zList); +// lv.addHeaderView(headView, null, false); +// lv.setAdapter(zAdapter); +// lv.setOnItemClickListener(new AdapterView.OnItemClickListener() { +// @Override +// public void onItemClick(AdapterView adapterView, View view, int i, long l) { +// Intent intent = new Intent(mActivity, SqdActivity.class); +// intent.putExtra(Contans.KEY_IS_EDIT, true); +// intent.putExtra(Contans.NFCOREWM, true); +// intent.putExtra(Contans.KEY_BQBM, num); +// startActivity(intent); +// } +// }); +// } /** * 点检点 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 25c0ae4..18ec4fc 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 @@ -421,7 +421,7 @@ public class SxgzActivity extends BaseActivity { // result = "048B94EAC21B91"; //result = "041894EAC21B91"; - //result = "04A953EA211990"; +// result = "048D93EAC21B90"; if(TextUtils.isEmpty(result)){ return; 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 59c1075..88fba04 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 @@ -229,9 +229,9 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis //startActivity(new Intent(PrimaryAuthActivity.this, AuthSuccessActivity.class)); Intent intent = new Intent(); - intent.putExtra("usernameVpn",mUserName); - intent.putExtra("pwdVpn",mUserPassword); - setResult(RESULT_OK,intent); + intent.putExtra("usernameVpn", mUserName); + intent.putExtra("pwdVpn", mUserPassword); + setResult(RESULT_OK, intent); finish(); } }); @@ -576,12 +576,14 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis if (msg.mErrCode != 0) { showLog("start Tunnel failed" + msg.mErrStr); - showToast(msg.mErrStr); - showToast("L3VPN隧道启动失败： " + msg.mErrStr); + showLog( "L3VPN隧道启动失败： " + msg.mErrStr); +// showToast(msg.mErrStr); +// showToast("L3VPN隧道启动失败： " + msg.mErrStr); return; } showLog( "startTunnel finished"); - showToast("L3VPN隧道启动成功"); + showLog( "L3VPN隧道启动成功"); + //showToast("L3VPN隧道启动成功"); } @@ -591,7 +593,8 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis @Override public void onTunnelStoped() { showLog( "onTunnelStoped"); - showToast("隧道已经关闭"); + showLog( "隧道已经关闭"); + //showToast("隧道已经关闭"); } } diff --git a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java index 82b14b4..764c097 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java @@ -32,6 +32,7 @@ import com.rehome.dywoa.ui.activity.UseCarActivity; import com.rehome.dywoa.ui.activity.UseSealActivity; import com.rehome.dywoa.ui.activity.WaitForToDoActivity; import com.rehome.dywoa.ui.activity.WaitForToDoBaseActivity; +import com.rehome.dywoa.ui.activity.YjyaActivity; import com.rehome.dywoa.ui.activity.sbxdjgl.SbxdjglActivity; import com.rehome.dywoa.ui.activity.sbxj.XscbglActivity; import com.rehome.dywoa.utils.GsonUtils; @@ -131,7 +132,6 @@ public class HomeFragment extends BaseFragment { String yesterday = sp.format(d); String beforeyesterday = sp.format(d2); String today = formatter.format(cal0.getTime()); - getWaitForToDo(); } private void findView() { @@ -147,14 +147,26 @@ public class HomeFragment extends BaseFragment { // stvMessagedbsx = view.findViewById(R.id.super_message_tv_dbsx); } - + @Override + public void onResume() { + super.onResume(); + getWaitForToDo(); + } @Override public void setUserVisibleHint(boolean isVisibleToUser) { + super.setUserVisibleHint(isVisibleToUser); if (isVisibleToUser) { initLists(); + showLog("可见"); + showLog("------->>>>"); } - super.setUserVisibleHint(isVisibleToUser); + } + + @Override + public void onStop() { + super.onStop(); + showLog("不可见"); } @Override @@ -239,15 +251,22 @@ public class HomeFragment extends BaseFragment { startActivity(intentKks); break; case 7: + Intent intentYjya = new Intent(mActivity, YjyaActivity.class); + intentYjya.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); + startActivity(intentYjya); + break; + case 8: Intent intentUseCar = new Intent(mActivity, UseCarActivity.class); intentUseCar.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); String type = "用车管理"; - String urlLog = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/943483742495604737/SEARCH/943525549724041323-8440288166160908898?cusMenuId=8440288166160908898&urlPageTitle=55So6L2m55Sz6K%203"; + //username = "832019"; + + String urlLog = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/943483742495604737/SEARCH/943525549724041323-8440288166160908898?cusMenuId=8440288166160908898&urlPageTitle=55So6L2m55Sz6K%203"; if(!TextUtils.isEmpty(username)){ if(username.equals("832019")||username.equals("371511")||username.equals("210343")){ - + urlLog = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/943483742495604737/SEARCH/943525549724041323-8440288166160908898?cusMenuId=8440288166160908898&urlPageTitle=55So6L2m55Sz6K%203"; }else { urlLog = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/943483742495604737/SEARCH/986612579987226628-8441291376201270243?cusMenuId=8441291376201270243&urlPageTitle=55So6L2m55Sz6K%2036KGo"; } @@ -257,12 +276,24 @@ public class HomeFragment extends BaseFragment { intentUseCar.putExtra("urlLog",urlLog); startActivity(intentUseCar); break; - case 8: + case 9: Intent intentUseSeal = new Intent(mActivity, UseSealActivity.class); intentUseSeal.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); + //username = "125106"; + + String urlSeal = ""; + + if(!TextUtils.isEmpty(username)){ + if(username.equals("120563")||username.equals("210343")||username.equals("125106")){ + urlSeal = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/947273965253730306/SEARCH/986524868123164680-8441289344850462409?cusMenuId=8441289344850462409&urlPageTitle=55So5Y2w55Sz6K%203"; + }else { + urlSeal = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/947273965253730306/SEARCH/947275236446609514-8440375470390349301?cusMenuId=8440375470390349301&urlPageTitle=55So5Y2w55Sz6K%203"; + } + } + String typeSeal = "用印管理"; - String urlSeal = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/947273965253730306/SEARCH/986524868123164680-8441289344850462409?cusMenuId=8441289344850462409&urlPageTitle=55So5Y2w55Sz6K%203"; + //String urlSeal = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/947273965253730306/SEARCH/986524868123164680-8441289344850462409?cusMenuId=8441289344850462409&urlPageTitle=55So5Y2w55Sz6K%203"; intentUseSeal.putExtra("type",typeSeal); intentUseSeal.putExtra("urlLog",urlSeal); startActivity(intentUseSeal); @@ -305,8 +336,8 @@ public class HomeFragment extends BaseFragment { // String[] titles = {"两票系统", "会议管理", "用餐管理", "车辆管理", "办公领用", "工作任务", "日程查看", "考勤", "来访管理", "培训", "党建", "安防"}; // int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_meetting, R.drawable.icon_dinner_new, R.drawable.icon_vehicle_new, R.drawable.icon_office, R.drawable.icon_task, R.drawable.icon_date, R.drawable.icon_check, R.drawable.icon_px, R.drawable.icon_dj,R.drawable.icon_visit, R.drawable.icon1}; // - String[] titles = {"两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询","用车","用印"}; - int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_sis_new, R.drawable.icon_gcjd_new,R.drawable.xjgz,R.drawable.icon_dianjian,R.drawable.icon_runlog_home,R.drawable.icon_kks,R.drawable.icon_use_car,R.drawable.icon_use_seal}; + String[] titles = {"两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询","应急预案","用车","用印"}; + int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_sis_new, R.drawable.icon_gcjd_new,R.drawable.xjgz,R.drawable.icon_dianjian,R.drawable.icon_runlog_home,R.drawable.icon_kks,R.drawable.icon_yjya,R.drawable.icon_use_car,R.drawable.icon_use_seal}; @@ -365,10 +396,9 @@ public class HomeFragment extends BaseFragment { if(!TextUtils.isEmpty(waitForBean.getTotal())){ tv_todo_count.setText(waitForBean.getTotal()); } + }else{ + tv_todo_count.setText("0"); } - - - } @Override diff --git a/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java b/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java index 8510ff0..cb97621 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java @@ -820,7 +820,7 @@ public class MineFragment extends BaseLazyFragment { if(Integer.valueOf(waitForBean.getTotal()).intValue()==0){ tv_count_to_do.setVisibility(View.GONE); }else{ - tv_count_to_do.setVisibility(View.VISIBLE); + tv_count_to_do.setVisibility(View.GONE); } }else{ tv_count_to_do.setVisibility(View.GONE); diff --git a/app/src/main/res/drawable-xhdpi/icon_yjya.png b/app/src/main/res/drawable-xhdpi/icon_yjya.png new file mode 100644 index 0000000000000000000000000000000000000000..f048157dcee30644ff20c89f37411579418613ce GIT binary patch literal 2338 zcmV+-3ElRIP)Px#1am@3R0s$N2z&@+hyVZx%t=H+RCt{2o!d{_M;6Dw^Ro>t%`V_A33Ullm2Q=2 zH;FNqB+`<7Ur}kF+P5Y&?6zs5s@?t-`_e=N!Yx3Qx9&!LX?Gv?1u4yL0>&30QBp{> zQn&@k8Y~5KvHd&yU~GK%&t~Q~2LC?NAYW$2=QrnfX3jY?*bEwZu|hVp1#Lt)4~CNj z)H9$;Yx{!?0c#9+0m2kxxEBiI$NCz!prtL#RbkFgXBpuu03YvJ($eBPVz^#c$sT5_ zq-1(yWQ5G~e!9U34`2*_A$-gT59a-JV`PNPnJT5VfLR}%Vhnc}!)bByl@3IhAi^g{ zt!y&+y%Ys3_~>^~@FM}0`iNH=Fu)HLZ8j^rpY-}JvpzayQgF{0d@(SqY$gllWeZe-sFq4pDrO7XWJ^+_D8W^Hs1V`2Y)MKLrl3^; z!%5kKlqxD*jNNL9 z$?f@H>e?V0ZWfTR_;U5D1Vc#cIOqjGFK8btK&HGLEns*4+;`(IVeXG2$O7bDP~H$b zAQq7ENs&Wx#T8-!*)AwPNhgAQlWY|GBL`g<;o;}&LI)o}EE>04%e3WoBrn3;;s7ER zE152+p}GvDLYJa>P$@}voe>gMKSkUwPUu3K+I^t~jRsNBb?j zluR=2_VY-t-?JJ-`>_hxtIH%y6hTZNR%EG&NOHsenx-^f{S zXgUDTs}M3-=iqc8vVZ-7yzNsl7LbAd$;~|vJ^;90hTu4CM&ps};tx*e&N~fG2c#;1 zV=98hmGo5_kC;I!<5FBNLs`Wc`Z=Jvuc4pCCJ3{^F&P(MGR&>SFW-~x?)SV3;?~oR zg#1*ta_i{^uVKg=T?4VkS~J`iD$(cND)?iXYE5XY%`W!9lZ{A5G>MMm6>z-@!t*LM z7d7}~1D8(dpNx~@1$|~O=k>8ExL*a~UP)Yd9dDa)^ZYLX0GALMksIt1TlNUI^$Xnp>J|Cqn|&XE@sFQ7xYc;Lj|Px*E-TSv6!@QfI;!XVPzDx|Tw4y$mCtY^-Z31X8ot@0-{H2>A2q z+&QPcplcxJoD1W^-TZ^Fu~`*Fz?HM9O6c`&X=66jP{-d~Pa(pq2OaIU}g*?%b`JmZe*q4D=&-hkB(^%6H6Pk{g3ToTy z5;GMEIhZ9f6*0aLhI1jDyJ8ZT8_RLIsVvsVr$6LpK{v;@LBwKx@M7P6TS~WcTk}p= zv|M(SCk$MZ&4kO2^1S;Qo6leIxe&A?#;eyvdYs#E&WH1MVVi8Gl)jp5ro8)c&WF+C zQQ-qPfn*#X3jlRD5w}&)opv{Cz>6{A~+k9H*ZgUxGwMLNIIT;#pf&$ z*D2`EN96^Zb-L2^pWSJ!*=7P%6h&!Hv#1vecQ^FuHx;;g&Z0TjlC4DVegL?7&XTak z$ShYmO{;)_uPlo)wWwlZF*0dSy)10<{_7tSgPy6K{-XWr&FOa(oP3AxJu6HB2HMzn zk?=voP=I6%1xUtFfLy`~0c*0QC}CC<2E33hMX5r-e-#j>a#uAFfdY6H#&A!zAf*ba z_{sPwLwQ7g%CNqMEdcmVwlpQk?Zb?{Rset)uFICD)F479uoDN=RkDX*=#nc^=|BwE z>Z;iU5EqC|yYV#af@52VQj*{tloVn!zfc_$k?5S2%0Jn+I8TEEDq4^Z;GSQ*nDn4Wi zT2;W#fcF5@0N{5-V1E(@uo6kE!AmNBvQ*=T!;HPo*%HA20moQdYHo;x#Q*>R07*qo IM6N<$g26Ce&j0`b literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_yjya.png b/app/src/main/res/drawable-xxhdpi/icon_yjya.png new file mode 100644 index 0000000000000000000000000000000000000000..56e6f80493f213dec5e882b9efd06b6b6cd99739 GIT binary patch literal 3354 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_yjya.png b/app/src/main/res/drawable-xxxhdpi/icon_yjya.png new file mode 100644 index 0000000000000000000000000000000000000000..fa08b0bc0e5d7db6894c8711a9c31312e024501b GIT binary patch literal 4511 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 z + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_yjya_list.xml b/app/src/main/res/layout/adapter_yjya_list.xml new file mode 100644 index 0000000..76ba017 --- /dev/null +++ b/app/src/main/res/layout/adapter_yjya_list.xml @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_cj.xml b/app/src/main/res/layout/fragment_cj.xml index b31b8c8..700ad45 100644 --- a/app/src/main/res/layout/fragment_cj.xml +++ b/app/src/main/res/layout/fragment_cj.xml @@ -59,6 +59,27 @@ android:text="轴承" android:textSize="@dimen/sbtextSize" /> + + + + + + - - - - -