From 699333db121e0e40e8f87ba6165bfc21607398df Mon Sep 17 00:00:00 2001 From: hwf452 Date: Mon, 24 Feb 2025 10:11:44 +0800 Subject: [PATCH] 1.2.2 release --- app/build.gradle | 4 +-- .../ui/activity/sbxdjgl/MjApplyActivity.kt | 6 +++- .../dywoa/ui/fragment/HomeFragment.java | 10 +++++++ app/src/main/res/layout/activity_login.xml | 23 ++++++++++++++ app/src/main/res/layout/activity_mj_apply.xml | 30 +++++++++++++++++-- app/src/main/res/layout/fragment_home.xml | 19 ++++++++++++ 6 files changed, 87 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 782c654..a1deb73 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.rehome.dywoa" minSdk 24 targetSdk 35 - versionCode 22 - versionName "1.2.1" + versionCode 23 + versionName "1.2.2" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt index 2995b67..c011699 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt @@ -1,5 +1,6 @@ package com.rehome.dywoa.ui.activity.sbxdjgl +import android.annotation.SuppressLint import android.content.Intent import android.util.Log import android.view.View @@ -63,7 +64,7 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding //MjApplySubmitActivity - resetCurrentWeek() + resetCurrentMonth() // binding.tvSt.setOnClickListener(View.OnClickListener { view: View? -> // @@ -450,6 +451,7 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding val request = NoHttp.createStringRequest(url, RequestMethod.POST) request.setDefineRequestBodyForJson(json) NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { + @SuppressLint("SetTextI18n") override fun onSucceed(what: Int, response: Response?) { if (response != null) { val result = response.get() @@ -462,6 +464,8 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding datas.clear() datas.addAll(bean.rows) adapter.notifyDataSetChanged() + binding.tvLjzrws.text=bean.total.toString() + //binding.lv.smoothScrollToPosition(0) }else { datas.clear() adapter.notifyDataSetChanged() 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 20dd197..6cf9636 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 @@ -105,6 +105,7 @@ public class HomeFragment extends BaseFragment { LinearLayout ll_account; ImageView iv; AutoGridView gv; + LinearLayout ll_tip; // XUILinearLayout mTestLayout; // XUILinearLayout mTestLayout2; // RecyclerView recyclerView; @@ -167,6 +168,14 @@ public class HomeFragment extends BaseFragment { startActivity(intentWaitFor); } }); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + //隐藏掉 本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息 + //showLog("隐藏掉 本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息") + ll_tip.setVisibility(View.GONE); + } + }, 5000); } @Override @@ -189,6 +198,7 @@ public class HomeFragment extends BaseFragment { gv = view.findViewById(R.id.gv); tv_todo_count = view.findViewById(R.id.tv_todo_count); ll_account = view.findViewById(R.id.ll_account); + ll_tip = view.findViewById(R.id.ll_tip); // mTestLayout = view.findViewById(R.id.layout_xui); // mTestLayout2 = view.findViewById(R.id.layout_xui2); // recyclerView = view.findViewById(R.id.recycler_view); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index dea1868..ccd5cc6 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -153,6 +153,29 @@ android:text="登录" /> + + + + +