From 74a5bc00053d3fd9e2911d4d3877a71c807cafbd Mon Sep 17 00:00:00 2001 From: hwf452 Date: Mon, 10 Mar 2025 14:54:39 +0800 Subject: [PATCH] 1.1.2 release --- BHDXJ/app/build.gradle | 4 +- .../rehome/bhdxj/activity/LoginActivity.kt | 2 +- .../rehome/bhdxj/activity/MainActivity.java | 45 +++++++++ .../rehome/bhdxj/activity/QxgdNewActivity.kt | 98 ++++++++++++------- .../com/rehome/bhdxj/contans/Contans.java | 13 ++- .../app/src/main/res/drawable/presslogout.xml | 21 ++++ .../app/src/main/res/layout/activity_main.xml | 63 +++++++++--- BHDXJ/app/src/main/res/values/styles.xml | 6 ++ 8 files changed, 191 insertions(+), 61 deletions(-) create mode 100644 BHDXJ/app/src/main/res/drawable/presslogout.xml diff --git a/BHDXJ/app/build.gradle b/BHDXJ/app/build.gradle index 68ef346..92409f4 100755 --- a/BHDXJ/app/build.gradle +++ b/BHDXJ/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.rehome.bhdxj" minSdk 24 targetSdk 35 - versionCode 111 - versionName "1.1.1" + versionCode 112 + versionName "1.1.2" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/LoginActivity.kt b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/LoginActivity.kt index e2ab9ab..384a4f4 100644 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/LoginActivity.kt +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/LoginActivity.kt @@ -356,7 +356,7 @@ class LoginActivity : BaseActivityAutoToolbarViewBinding() val calendar = Calendar.getInstance() //增加7天，负数则为减少天数 //calendar.add(Calendar.DATE, 1) - calendar.add(Calendar.DATE, 7) + calendar.add(Calendar.DATE, 2) val nowStr = sdFormat.format(calendar.time) SPUtils.put( context, diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/MainActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/MainActivity.java index 58c3607..23d0ece 100644 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/MainActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/MainActivity.java @@ -13,7 +13,9 @@ import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.WindowManager; +import android.widget.Button; import android.widget.GridView; +import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; @@ -40,6 +42,7 @@ import com.rehome.bhdxj.utils.NohttpUtils; import com.rehome.bhdxj.utils.OAToolbar; import com.rehome.bhdxj.utils.SPUtils; import com.rehome.bhdxj.utils.StatusBarUtil; +import com.rehome.bhdxj.weight.AuditDialog; import com.rehome.bhdxj.weight.toastviewbymyself; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.RequestMethod; @@ -59,6 +62,9 @@ import java.util.TimerTask; public class MainActivity extends BaseActivity3 { + Button btnLogout; + TextView tvLoginUser; + OAToolbar toolbar; GridView gv; @@ -84,12 +90,19 @@ public class MainActivity extends BaseActivity3 { @Override public void initView() { toolbar = findViewById(R.id.toolbar); + btnLogout = findViewById(R.id.btn_logout); + tvLoginUser = findViewById(R.id.tv_login_user); gv = findViewById(R.id.gv); toolbar.setBackgroundColor(Color.parseColor("#00000000")); getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);//设置透明状态栏 getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);//设置透明导航栏 StatusBarUtil.transparencyBar(MainActivity.this);//设置透明状态栏 + String username = (String) SPUtils.get(MainActivity.this, Contans.USERNAME, String.valueOf("")); + if (username != null) { + tvLoginUser.setText("登录用户：" + username); + } + if (NetworkUtil.canNetWorkConnect(context)) { Log.i("app", "有网络"); } else { @@ -102,6 +115,38 @@ public class MainActivity extends BaseActivity3 { if(NetworkUtil.canNetWorkConnect(context)&& NetworkUtil.isWifiNetWorkConnect(context)){ Log.i("app", "wifi网络"); } + + btnLogout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + AuditDialog auditDialog = new AuditDialog(context, "确定要退出登录吗？", new AuditDialog.AuditDialogListener() { + @Override + public void confirm() { + SPUtils.remove(MainActivity.this,"save"); + //SPUtils.remove(MainActivity.this,Contans.USERID); + //SPUtils.remove(MainActivity.this,Contans.USERPWD); + SPUtils.remove(MainActivity.this,Contans.USERNAME); + SPUtils.remove(MainActivity.this,Contans.BZBH); + SPUtils.remove(MainActivity.this,Contans.BZMC); + SPUtils.remove(MainActivity.this,Contans.PERMISSIONSRESULT); + SPUtils.remove(MainActivity.this,Contans.NFCBM); + SPUtils.remove(MainActivity.this,Contans.LASTLOGINDATE); + //SPUtils.clear(MainActivity.this); + + Intent intent = new Intent(MainActivity.this, LoginActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); + startActivity(intent); + finish(); + } + + @Override + public void cancel() { + + } + }); + auditDialog.show(); + } + }); } @Override diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt index ec3f00a..d946ad4 100644 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/QxgdNewActivity.kt @@ -107,43 +107,59 @@ class QxgdNewActivity : BaseActivityOaToolbarViewBinding binding.etQxms.setContentTextSize(54) binding.ilJz.setOnClickListener(View.OnClickListener { v: View? -> - val dialog = ListDialog( - context, jzDialogDatas - ) { _: String?, position: Int -> - jzValue = jzList[position].value - binding.ilJz.content = jzList[position].description + if(jzDialogDatas.size>0){ + val dialog = ListDialog( + context, jzDialogDatas + ) { _: String?, position: Int -> + jzValue = jzList[position].value + binding.ilJz.content = jzList[position].description + } + dialog.show() + }else{ + showToast("下拉数据获取失败，请检测网络环境，返回上一级页面后再重新进入当前页面。") } - dialog.show() }) binding.ilZy.setOnClickListener(View.OnClickListener { v: View? -> - val dialog = ListDialog( - context, zyDialogDatas - ) { _: String?, position: Int -> - zyValue = zyList[position].value - binding.ilZy.content = zyList[position].description + if(zyDialogDatas.size>0){ + val dialog = ListDialog( + context, zyDialogDatas + ) { _: String?, position: Int -> + zyValue = zyList[position].value + binding.ilZy.content = zyList[position].description + } + dialog.show() + }else{ + showToast("下拉数据获取失败，请检测网络环境，返回上一级页面后再重新进入当前页面。") } - dialog.show() }) binding.ilQxlx.setOnClickListener(View.OnClickListener { v: View? -> - val dialog = ListDialog( - context, gzlxDialogDatas - ) { _: String?, position: Int -> - lxvalue = gzlxList[position].value - binding.ilQxlx.content = gzlxList[position].description + if(gzlxDialogDatas.size>0){ + val dialog = ListDialog( + context, gzlxDialogDatas + ) { _: String?, position: Int -> + lxvalue = gzlxList[position].value + binding.ilQxlx.content = gzlxList[position].description + } + dialog.show() + }else{ + showToast("下拉数据获取失败，请检测网络环境，返回上一级页面后再重新进入当前页面。") } - dialog.show() }) binding.ilQxdj.setOnClickListener(View.OnClickListener { v: View? -> - val dialog = ListDialog( - context, gdjbDialogDatas - ) { _: String?, position: Int -> - qxdjValue = gdjbList[position].value - binding.ilQxdj.content = gdjbList[position].description + if(gdjbDialogDatas.size>0){ + val dialog = ListDialog( + context, gdjbDialogDatas + ) { _: String?, position: Int -> + qxdjValue = gdjbList[position].value + binding.ilQxdj.content = gdjbList[position].description + } + dialog.show() + }else{ + showToast("下拉数据获取失败，请检测网络环境，返回上一级页面后再重新进入当前页面。") } - dialog.show() }) binding.ilWz.setOnClickListener(View.OnClickListener { @@ -158,24 +174,32 @@ class QxgdNewActivity : BaseActivityOaToolbarViewBinding }) binding.ilGzlb.setOnClickListener(View.OnClickListener { v: View? -> - val dialog = ListDialog( - context, gzlbDialogDatas - ) { _: String?, position: Int -> - gzlbValue = gzlbList[position].value - binding.ilGzlb.content = gzlbList[position].description - checkConnectServerGzxx() + if(gzlbDialogDatas.size>0){ + val dialog = ListDialog( + context, gzlbDialogDatas + ) { _: String?, position: Int -> + gzlbValue = gzlbList[position].value + binding.ilGzlb.content = gzlbList[position].description + checkConnectServerGzxx() + } + dialog.show() + }else{ + showToast("下拉数据获取失败，请先选择位置。") } - dialog.show() }) binding.ilGzxx.setOnClickListener(View.OnClickListener { v: View? -> - val dialog = ListDialog( - context, gzxxDialogDatas - ) { _: String?, position: Int -> - gzxxValue = gzxxList[position].value - binding.ilGzxx.content = gzxxList[position].description + if(gzxxDialogDatas.size>0){ + val dialog = ListDialog( + context, gzxxDialogDatas + ) { _: String?, position: Int -> + gzxxValue = gzxxList[position].value + binding.ilGzxx.content = gzxxList[position].description + } + dialog.show() + }else{ + showToast("下拉数据获取失败，请先选择故障类别。") } - dialog.show() }) } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java index 82bb0bd..cf0db47 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/contans/Contans.java @@ -5,11 +5,14 @@ public class Contans { public static String LOGIN = "AppLogin/GetData.aspx"; public static String CHECK_UPDATA_APK = "ApkUpdate/GetData.aspx"; -// public static String IP = "http://10.46.0.164:8002/"; + // public static String IP = "http://10.46.0.164:8002/"; // public static String MAXIMOIP = "http://10.46.0.15:7001/"; - - public static String IP = "http://10.46.0.164:8003/"; - public static String MAXIMOIP = "http://10.46.0.164:8003/"; + //测试IP +// public static String IP = "http://10.46.0.164:8003/"; +// public static String MAXIMOIP = "http://10.46.0.164:8003/"; + //正式接口IP + public static String IP = "http://10.46.0.164:8002/"; + public static String MAXIMOIP = "http://10.46.0.164:8002/"; // public static String MAXIMOIP = "http://10.46.0.152:7001/"; @@ -27,7 +30,7 @@ public class Contans { //缺陷工单专业下拉 public static String QX_GET_ZY_DROP = "QXGD/QXGD_JCSJ.ashx"; //缺陷工单提交 - public static String QX_SUBMIT_URL= "QXGD/QXGD_WORKORDER.ashx"; + public static String QX_SUBMIT_URL = "QXGD/QXGD_WORKORDER.ashx"; //连接服务器测试，看客户端是否能连接到服务器，如果能就响应个1 public static final String check_server_connect = "WL/WLPD.ashx"; diff --git a/BHDXJ/app/src/main/res/drawable/presslogout.xml b/BHDXJ/app/src/main/res/drawable/presslogout.xml new file mode 100644 index 0000000..d761154 --- /dev/null +++ b/BHDXJ/app/src/main/res/drawable/presslogout.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/BHDXJ/app/src/main/res/layout/activity_main.xml b/BHDXJ/app/src/main/res/layout/activity_main.xml index 0029c7b..f3fddae 100755 --- a/BHDXJ/app/src/main/res/layout/activity_main.xml +++ b/BHDXJ/app/src/main/res/layout/activity_main.xml @@ -11,23 +11,54 @@ - + android:layout_height="wrap_content" + android:visibility="gone"> + - + + + + + + + + +