From 49509d7c6d02e85522320eaad01004cb3e55f974 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Wed, 17 Apr 2024 17:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E9=A2=84=E8=AE=A2=20?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=BD=91=E7=BB=9C=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 - .../meetingbook/base/BaseActivity2.java | 13 ++ .../rehome/meetingbook/contans/Contans.java | 142 ++++++++++++++++++ .../ui/activity/LoginActivity.java | 103 ++++++++++++- .../utils/NoProgresshttpUtils.java | 14 ++ .../com/rehome/meetingbook/utils/UiUtlis.java | 110 ++++++++++++++ app/src/main/res/values/strings.xml | 1 + .../main/res/xml/network_security_config.xml | 8 +- 8 files changed, 380 insertions(+), 16 deletions(-) create mode 100644 app/src/main/java/com/rehome/meetingbook/contans/Contans.java create mode 100644 app/src/main/java/com/rehome/meetingbook/utils/UiUtlis.java diff --git a/app/build.gradle b/app/build.gradle index a66ce60..c122944 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,11 +37,6 @@ android { minifyEnabled false buildConfigField "boolean", "LOG_ERROR", "true" } - debug { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - buildConfigField("boolean","LOG_ERROR","true"); - } release { lintOptions { checkReleaseBuilds false diff --git a/app/src/main/java/com/rehome/meetingbook/base/BaseActivity2.java b/app/src/main/java/com/rehome/meetingbook/base/BaseActivity2.java index 7221703..2593cf8 100644 --- a/app/src/main/java/com/rehome/meetingbook/base/BaseActivity2.java +++ b/app/src/main/java/com/rehome/meetingbook/base/BaseActivity2.java @@ -2,6 +2,8 @@ package com.rehome.meetingbook.base; import android.content.Context; import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; import android.view.WindowManager; import android.widget.Toast; @@ -9,6 +11,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.viewbinding.ViewBinding; +import com.rehome.meetingbook.BuildConfig; import com.rehome.meetingbook.utils.ControllerActivity; /** @@ -64,4 +67,14 @@ public abstract class BaseActivity2 extends AppCompatActi protected abstract void initView(); protected abstract void initData(); + public void showLog(String logText) { + if (BuildConfig.LOG_ERROR) { + if(TextUtils.isEmpty(logText)){ + Log.i("app", "logText is null"); + }else{ + Log.i("app", logText); + } + } + } + } diff --git a/app/src/main/java/com/rehome/meetingbook/contans/Contans.java b/app/src/main/java/com/rehome/meetingbook/contans/Contans.java new file mode 100644 index 0000000..707df49 --- /dev/null +++ b/app/src/main/java/com/rehome/meetingbook/contans/Contans.java @@ -0,0 +1,142 @@ +package com.rehome.meetingbook.contans; + + +public class Contans { + + + public static String LOGIN = "app/meeting_room/check_meeting_room_status"; + public static String CHECK_UPDATA_APK = "ApkUpdate/GetData.aspx"; + + + public static String IP = "http://192.168.2.191:8510/"; +// public static String network_type_Intranet = "http://192.168.254.1:8090/"; +// public static String network_type_extranet = "http://113.107.214.27:8090/"; + +// public static String IP = "http://113.107.214.27:8092/"; +// public static String network_type_Intranet = "http://192.168.254.1:8092/"; +// public static String network_type_extranet = "http://113.107.214.27:8092/"; + +// public static String IP = "http://192.168.2.6:8089/"; +// public static String network_type_Intranet = "http://192.168.2.6:8089/"; +// public static String network_type_extranet = "http://192.168.2.6:8089/"; + + + public static String MAXIMOIP = "http://10.46.0.152:7001/"; + //public static String Q4_MAGES_URL = "http://113.107.214.27:8090/Q4WorkOrder/D4GD_IMG_XS.ashx?Url="; + public static String Q4_MAGES_URL = "http://192.168.254.1/Q4WorkOrder/D4GD_IMG_XS.ashx?Url="; + + +// public static String IP = "http://192.168.2.116:3028/"; + + + // //获取到的蓝牙mac地址 +// /*-------------------------------*/ +// public final static String LOCALBLEADDRESS = "LOCALBLEADDRESS"; +// /*-------------------------------*/ + public static String YXCB_ZY_ID = "";//运行抄表专业ID + public static String YXCB_ZY_NAME = "";//运行抄表专业名字 + + //-----------------------点检--------------------------// + public static String DJJHLIST = "DJGL/DJGL_GWDJ.ashx";//prame BZMC = 测试班组 + public static String DJJHDLB = "DJGL/DJGL_GWDJ.ashx";// prame jhid=20161013141937; + public static String DJJHXCJSSC = "DJGL/DJGL_XCJS.ashx";//ms:描述 fileps:文件 poinnum jhid + public static String DJJHSC = "DJGL/DJGL_GWDJ.ashx";//json字符串 + public static String DJJHQXGD = "DJGL/DJGL_QXGD.ashx";//json字符串 + public static String QXGDZY = "QXGD/QXGD_ZYXX.ASHX"; + public static String YHPC = "AJH/AJH_YHPCSC.ashx";//隐患排查 + public static String YHPCTP = "AJH/AJH_YHWJSC.ashx";//guid + //-----------------------安健环------------------------// + public static String AJHJHLIST = "AJH/AJH_XZJH.ashx"; + public static String AJHXZRW = "AJH/AJH_XZRW.ashx"; + public static String AJHSC = "AJH/AJH_JLSC.ashx"; + public static String AJHXCJS = "AJH/AJH_JSXC.ashx"; + public static String XWAQGC = "ajh/gc_xzrw.ashx"; //gh = + public static String QY = "djgl/DJGL_QYLIST.ashx"; + public static String XWAQGCSC = "ajh/gc_jlsc.ashx";//观察结果上传 + public static String XWAQGCJS = "ajh/GC_JSSC.ashx";//记事上传 + public static String GZQKSBLIST = "AJH/GZQKSB/GetDataByList.ashx";//工作上报列表查看 + public static String GZQKSBSAVE = "AJH/GZQKSB/SaveData.ashx";//工作情况上报保存 + public static String GZQKSBGB = "AJH/GZQKSB/SetRWState.ashx";//工作情况上报关闭 + public static String GZQKID = "AJH/GZQKSB/GetDataByID.ashx"; + public final static int IMAGE_RESULT = 10; + public final static int SBXJZT_WWC = 0; + public final static int SBXJZT_ZC = 1; + public final static int SBXJZT_BZC = 2; + public final static int RESULT_OK = 1; + public final static int DLB = 1; + public final static int ZKDLB = 2; + //==============================巡视抄表=========================================// + public final static String XSCB = "XSCB/YX_XJGL.ashx";//巡检管理/巡检任务列表 + public final static String XSCB_PLAN_DOWNLOAD = "XSCB/YX_XJGL.ashx";///巡检管理/巡检任务/巡检数据管理/计划下载 + public final static String BAXJ = "XSCB/BA_XJGL.ashx";//保安巡检任务列表 + public final static String XSCB_PLAN_BA_DOWNLOAD = "XSCB/BA_XJGL.ashx";///保安巡检计划下载 + public final static String XSCB_PLAN_BA_UPLOAD = "XSCB/BA_XJGL.ashx";///保安巡检计划上传 + public final static String DQGZ = "DQGZ/YF_DQGZ.ashx";//定期工作列表 + public final static String DQGZ_UPLOAD_TASK = "DQGZ/YF_DQGZ.ashx";//定期工作上传 + public final static String GET_MY_UPLOAD_CHECKED = "XSCB/MY_UPLOAD.ashx";//获取本人上传的巡检数据 + public final static String GET_STATISTICS_DATA = "XSCB/STATISTICS_CHECKED.ashx";//获取本人上传的巡检数据 + public final static String LAST_UPLOAD_POINT_CHECKED = "XSCB/LAST_UPLOAD_POINT_CHECKED.ashx";//nfc获取当前值当前点最后的已巡检人 + public final static String XJ_UPLOAD_LOCATION_CHECKED = "XSCB/CURRENT_CHECK_LOCALTION.ashx";//上传巡检人当前位置 + public final static String LAST_UPLOAD_POINT_CHECKED_TWOCODE = "XSCB/LAST_UPLOAD_POINT_CHECKED_TXM.ashx";//二维码扫描获取当前值当前点最后的已巡检人 + public final static String XJ_UPLOAD_LOCATION_CHECKED_TXM = "XSCB/CURRENT_CHECK_LOCALTION_TXM.ashx";//二维码扫描上传巡检人当前位置 + + + // ========================= intent KEY ========================// + public final static String KEY_ITEMID = "itemid"; + public final static String KEY_SBINFO = "sbinfo"; + public final static String KEY_SBDJLIST = "sbdjlist"; + public final static String KEY_JCZT = "zczt"; + public final static String KEY_MS = "ms"; + public final static String KEY_FLAG = "flag"; + public final static String KEY_IS_EDIT = "edit"; + public final static String KEY_NOTIF = "notification"; + public final static String KEY_PDID = "pdid"; + public final static String KEY_DJJHLIST = "djjhlist"; + public final static String KEY_DJJHRWQY = "djjhrwqy"; + public final static String KEY_ITEM = "item"; + public final static String FILEPS = "fileps"; + public final static String KEY_XSCBJH = "xscbjh"; + public final static String KEY_QY = "qydlist"; + public final static String KEY_EWM_OR_NFC = "ewm_or_nfc";//二维码或NFC 0 NFC 1 一维码二维码 + public final static String KEY_IS_HIS = "history";//历史 + public final static String KEY_JHLX = "jhlx"; + public final static String KEY_BG = "DQGZBG";//定期工作变更 + public final static String KEY_ZXID = "zxid"; + public final static String KEY_XS_HISTORY = "xs_history"; + public final static String KEY_NAME = "keyName"; + public final static String KEY_POSITION = "keyPosition"; + public final static String KEY_BQBM = "bqbm";//二维码或条形码 + public final static String KEY_NFCBH = "nfcbh";//NFC编号 + public final static String NFCOREWM = "nfcorewm"; + public final static String PERMISSIONSRESULT = "PermissionsResult"; + public final static String USERID = "USERID"; + public final static String USERPWD = "USERPWD"; + public final static String NETWORK_CHECK_TYPE = "NETWORK_CHECK_TYPE"; + public final static String LOGIN_TOKEN = "LOGIN_TOKEN"; + public final static String NFCBM = "NFCBM"; + public final static String BZBH = "bzbh"; + public final static String BZMC = "bzmc"; + public final static String USERNAME = "USERNAME"; + public final static String SCID = "scid"; + public final static String RWID = "rwid"; + public final static String ZY = "ZY"; + public final static String LASTLOGINDATE = "LASTLOGINDATE"; + /********************广播字段（唯一性）********************************/ + public static final String ACTION_YULONE = "actionYulOne"; + public static final String ACTION_YULTWO = "actionYulTwo"; + public static final String ACTION_REFRESHPLANDOWNLOAD = "refreshPlanDownload"; + public static final String ACTION_REFRESHPLANUPLOAD = "refreshPlanUpload"; + public static final String ACTION_REFRESHDOWNLOADPLAN = "refreshDownloadPlan"; + public static final String ACTION_PROFESSIONCHANGE = "professionChange"; + public static final String ACTION__MEMBER_CALL_BACK = "ACTION__MEMBER_CALL_BACK"; + + public final static String QFGD = "Q4GD/Q4GD_CKGL.ashx"; + public final static String QFDDVICELIST = "Q4WorkOrder/Q4SBGL.ashx"; + public final static String QFDDVICESUBLISTTREE = "Q4WorkOrder/Q4SBGL.ashx"; + public final static String QFGETOPTION = "Q4WorkOrder/Q4GD_CKGL.ashx"; + public final static String TJQFGD = "Q4WorkOrder/Q4SUBMIT.ashx"; + public final static String GETQXLIST = "Q4WorkOrder/GETQXLIST.ashx"; + public final static String Q4GD_IMG = "Q4WorkOrder/Q4GD_IMG.ashx"; + + +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/meetingbook/ui/activity/LoginActivity.java b/app/src/main/java/com/rehome/meetingbook/ui/activity/LoginActivity.java index b8c392e..ee24b33 100644 --- a/app/src/main/java/com/rehome/meetingbook/ui/activity/LoginActivity.java +++ b/app/src/main/java/com/rehome/meetingbook/ui/activity/LoginActivity.java @@ -9,6 +9,9 @@ import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbManager; +import android.os.Build; +import android.provider.Settings; +import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; @@ -21,9 +24,19 @@ import com.rehome.meetingbook.R; import com.rehome.meetingbook.ZKUSBManager.ZKUSBManager; import com.rehome.meetingbook.ZKUSBManager.ZKUSBManagerListener; import com.rehome.meetingbook.base.BaseActivity2; +import com.rehome.meetingbook.contans.Contans; import com.rehome.meetingbook.databinding.ActivityLoginBinding; import com.rehome.meetingbook.utils.ControllerActivity; +import com.rehome.meetingbook.utils.GsonUtils; +import com.rehome.meetingbook.utils.HttpListener; +import com.rehome.meetingbook.utils.NoProgresshttpUtils; +import com.rehome.meetingbook.utils.NohttpUtils; +import com.rehome.meetingbook.utils.UiUtlis; import com.rehome.meetingbook.weiget.CustomLoadingDialog; +import com.yolanda.nohttp.NoHttp; +import com.yolanda.nohttp.RequestMethod; +import com.yolanda.nohttp.rest.Request; +import com.yolanda.nohttp.rest.Response; import com.zkteco.android.biometric.core.device.ParameterHelper; import com.zkteco.android.biometric.core.device.TransportType; import com.zkteco.android.biometric.core.utils.LogHelper; @@ -34,7 +47,13 @@ import com.zkteco.android.biometric.module.idcard.exception.IDCardReaderExceptio import com.zkteco.android.biometric.module.idcard.meta.IDCardInfo; import com.zkteco.android.biometric.module.idcard.meta.IDPRPCardInfo; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -53,9 +72,7 @@ import androidx.appcompat.widget.Toolbar; public class LoginActivity extends BaseActivity2 { private long exitTime = 0; - - private String lastBtnCkick = "appointment"; // appointment search - + private String meetingRoomName = "报告厅"; @@ -108,7 +125,7 @@ public class LoginActivity extends BaseActivity2 { @Override protected void initData() { - + getMeetingRoomBookData(); } @Override @@ -189,4 +206,82 @@ public class LoginActivity extends BaseActivity2 { return null; } + public String getPhoneInfo(String name) { + Map param = new HashMap<>(); + param.put("name",name); + String json = GsonUtils.GsonString(param); + showLog(json); + return json; + } + + private void getMeetingRoomBookData() { + String json = getPhoneInfo(meetingRoomName); + String url = Contans.IP + Contans.LOGIN; + Request request = NoHttp.createStringRequest(url, RequestMethod.POST); + +// SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(context); +// if (socketFactory != null) { +// request.setSSLSocketFactory(socketFactory); +// request.setHostnameVerifier(new HostnameVerifier() { +// @Override +// public boolean verify(String s, SSLSession sslSession) { +// return true; +// } +// }); +// } + + request.setDefineRequestBodyForJson(json); + NoProgresshttpUtils.getInstance().add( 0, request, callback); + //NohttpUtils.getInstance().add(LoginActivity.this, 0, request, callback, true, true, "登录中..."); + } + + private HttpListener callback = new HttpListener() { + @Override + public void onSucceed(int what, Response response) { + String result = response.get(); + showLog("-----login-----"); + showLog(result); + +// UserInfo userInfo = GsonUtils.GsonToBean(jsonDecode, UserInfo.class); +// +// if (userInfo != null) { +// UserInfo.User user = userInfo.getRows().get(0); +// String status = user.getStatus(); +// String username = user.getUsernames(); +// String token = user.getToken(); +// +// +// switch (status) { +// case "0": +// showToast("用户名或密码错误"); +// break; +// case "1": +// if (user != null && user.getUsername() != null) { +// String usernameLogin = UiUtlis.getText(etUse); +// if (usernameLogin != null && usernameLogin.equals(user.getUsername())) { +// +// } +// } +// break; +// case "2": +// showToast("登录异常..."); +// break; +// case "3": +// showToast("未激活或未授权..."); +// break; +// case "4": +// showToast("禁止登陆..."); +// break; +// } +// } else { +// showLog(UiUtlis.getString(context, R.string.data_error)); +// } + } + + @Override + public void onFailed(int what, Response response) { + } + }; + + } \ No newline at end of file diff --git a/app/src/main/java/com/rehome/meetingbook/utils/NoProgresshttpUtils.java b/app/src/main/java/com/rehome/meetingbook/utils/NoProgresshttpUtils.java index 949a494..b82f4a7 100644 --- a/app/src/main/java/com/rehome/meetingbook/utils/NoProgresshttpUtils.java +++ b/app/src/main/java/com/rehome/meetingbook/utils/NoProgresshttpUtils.java @@ -7,6 +7,10 @@ package com.rehome.meetingbook.utils; */ import android.content.Context; +import android.text.TextUtils; +import android.util.Log; + +import com.rehome.meetingbook.BuildConfig; import com.rehome.meetingbook.R; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.download.DownloadQueue; @@ -63,6 +67,7 @@ public class NoProgresshttpUtils { public void add(int what, Request request, HttpListener callback) { + showLog(request.url()); mQueue.add(what, request, new HttpResponseListenerNoProgress(request, callback)); } @@ -113,4 +118,13 @@ public class NoProgresshttpUtils { } return null; } + public void showLog(String logText) { + if (BuildConfig.LOG_ERROR) { + if(TextUtils.isEmpty(logText)){ + Log.i("app", "logText is null"); + }else{ + Log.i("app", logText); + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/rehome/meetingbook/utils/UiUtlis.java b/app/src/main/java/com/rehome/meetingbook/utils/UiUtlis.java new file mode 100644 index 0000000..c45a03a --- /dev/null +++ b/app/src/main/java/com/rehome/meetingbook/utils/UiUtlis.java @@ -0,0 +1,110 @@ +package com.rehome.meetingbook.utils; + + +import android.content.Context; +import android.text.TextUtils; +import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * 一个ui的工具类 + */ +public class UiUtlis { + + public static String getText(EditText editText) { + return editText.getText().toString().trim(); + } + + public static String getString(Context context, int id) { + return context.getResources().getString(id); + } + + /** + * 隐藏键盘 + * + * @param editText EditText + * @param context Context + */ + public static void hideInput(EditText editText, Context context) { + InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(editText.getWindowToken(), 0); + } + + /** + * URL加密 + * + * @param text 加密的文本 + * @return + */ + public static String encoder(String text) { + + String name = ""; + try { + name = URLEncoder.encode(text, "utf-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return name; + } + + /** + * String类型转double + * + * @param text 文本 + * @return + */ + public static double getNum(String text) { + double num = 0; + try { + num = Double.parseDouble(text); + } catch (Exception e) { + e.printStackTrace(); + } + return num; + } + + /** + * 判断计划 + * + * @param time + * @return + */ + public static boolean isdelete(String time) { + + if (!time.isEmpty()) { + + String str = ""; + if (time.indexOf("-") != -1) { + str = "yyyy-MM-dd HH:mm:ss"; + } + + if (time.indexOf("/") != -1) { + str = "yyyy/MM/dd HH:mm:ss"; + } + + SimpleDateFormat sdf = new SimpleDateFormat(str); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date date = null; + try { + date = sdf.parse(time); + } catch (ParseException e) { + e.printStackTrace(); + } + long l1 = date.getTime();//服务器返回时间 + long l2 = System.currentTimeMillis();//系统时间 + return l1 < l2; + } + return false; + } + + public static boolean isEmpty(EditText editText) { + + return TextUtils.isEmpty(editText.getText().toString()); + } +} \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index de7d4a7..d6f7eb3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,4 +3,5 @@ 发送验证码 下一步 deletemember + 数据出错 \ No newline at end of file diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml index 689961b..c0772b4 100644 --- a/app/src/main/res/xml/network_security_config.xml +++ b/app/src/main/res/xml/network_security_config.xml @@ -1,13 +1,7 @@ - 192.168.2.215 + 192.168.2.191 10.19.0.73 - android.bugly.qq.com - - - - - \ No newline at end of file