diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fae58d3..34dc9a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -77,9 +77,7 @@ tools:ignore="GoogleAppIndexingWarning" 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 cc8263d..6cef370 100644 --- a/app/src/main/java/com/rehome/dywoa/Contans.java +++ b/app/src/main/java/com/rehome/dywoa/Contans.java @@ -3,25 +3,25 @@ package com.rehome.dywoa; public class Contans { -// public static String IP = "http://192.168.2.115:8601/"; -// public static String IP_INTRANET = "http://192.168.2.115:8601/"; -// public static String IP_EXTRANET = "http://192.168.2.115:8601/"; -// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; -// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; + public static String IP = "http://192.168.2.115:8601/"; + public static String IP_INTRANET = "http://192.168.2.115:8601/"; + public static String IP_EXTRANET = "http://192.168.2.115:8601/"; + public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; + public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; //APP登录接口厂内服务器IP - public static String IP = "https://app.dywzhny.com.cn/"; - //app内网 - public static String IP_INTRANET = "https://app.dywzhny.com.cn/"; - //app外网 - public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; - //SIS系统厂内IP - public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; - //BI - public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; +// public static String IP = "https://app.dywzhny.com.cn/"; +// //app内网 +// public static String IP_INTRANET = "https://app.dywzhny.com.cn/"; +// //app外网 +// public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; +// //SIS系统厂内IP +// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; +// //BI +// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; @@ -147,6 +147,10 @@ public class Contans { public static final String OLD_PWD = "oldpwd";//旧密码 public static final String PHONE_INFO = "phone_info"; public static final String SAVE_USER_AND_PASSWORD = "save_user_and_password";//登录页面 记住我 开关状态控制 + public static final String QJ_JIZHU_STATUS_SELECT = "QJ_JIZHU_STATUS_SELECT"; + + public static final String QJ_FIRST_JIZHU_STATUS_SELECT = "QJ_FIRST_JIZHU_STATUS_SELECT";//1号机组停开机状态 + public static final String QJ_SECOND_JIZHU_STATUS_SELECT = "QJ_SECOND_JIZHU_STATUS_SELECT";//2号机组停开机状态 public static final String USER_NAME_VPN = "usernameVpn";//vpn用户名 public static final String PASS_WORD_VPN = "pwdVpn";//vpn密码 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 966b791..5397272 100755 --- a/app/src/main/java/com/rehome/dywoa/DBModel/XSJJHDataBean.java +++ b/app/src/main/java/com/rehome/dywoa/DBModel/XSJJHDataBean.java @@ -79,6 +79,13 @@ public class XSJJHDataBean extends DataSupport implements Parcelable { private String POINTNAME;//检查项（温度，声音） private String UNITOFMEASURE;//巡检点值单位 + private String UPPERACTIONSTOP;//停机超限上限 + private String LOWERACTIONSTOP;//停机超限下限 + private String UPPERWARNINGSTOP;//停机报警上限 + private String LOWERWARNINGSTOP;//停机报警下限 + private String firstAssembling;//#1机组运行状态 0：停机，1：开机 + private String secondAssembling;//#2机组运行状态 0：停机，1：开机 + public long getId() { return id; @@ -521,6 +528,54 @@ public class XSJJHDataBean extends DataSupport implements Parcelable { this.UNITOFMEASURE = UNITOFMEASURE; } + public String getUPPERACTIONSTOP() { + return UPPERACTIONSTOP; + } + + public void setUPPERACTIONSTOP(String UPPERACTIONSTOP) { + this.UPPERACTIONSTOP = UPPERACTIONSTOP; + } + + public String getLOWERACTIONSTOP() { + return LOWERACTIONSTOP; + } + + public void setLOWERACTIONSTOP(String LOWERACTIONSTOP) { + this.LOWERACTIONSTOP = LOWERACTIONSTOP; + } + + public String getUPPERWARNINGSTOP() { + return UPPERWARNINGSTOP; + } + + public void setUPPERWARNINGSTOP(String UPPERWARNINGSTOP) { + this.UPPERWARNINGSTOP = UPPERWARNINGSTOP; + } + + public String getLOWERWARNINGSTOP() { + return LOWERWARNINGSTOP; + } + + public void setLOWERWARNINGSTOP(String LOWERWARNINGSTOP) { + this.LOWERWARNINGSTOP = LOWERWARNINGSTOP; + } + + public String getFirstAssembling() { + return firstAssembling; + } + + public void setFirstAssembling(String firstAssembling) { + this.firstAssembling = firstAssembling; + } + + public String getSecondAssembling() { + return secondAssembling; + } + + public void setSecondAssembling(String secondAssembling) { + this.secondAssembling = secondAssembling; + } + @Override public int describeContents() { return 0; @@ -582,6 +637,14 @@ public class XSJJHDataBean extends DataSupport implements Parcelable { dest.writeString(this.LOWERWARNING); dest.writeString(this.POINTNAME); dest.writeString(this.UNITOFMEASURE); + + dest.writeString(this.UPPERACTIONSTOP); + dest.writeString(this.LOWERACTIONSTOP); + dest.writeString(this.UPPERWARNINGSTOP); + dest.writeString(this.LOWERWARNINGSTOP); + dest.writeString(this.firstAssembling); + dest.writeString(this.secondAssembling); + } public XSJJHDataBean() { @@ -644,6 +707,13 @@ public class XSJJHDataBean extends DataSupport implements Parcelable { this.POINTNAME = in.readString(); this.UNITOFMEASURE = in.readString(); + this.UPPERACTIONSTOP = in.readString(); + this.LOWERACTIONSTOP = in.readString(); + this.UPPERWARNINGSTOP = in.readString(); + this.LOWERWARNINGSTOP = in.readString(); + this.firstAssembling = in.readString(); + this.secondAssembling = in.readString(); + } public static final Creator CREATOR = new Creator() { diff --git a/app/src/main/java/com/rehome/dywoa/bean/ScxjjhBean.java b/app/src/main/java/com/rehome/dywoa/bean/ScxjjhBean.java index 1ce4e03..239bed2 100644 --- a/app/src/main/java/com/rehome/dywoa/bean/ScxjjhBean.java +++ b/app/src/main/java/com/rehome/dywoa/bean/ScxjjhBean.java @@ -56,6 +56,10 @@ public class ScxjjhBean {//用于上传巡检计划的bean private String fxnr; private String smfx; private String SBZT; + private String firstAssembling; + private String secondAssembling; + + public String getScid() { return scid; @@ -128,6 +132,22 @@ public class ScxjjhBean {//用于上传巡检计划的bean public void setSBZT(String SBZT) { this.SBZT = SBZT; } + + public String getFirstAssembling() { + return firstAssembling; + } + + public void setFirstAssembling(String firstAssembling) { + this.firstAssembling = firstAssembling; + } + + public String getSecondAssembling() { + return secondAssembling; + } + + public void setSecondAssembling(String secondAssembling) { + this.secondAssembling = secondAssembling; + } } diff --git a/app/src/main/java/com/rehome/dywoa/bean/XsRequestInfo.java b/app/src/main/java/com/rehome/dywoa/bean/XsRequestInfo.java index c3e186b..c003e1f 100644 --- a/app/src/main/java/com/rehome/dywoa/bean/XsRequestInfo.java +++ b/app/src/main/java/com/rehome/dywoa/bean/XsRequestInfo.java @@ -34,6 +34,7 @@ public class XsRequestInfo { private String jz; private String yhid; private String jhmc; + private String gh; public String getAction() { return action; @@ -186,4 +187,12 @@ public class XsRequestInfo { public void setJhmc(String jhmc) { this.jhmc = jhmc; } + + public String getGh() { + return gh; + } + + public void setGh(String gh) { + this.gh = gh; + } } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/FanWeiActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/FanWeiActivity.java new file mode 100644 index 0000000..dc53b9f --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/FanWeiActivity.java @@ -0,0 +1,279 @@ +package com.rehome.dywoa.ui.activity; + + + + + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.graphics.Color; +import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; +import android.view.KeyEvent; +import android.view.ViewGroup; +import android.webkit.WebView; +import android.widget.TextView; +import android.widget.Toast; +import com.rehome.dywoa.App; +import com.rehome.dywoa.Contans; +import com.rehome.dywoa.R; +import com.rehome.dywoa.base.BaseAgentWebActivity; +import com.rehome.dywoa.bean.FwSingleLoginResult; +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.utils.RSAUtils; +import com.rehome.dywoa.utils.UiUtlis; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; +import com.yolanda.nohttp.rest.Response; +import java.text.ParseException; +import java.util.HashMap; +import java.util.Map; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; + +public class FanWeiActivity extends BaseAgentWebActivity { + + private Toolbar mToolbar; + private TextView mTitleTextView; + + private String urlToken = "api/app/login/singleLogin?account="; + private String startUrl; + + + String type; + String url; + + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_fan_wei); + + type = getIntent().getStringExtra("type"); + url = getIntent().getStringExtra("url"); + if(TextUtils.isEmpty(type)){ + type = ""; + } + + mToolbar = this.findViewById(R.id.toolbar); + mToolbar.setTitleTextColor(Color.WHITE); + mToolbar.setTitle(""); + mToolbar.setNavigationIcon(R.drawable.ac_back_icon); + mTitleTextView = this.findViewById(R.id.toolbar_title); + mTitleTextView.setText(type); + this.setSupportActionBar(mToolbar); + if (getSupportActionBar() != null) { + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } + mToolbar.setNavigationOnClickListener(v -> FanWeiActivity.this.finish()); + + + //支持缩放 + mAgentWeb.getWebCreator().getWebView().getSettings().setBuiltInZoomControls(true); + mAgentWeb.getWebCreator().getWebView().getSettings().setDisplayZoomControls(false); + mAgentWeb.getWebCreator().getWebView().getSettings().setSupportZoom(true); + + checkServerConnectStatus(); + + } + + @Override + protected void onResume() { + super.onResume(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } + + + //检查服务器连接状态 + private void checkServerConnectStatus() { + 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(this, 0, 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"); + //可以连接到服务器，请求数据 + getSingleLoginToken(); + }else{ + showToast("无法连接到服务器，请检查网络环境"); + } + } + + @Override + public void onFailed(int what, Response response) { + showLog("connect server onFailed"); + showToast("无法连接到服务器，请检查网络环境"); + } + }); + } + + + private void getSingleLoginToken() { + String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid(); + + //url = Contans.IP + urlToken + "280846"; + + + Request request = NoHttp.createStringRequest(url, RequestMethod.GET); + showLog(url); + +// SSLSocketFactory socketFactory = NohttpUtils.getSisSSLSocketFactory(WaitForToDoActivity.this); +// if (socketFactory != null) { +// request.setSSLSocketFactory(socketFactory); +// request.setHostnameVerifier(new HostnameVerifier() { +// @Override +// public boolean verify(String s, SSLSession sslSession) { +// return true; +// } +// }); +// } + + NohttpUtils.getInstance().add(this,1,request,new HttpListener(){ + @Override + public void onSucceed(int what, Response response) throws ParseException { + + String jsonResult = response.get(); + showLog("-----login------"); + showLog(jsonResult); + + String jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult); + if (TextUtils.isEmpty(jsonDecode)) { + showToast(UiUtlis.getString(FanWeiActivity.this, R.string.data_error)); + } else { + FwSingleLoginResult loginResult = GsonUtils.GsonToBean(jsonDecode, FwSingleLoginResult.class); + showLog(jsonDecode); + if (loginResult != null) { + if (loginResult.getErrmsg()!=null&&loginResult.getErrmsg().equals("success")) { + if(!TextUtils.isEmpty(loginResult.getToken())){ + loadSisPage(loginResult.getToken()); + } + }else{ + showToast(loginResult.getErrmsg()); + } + } + } + } + + @Override + public void onFailed(int what, Response response) { + showLog("getSisToken onFailed"); + } + }, true, true, "请稍候..."); + } + + private void loadSisPage(String token) { + var tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken="+ token +"&redirect_uri="; + startUrl = tempUrl + url; + showLog(startUrl); + + //startUrl = "https://www.hao123.com"; + + this.mAgentWeb.getUrlLoader().loadUrl(startUrl); + } + + + + @NonNull + @Override + protected ViewGroup getAgentWebParent() { + return (ViewGroup) this.findViewById(R.id.container); + } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (mAgentWeb != null && mAgentWeb.handleKeyEvent(keyCode, event)) { + return true; + } + + return super.onKeyDown(keyCode, event); + } + + @Override + protected int getIndicatorColor() { + return Color.parseColor("#ff0000"); + } + + @Override + protected void setTitle(WebView view, String title) { + super.setTitle(view, title); + if (!TextUtils.isEmpty(title)) { + if (mTitleTextView != null) { + mTitleTextView.setText(type); + } + } + } + + @Override + protected int getIndicatorHeight() { + return 3; + } + + @Nullable + @Override + protected String getUrl() { + return null; + //return "https://www.baidu.com/"; + } + + + private void showLog(String logText) { + if (isApkInDebug(FanWeiActivity.this)) { + if (TextUtils.isEmpty(logText)) { + Log.i("app", "logText is null"); + } else { + Log.i("app", logText); + } + } + } + + /** + * 判断当前应用是否是debug状态 + */ + + public static boolean isApkInDebug(Context context) { + try { + ApplicationInfo info = context.getApplicationInfo(); + return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0; + } catch (Exception e) { + return false; + } + } + + public void showToast(String msg) { + Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); + } + + public void showToast(int strId) { + Toast.makeText(this, strId, Toast.LENGTH_SHORT).show(); + } + +} \ No newline at end of file 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 0891126..838b279 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 @@ -886,6 +886,8 @@ class HomeActivity : BaseActivityOaToolbarViewBinding() { val datas = ScxjjhBean.data() datas.scid = itemXSJJHDataBean.scid datas.dbh = itemXSJJHDataBean.dbh + datas.firstAssembling = itemXSJJHDataBean.firstAssembling + datas.secondAssembling = itemXSJJHDataBean.secondAssembling if (itemXSJJHDataBean.cjjg == null) { datas.cbsz = "" 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 46e9644..6af26da 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 @@ -168,6 +168,14 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { startActivity(intent) } } + + if (isApkInDebug(context)) { + binding.tvVpn.visibility=View.VISIBLE; + binding.tvVpnLogout.visibility=View.VISIBLE; + }else{ + binding.tvVpn.visibility=View.GONE; + binding.tvVpnLogout.visibility=View.GONE; + } } @SuppressLint("SetTextI18n") @@ -199,8 +207,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (isApkInDebug(context)) { //李梓雄 -// binding.etUsername.setText("371522") -// binding.etPassword.setText("A000000a.") + binding.etUsername.setText("371522") + binding.etPassword.setText("A000000a.") //ceshi1 // binding.etUsername.setText("ceshi1") @@ -601,7 +609,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { showLog("connect server onFailed") //离线登录 offLineLogin() - showToast("无法连接到服务器，请检查网络环境") +// showToast("无法连接到服务器，请检查网络环境") } }) } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/RunLogActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/RunLogActivity.java index 88858d8..bfe8bc7 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/RunLogActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/RunLogActivity.java @@ -37,6 +37,7 @@ import com.yolanda.nohttp.rest.Response; import java.text.ParseException; + public class RunLogActivity extends AppCompatActivity { private String urlToken = "api/singer/singerLogin?account="; @@ -50,6 +51,7 @@ public class RunLogActivity extends AppCompatActivity { private TextView mTitleTextView; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/WaitForToDoActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/WaitForToDoActivity.java index 5f6616f..6780191 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/WaitForToDoActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/WaitForToDoActivity.java @@ -150,7 +150,10 @@ public class WaitForToDoActivity extends BaseAgentWebActivity { private void getSingleLoginToken() { - String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid(); + //String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid(); + + String url = Contans.IP + urlToken + "803011"; + //url = Contans.IP + urlToken + "280846"; 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 79b76fe..e4e9b86 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 @@ -446,7 +446,7 @@ public class SdjgzActivity extends BaseActivity { public void handleNfc(String result) { //super.handleNfc(result); //tvNodata.setText(result); - //result = "04351EEA211991"; + //result = "0475ABEAC21B90"; if (list.size() != 0) { showLog("--------"); showLog(GsonUtils.GsonString(list)); @@ -522,4 +522,5 @@ public class SdjgzActivity extends BaseActivity { showLog("-------已检未上传点数------"); } } -} \ No newline at end of file +} +// 6217003090002510800 \ No newline at end of file diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/ScxsjhFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/ScxsjhFragment.java index fecf08d..4f76fd2 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/ScxsjhFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/ScxsjhFragment.java @@ -296,6 +296,9 @@ public class ScxsjhFragment extends BaseFragment { ScxjjhBean.data datas = new ScxjjhBean.data(); + datas.setFirstAssembling(xsjjhdatabeanList.get(j).getFirstAssembling()); + datas.setSecondAssembling(xsjjhdatabeanList.get(j).getSecondAssembling()); + datas.setScid(xsjjhdatabeanList.get(j).getScid()); datas.setDbh(xsjjhdatabeanList.get(j).getDbh()); 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 de7a28c..0e9c12d 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 @@ -11,8 +11,10 @@ import android.content.pm.PackageManager; import android.graphics.Color; import android.os.Bundle; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.AdapterView; +import android.widget.Button; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; @@ -31,9 +33,16 @@ import com.rehome.dywoa.adapter.ViewHolder; import com.rehome.dywoa.base.BaseActivity; import com.rehome.dywoa.base.MipcaActivityCapture; import com.rehome.dywoa.utils.GsonUtils; +import com.rehome.dywoa.utils.SPUtils; +import com.rehome.dywoa.weiget.ConfirmDialog; +import com.rehome.dywoa.weiget.JiZhuStatusDialog; import com.rehome.dywoa.weiget.toastviewbymyself; import org.litepal.crud.DataSupport; + +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; import java.util.List; @@ -70,6 +79,8 @@ public class SxgzActivity extends BaseActivity { LinearLayout ll_uploaded; LinearLayout ll_checkedAndNoUpload; + Button btnSelectJiZhu; + private CommonAdapter adapter; private List xsjjhxzDataBeanList = new ArrayList<>(); @@ -120,11 +131,15 @@ public class SxgzActivity extends BaseActivity { ll_checked = findViewById(R.id.ll_checked); ll_uploaded = findViewById(R.id.ll_uploaded); ll_checkedAndNoUpload = findViewById(R.id.ll_checkedAndNoUpload); + btnSelectJiZhu = findViewById(R.id.btnSelectJiZhu); lv.setEmptyView(tvNodata); headView = View.inflate(this, R.layout.xsgz_item, null); headView.findViewById(R.id.head).setVisibility(View.VISIBLE); + + + initToolbar("巡检工作(请使用NFC)", "扫描", new View.OnClickListener() { @Override public void onClick(View v) { @@ -181,6 +196,48 @@ public class SxgzActivity extends BaseActivity { startActivity(intent); } }); + btnSelectJiZhu.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + String firstJiZhuStatusTemp = (String) SPUtils.get(context, Contans.SP.QJ_FIRST_JIZHU_STATUS_SELECT, "开机"); + String secondJiZhuStatusTemp = (String) SPUtils.get(context, Contans.SP.QJ_SECOND_JIZHU_STATUS_SELECT, "开机"); + + JiZhuStatusDialog confirmDialog = new JiZhuStatusDialog(context, "保存成功", firstJiZhuStatusTemp, secondJiZhuStatusTemp, new JiZhuStatusDialog.ConfirmDialogListener() { + + @Override + public void confirm(String firstJiZhuStatus, String secondJiZhuStatus) { + SPUtils.put(context,Contans.SP.QJ_FIRST_JIZHU_STATUS_SELECT,firstJiZhuStatus); + SPUtils.put(context,Contans.SP.QJ_SECOND_JIZHU_STATUS_SELECT,secondJiZhuStatus); + if(xsjjhxzDataBeanList!=null&&xsjjhxzDataBeanList.size()>0){ + + ContentValues values = new ContentValues(); + if("开机".equals(firstJiZhuStatus)){ + values.put("firstAssembling", "1"); + }else{ + values.put("firstAssembling", "0"); + } + if("开机".equals(secondJiZhuStatus)){ + values.put("secondAssembling", "1"); + }else{ + values.put("secondAssembling", "0"); + } + + //更新数据库所有巡检点数据 1号机和2号机的停开机状态 + List xjjhListall = where("download = ? and username = ?", "1", username).find(Xjjh.class); + if(xjjhListall!=null&&xjjhListall.size()>0){ + for(Xjjh xjjh:xjjhListall){ + DataSupport.updateAll(XSJJHDataBean.class, values, "zxid = ?",xjjh.getZxid()); + } + } + } + } + }); + confirmDialog.setTvTitle("机组停开机状态确认"); + confirmDialog.setCancelable(false); + confirmDialog.show(); + } + }); } public void initData() { @@ -291,6 +348,58 @@ public class SxgzActivity extends BaseActivity { if(xSJJHXZDataBeans!=null&&xSJJHXZDataBeans.size()>0){ xsjjhxzDataBeanList.addAll(xSJJHXZDataBeans); tv_total_qy.setText(String.valueOf(xsjjhxzDataBeanList.size())); + + //格式化日期的对象(转化成习惯的时间格式) + SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd"); + String nowStr = sdFormat.format(Calendar.getInstance().getTime()); + //String selectJiZhuDate = Contans.SP.QJ_JIZHU_STATUS_SELECT + nowStr; + + String qjJizhuStatusSelect = (String) SPUtils.get(context, Contans.SP.QJ_JIZHU_STATUS_SELECT + nowStr, ""); + showLog(qjJizhuStatusSelect); + + + if(TextUtils.isEmpty(qjJizhuStatusSelect)){ + //当天没有选择机组状态,需要展示 机组停开机状态确认 + String firstJiZhuStatusTemp = (String) SPUtils.get(context, Contans.SP.QJ_FIRST_JIZHU_STATUS_SELECT, "开机"); + String secondJiZhuStatusTemp = (String) SPUtils.get(context, Contans.SP.QJ_SECOND_JIZHU_STATUS_SELECT, "开机"); + + JiZhuStatusDialog confirmDialog = new JiZhuStatusDialog(context, "保存成功", firstJiZhuStatusTemp, secondJiZhuStatusTemp, new JiZhuStatusDialog.ConfirmDialogListener() { + + @Override + public void confirm(String firstJiZhuStatus, String secondJiZhuStatus) { + SPUtils.put(context,Contans.SP.QJ_FIRST_JIZHU_STATUS_SELECT,firstJiZhuStatus); + SPUtils.put(context,Contans.SP.QJ_SECOND_JIZHU_STATUS_SELECT,secondJiZhuStatus); + SPUtils.put(context,Contans.SP.QJ_JIZHU_STATUS_SELECT + nowStr,nowStr); + showLog(qjJizhuStatusSelect); + + ContentValues values = new ContentValues(); + if("开机".equals(firstJiZhuStatus)){ + values.put("firstAssembling", "1"); + }else{ + values.put("firstAssembling", "0"); + } + if("开机".equals(secondJiZhuStatus)){ + values.put("secondAssembling", "1"); + }else{ + values.put("secondAssembling", "0"); + } + + //更新数据库所有巡检点数据 1号机和2号机的停开机状态 + //List xjjhListall = where("download = ? and username = ?", "1", username).find(Xjjh.class); + if(xjjhListall!=null&&xjjhListall.size()>0){ + for(Xjjh xjjh:xjjhListall){ + DataSupport.updateAll(XSJJHDataBean.class, values, "zxid = ?",xjjh.getZxid()); + } + } + } + }); + confirmDialog.setTvTitle("机组停开机状态确认"); + confirmDialog.setCancelable(false); + confirmDialog.show(); + + }else{ + //当天已经选择过机组停开机状态,不需要再展示了 + } } //巡检点总条数 @@ -299,6 +408,11 @@ public class SxgzActivity extends BaseActivity { if(xsjjhDataBeenList!=null&&xsjjhDataBeenList.size()>0){ showLog("-------巡检点总条数------"); showLog(GsonUtils.GsonString(xsjjhDataBeenList)); +// for(XSJJHDataBean xSJJHDataBean:xsjjhDataBeenList){ +// showLog("1号机组状态："+xSJJHDataBean.getFirstAssembling()); +// showLog("2号机组状态："+xSJJHDataBean.getSecondAssembling()); +// } + xsjjhDataBeanTotal.addAll(xsjjhDataBeenList); tv_total_point.setText(String.valueOf(xsjjhDataBeanTotal.size())); } diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java index 1025820..2616b80 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java @@ -255,7 +255,7 @@ public class XzxsjhFragment extends BaseFragment { ++requestCount; String result = response.get(); - showLog("-----------"); + showLog("------result-----"); showLog(result); // 假设context是你的上下文，R.raw.example是你的JSON文件在res/raw目录下的ID @@ -380,6 +380,7 @@ public class XzxsjhFragment extends BaseFragment { info.setAction("XSCB_ ZXJHD_GET"); info.setZxid(zxid); info.setJhmc(jhmc); + //info.setGh(username); String json = GsonUtils.GsonString(info); showLog(json); return json; 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 c84ed43..fcbde76 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 @@ -17,6 +17,7 @@ import com.rehome.dywoa.base.BaseFragment; import com.rehome.dywoa.bean.GridItem; import com.rehome.dywoa.bean.WaitForBean; import com.rehome.dywoa.ui.activity.BiShowActivity; +import com.rehome.dywoa.ui.activity.FanWeiActivity; import com.rehome.dywoa.ui.activity.JiZhuActivity; import com.rehome.dywoa.ui.activity.KksSearchActivity; import com.rehome.dywoa.ui.activity.RunLogListActivity; @@ -190,24 +191,33 @@ public class HomeFragment extends BaseFragment { String TAG = ""; switch (position) { case 0: + Intent intentYth = new Intent(mActivity, FanWeiActivity.class); + intentYth.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); + String typeWaitFor = "管控一体化"; + String urlWaitFor = "https://mis.dywzhny.com.cn/"; + intentYth.putExtra("type",typeWaitFor); + intentYth.putExtra("url",urlWaitFor); + startActivity(intentYth); + break; + case 1: Intent intent = new Intent(mActivity, MainActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); break; - case 1: + case 2: // SisBaseActivity // SisActivity Intent intentSis = new Intent(mActivity, SisBaseActivity.class); intentSis.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intentSis); break; - case 2: + case 3: // SisActivity Intent intentJiZhu = new Intent(mActivity, JiZhuActivity.class); intentJiZhu.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intentJiZhu); break; - case 3: + case 4: if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("ceshi1"))||(username!=null&&username.equals("RH00001"))){ Intent intentXj= new Intent(mActivity, XscbglActivity.class); intentXj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); @@ -216,23 +226,23 @@ public class HomeFragment extends BaseFragment { showToast("巡检功能只对运行部和承包商开放，当前用户无权限"); } break; - case 4: + case 5: Intent intentDj= new Intent(mActivity, SbxdjglActivity.class); intentDj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intentDj.putExtra("edit",false); intentDj.putExtra("index",0); startActivity(intentDj); break; - case 5: - //运行日志 - if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("RH00001"))){ - Intent intentLog = new Intent(mActivity, RunLogListActivity.class);//RunLogListActivity RunLogBaseActivity - intentLog.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intentLog); - }else{ - showToast("运行日志功能只对运行部开放，当前用户不是运行部，无权限"); - } - break; +// case 6: +// //运行日志 +// if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(username!=null&&username.equals("371522"))||(username!=null&&username.equals("RH00001"))){ +// Intent intentLog = new Intent(mActivity, RunLogListActivity.class);//RunLogListActivity RunLogBaseActivity +// intentLog.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); +// startActivity(intentLog); +// }else{ +// showToast("运行日志功能只对运行部开放，当前用户不是运行部，无权限"); +// } +// break; case 6: Intent intentKks = new Intent(mActivity, KksSearchActivity.class); intentKks.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); @@ -244,49 +254,6 @@ public class HomeFragment extends BaseFragment { 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 = "用车管理"; - - //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"; - } - } - - intentUseCar.putExtra("type",type); - intentUseCar.putExtra("urlLog",urlLog); - startActivity(intentUseCar); - break; - 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"; - intentUseSeal.putExtra("type",typeSeal); - intentUseSeal.putExtra("urlLog",urlSeal); - startActivity(intentUseSeal); - break; - case 10: try { // Intent intentWaitFor = new Intent(mActivity, BiShowActivity.class); @@ -304,8 +271,50 @@ public class HomeFragment extends BaseFragment { } break; // case 8: -// TAG = GridViewDialog.TAG_PEIXUN; +// Intent intentUseCar = new Intent(mActivity, UseCarActivity.class); +// intentUseCar.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); +// +// String type = "用车管理"; +// +// //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"; +// } +// } +// +// intentUseCar.putExtra("type",type); +// intentUseCar.putExtra("urlLog",urlLog); +// startActivity(intentUseCar); +// break; +// 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"; +// intentUseSeal.putExtra("type",typeSeal); +// intentUseSeal.putExtra("urlLog",urlSeal); +// startActivity(intentUseSeal); // break; + + // case 9: // TAG = GridViewDialog.TAG_PDANGJIAN; // break; @@ -331,8 +340,12 @@ 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码查询","应急预案","用车","用印","BI"}; - 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,R.drawable.icon_bi}; +// String[] titles = {"管控一体化","两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询","应急预案","用车","用印","BI"}; +// int[] imgIds = {R.drawable.icon_runlog_home,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,R.drawable.icon_bi}; + + String[] titles = {"管控一体化","两票系统", "SIS系统", "机组参数","巡检","点检","kks码查询","应急预案","BI","高风险"}; + int[] imgIds = {R.drawable.icon_gkyth,R.drawable.icon_lpqt, R.drawable.icon_sis_new_first, R.drawable.icon_jzcs_new,R.drawable.icon_qj_new,R.drawable.icon_dj_new, + R.drawable.icon_kks_search,R.drawable.icon_yjya,R.drawable.icon_bi,R.drawable.icon_high_risk}; @@ -369,8 +382,8 @@ public class HomeFragment extends BaseFragment { private void getWaitForToDo() { HashMap param = new HashMap<>(); + //param.put("YHID","280840"); param.put("YHID",username); - //param.put("YHID","sysadmin"); String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO; showLog(url); 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 ae9245e..1411940 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 @@ -501,7 +501,9 @@ public class MineFragment extends BaseLazyFragment { @Override public void onResume() { super.onResume(); - getWaitForToDo(); + if(this.isAdded()){ + getWaitForToDo(); + } } @@ -801,7 +803,7 @@ public class MineFragment extends BaseLazyFragment { HashMap param = new HashMap<>(); param.put("YHID",username); - //param.put("YHID","sysadmin"); + //param.put("YHID","280840"); String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO; showLog(url); @@ -844,6 +846,9 @@ public class MineFragment extends BaseLazyFragment { } //更新待办 public void updateWaitForToDo() { - getWaitForToDo(); + //getWaitForToDo(); + if(this.isAdded()){ + getWaitForToDo(); + } } } diff --git a/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java b/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java index 9c7387d..b7e6ff0 100644 --- a/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java +++ b/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java @@ -14,6 +14,7 @@ import com.yolanda.nohttp.error.UnKnownHostError; import com.yolanda.nohttp.rest.OnResponseListener; import com.yolanda.nohttp.rest.Request; import com.yolanda.nohttp.rest.Response; + import java.text.ParseException; /** @@ -76,7 +77,7 @@ public class HttpResponseListener implements OnResponseListener { @Override public void onStart(int what) { - if (mDialog != null && !mDialog.isShowing() && !mActivity.isFinishing()) { + if (mActivity != null && mDialog != null && !mDialog.isShowing() && !mActivity.isFinishing()) { mDialog.show(); } } @@ -133,7 +134,7 @@ public class HttpResponseListener implements OnResponseListener { */ @Override public void onFinish(int what) { - if (mDialog != null && mDialog.isShowing()) { + if (mActivity != null && mDialog != null && mDialog.isShowing()) { mDialog.dismiss(); } } diff --git a/app/src/main/java/com/rehome/dywoa/weiget/JiZhuStatusDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/JiZhuStatusDialog.java new file mode 100644 index 0000000..bb792e1 --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/weiget/JiZhuStatusDialog.java @@ -0,0 +1,131 @@ +package com.rehome.dywoa.weiget; + + +import android.app.Dialog; +import android.content.Context; +import android.os.Build; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.Display; +import android.view.Gravity; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; + +import androidx.annotation.NonNull; + +import com.rehome.dywoa.databinding.DialogConfirmBinding; +import com.rehome.dywoa.databinding.DialogJiZhuStatusBinding; + +/** + * Create By HuangWenFei + * 创建日期：2023-01-12 11:55 + * 描述： + */ + +public class JiZhuStatusDialog extends Dialog { + + protected Context context; + protected View mView; + protected DialogJiZhuStatusBinding binding; + protected ConfirmDialogListener listener; + protected String msg; + protected String firstJiZhuStatus; + protected String secondJiZhuStatus; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(mView); + Window window = getWindow(); + WindowManager.LayoutParams lp = window.getAttributes(); + lp.width = (getScreenWidth(context)) * 2 / 3; + window.setGravity(Gravity.CENTER); + setTvMsg(msg); + binding.bottomBtnView.dialogCommit.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + if (listener != null) { + firstJiZhuStatus = "开机"; + secondJiZhuStatus = "开机"; + if(binding.rb1.isChecked()){ + firstJiZhuStatus = "开机"; + } + if(binding.rb2.isChecked()){ + firstJiZhuStatus = "停机"; + } + if(binding.rb3.isChecked()){ + secondJiZhuStatus = "开机"; + } + if(binding.rb4.isChecked()){ + secondJiZhuStatus = "停机"; + } + listener.confirm(firstJiZhuStatus,secondJiZhuStatus); + } + } + }); + + } + + public JiZhuStatusDialog(@NonNull Context context, String msg,String firstJiZhuStatus,String secondJiZhuStatus, ConfirmDialogListener listener) { + super(context); + this.context=context; + this.listener = listener; + this.msg=msg; + this.firstJiZhuStatus=firstJiZhuStatus; + this.secondJiZhuStatus=secondJiZhuStatus; + binding = DialogJiZhuStatusBinding.inflate(getLayoutInflater()); + mView = binding.getRoot(); + requestWindowFeature(Window.FEATURE_NO_TITLE); + getWindow().setBackgroundDrawableResource(android.R.color.transparent); + if("开机".equals(firstJiZhuStatus)){ + binding.rb1.setChecked(true); + binding.rb2.setChecked(false); + }else{ + binding.rb1.setChecked(false); + binding.rb2.setChecked(true); + } + if("开机".equals(secondJiZhuStatus)){ + binding.rb3.setChecked(true); + binding.rb4.setChecked(false); + }else{ + binding.rb3.setChecked(false); + binding.rb4.setChecked(true); + } + } + + public void setTvMsg(String msg) { + if (!TextUtils.isEmpty(msg)) { + + } + } + + + public void setTvTitle(String title) { + if (!TextUtils.isEmpty(title)) { + binding.tvTitle.setText(title); + } + } + + public void hideBottomClick() { + binding.bottomBtnView.bottomClick.setVisibility(View.GONE); + } + + + //获取屏幕宽度 + public static int getScreenWidth(Context context) { + WindowManager manager = (WindowManager) context + .getSystemService(Context.WINDOW_SERVICE); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + return manager.getCurrentWindowMetrics().getBounds().width(); + }else{ + Display display = manager.getDefaultDisplay(); + return display.getWidth(); + } + } + + public interface ConfirmDialogListener { + void confirm(String firstJiZhuStatus,String secondJiZhuStatus); + } +} diff --git a/app/src/main/java/com/rehome/dywoa/zxing/view/ViewfinderView.java b/app/src/main/java/com/rehome/dywoa/zxing/view/ViewfinderView.java index ac3fc9f..797ac61 100755 --- a/app/src/main/java/com/rehome/dywoa/zxing/view/ViewfinderView.java +++ b/app/src/main/java/com/rehome/dywoa/zxing/view/ViewfinderView.java @@ -32,6 +32,7 @@ import com.rehome.dywoa.R; import com.rehome.dywoa.zxing.camera.CameraManager; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; @@ -131,7 +132,7 @@ public final class ViewfinderView extends View { } @Override - public void onDraw(Canvas canvas) { + public synchronized void onDraw(Canvas canvas) { Rect frame = CameraManager.get().getFramingRect(); if (frame == null) { return; @@ -203,7 +204,8 @@ public final class ViewfinderView extends View { if (currentPossible.isEmpty()) { lastPossibleResultPoints = null; } else { - possibleResultPoints = new HashSet(5); + //possibleResultPoints = new HashSet(5); + possibleResultPoints = Collections.synchronizedSet(new HashSet(5)); lastPossibleResultPoints = currentPossible; paint.setAlpha(OPAQUE); paint.setColor(resultPointColor); diff --git a/app/src/main/res/drawable-xhdpi/icon_bi_new.png b/app/src/main/res/drawable-xhdpi/icon_bi_new.png new file mode 100644 index 0000000..d689def Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_bi_new.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_dj_new.png b/app/src/main/res/drawable-xhdpi/icon_dj_new.png new file mode 100644 index 0000000..a6afde7 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_dj_new.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_gkyth.png b/app/src/main/res/drawable-xhdpi/icon_gkyth.png new file mode 100644 index 0000000..765a3da Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_gkyth.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_high_risk.png b/app/src/main/res/drawable-xhdpi/icon_high_risk.png new file mode 100644 index 0000000..461c750 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_high_risk.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_jzcs_new.png b/app/src/main/res/drawable-xhdpi/icon_jzcs_new.png new file mode 100644 index 0000000..7c019a5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_jzcs_new.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_kks_search.png b/app/src/main/res/drawable-xhdpi/icon_kks_search.png new file mode 100644 index 0000000..2c1c671 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_kks_search.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_lpqt.png b/app/src/main/res/drawable-xhdpi/icon_lpqt.png new file mode 100644 index 0000000..7b71b82 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_lpqt.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_qj_new.png b/app/src/main/res/drawable-xhdpi/icon_qj_new.png new file mode 100644 index 0000000..b2f9924 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_qj_new.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_sis_new_first.png b/app/src/main/res/drawable-xhdpi/icon_sis_new_first.png new file mode 100644 index 0000000..c14d53b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_sis_new_first.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_yjya_new.png b/app/src/main/res/drawable-xhdpi/icon_yjya_new.png new file mode 100644 index 0000000..296445b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_yjya_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_bi_new.png b/app/src/main/res/drawable-xxhdpi/icon_bi_new.png new file mode 100644 index 0000000..beff9da Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_bi_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_dj_new.png b/app/src/main/res/drawable-xxhdpi/icon_dj_new.png new file mode 100644 index 0000000..c135816 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_dj_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_gkyth.png b/app/src/main/res/drawable-xxhdpi/icon_gkyth.png new file mode 100644 index 0000000..83a61bb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_gkyth.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_high_risk.png b/app/src/main/res/drawable-xxhdpi/icon_high_risk.png new file mode 100644 index 0000000..44a08da Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_high_risk.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_jzcs_new.png b/app/src/main/res/drawable-xxhdpi/icon_jzcs_new.png new file mode 100644 index 0000000..618baf6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_jzcs_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_kks_search.png b/app/src/main/res/drawable-xxhdpi/icon_kks_search.png new file mode 100644 index 0000000..87787fc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_kks_search.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_lpqt.png b/app/src/main/res/drawable-xxhdpi/icon_lpqt.png new file mode 100644 index 0000000..83ce762 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_lpqt.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_qj_new.png b/app/src/main/res/drawable-xxhdpi/icon_qj_new.png new file mode 100644 index 0000000..8d3cde7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_qj_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_sis_new_first.png b/app/src/main/res/drawable-xxhdpi/icon_sis_new_first.png new file mode 100644 index 0000000..9cc4ad1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_sis_new_first.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_yjya_new.png b/app/src/main/res/drawable-xxhdpi/icon_yjya_new.png new file mode 100644 index 0000000..f5dcfe6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_yjya_new.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_bi_new.png b/app/src/main/res/drawable-xxxhdpi/icon_bi_new.png new file mode 100644 index 0000000..7f4508a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_bi_new.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_dj_new.png b/app/src/main/res/drawable-xxxhdpi/icon_dj_new.png new file mode 100644 index 0000000..8b79a2e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_dj_new.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_gkyth.png b/app/src/main/res/drawable-xxxhdpi/icon_gkyth.png new file mode 100644 index 0000000..7896c1a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_gkyth.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_high_risk.png b/app/src/main/res/drawable-xxxhdpi/icon_high_risk.png new file mode 100644 index 0000000..42046ed Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_high_risk.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_jzcs_new.png b/app/src/main/res/drawable-xxxhdpi/icon_jzcs_new.png new file mode 100644 index 0000000..157d962 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_jzcs_new.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_kks_search.png b/app/src/main/res/drawable-xxxhdpi/icon_kks_search.png new file mode 100644 index 0000000..c685a11 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_kks_search.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_lpqt.png b/app/src/main/res/drawable-xxxhdpi/icon_lpqt.png new file mode 100644 index 0000000..142e0b6 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_lpqt.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_qj_new.png b/app/src/main/res/drawable-xxxhdpi/icon_qj_new.png new file mode 100644 index 0000000..3b970fe Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_qj_new.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_sis_new_first.png b/app/src/main/res/drawable-xxxhdpi/icon_sis_new_first.png new file mode 100644 index 0000000..5bf4cd3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_sis_new_first.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_yjya_new.png b/app/src/main/res/drawable-xxxhdpi/icon_yjya_new.png new file mode 100644 index 0000000..cae631c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon_yjya_new.png differ diff --git a/app/src/main/res/layout/activity_fan_wei.xml b/app/src/main/res/layout/activity_fan_wei.xml new file mode 100644 index 0000000..4017bfc --- /dev/null +++ b/app/src/main/res/layout/activity_fan_wei.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_xsgz.xml b/app/src/main/res/layout/activity_xsgz.xml index 3dc4bc1..b8fc278 100644 --- a/app/src/main/res/layout/activity_xsgz.xml +++ b/app/src/main/res/layout/activity_xsgz.xml @@ -30,8 +30,24 @@ +