1.2.2 release

master
hwf452 10 months ago
parent f7dcab6507
commit 699333db12

@ -10,8 +10,8 @@ android {
applicationId "com.rehome.dywoa" applicationId "com.rehome.dywoa"
minSdk 24 minSdk 24
targetSdk 35 targetSdk 35
versionCode 22 versionCode 23
versionName "1.2.1" versionName "1.2.2"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//authorities //authorities

@ -1,5 +1,6 @@
package com.rehome.dywoa.ui.activity.sbxdjgl package com.rehome.dywoa.ui.activity.sbxdjgl
import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.util.Log import android.util.Log
import android.view.View import android.view.View
@ -63,7 +64,7 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding<ActivityMjApplyBinding>
//MjApplySubmitActivity //MjApplySubmitActivity
resetCurrentWeek() resetCurrentMonth()
// binding.tvSt.setOnClickListener(View.OnClickListener { view: View? -> // binding.tvSt.setOnClickListener(View.OnClickListener { view: View? ->
// //
@ -450,6 +451,7 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding<ActivityMjApplyBinding>
val request = NoHttp.createStringRequest(url, RequestMethod.POST) val request = NoHttp.createStringRequest(url, RequestMethod.POST)
request.setDefineRequestBodyForJson(json) request.setDefineRequestBodyForJson(json)
NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String> { NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String> {
@SuppressLint("SetTextI18n")
override fun onSucceed(what: Int, response: Response<String>?) { override fun onSucceed(what: Int, response: Response<String>?) {
if (response != null) { if (response != null) {
val result = response.get() val result = response.get()
@ -462,6 +464,8 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding<ActivityMjApplyBinding>
datas.clear() datas.clear()
datas.addAll(bean.rows) datas.addAll(bean.rows)
adapter.notifyDataSetChanged() adapter.notifyDataSetChanged()
binding.tvLjzrws.text=bean.total.toString()
//binding.lv.smoothScrollToPosition(0)
}else { }else {
datas.clear() datas.clear()
adapter.notifyDataSetChanged() adapter.notifyDataSetChanged()

@ -105,6 +105,7 @@ public class HomeFragment extends BaseFragment {
LinearLayout ll_account; LinearLayout ll_account;
ImageView iv; ImageView iv;
AutoGridView gv; AutoGridView gv;
LinearLayout ll_tip;
// XUILinearLayout mTestLayout; // XUILinearLayout mTestLayout;
// XUILinearLayout mTestLayout2; // XUILinearLayout mTestLayout2;
// RecyclerView recyclerView; // RecyclerView recyclerView;
@ -167,6 +168,14 @@ public class HomeFragment extends BaseFragment {
startActivity(intentWaitFor); startActivity(intentWaitFor);
} }
}); });
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
//隐藏掉 本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息
//showLog("隐藏掉 本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息")
ll_tip.setVisibility(View.GONE);
}
}, 5000);
} }
@Override @Override
@ -189,6 +198,7 @@ public class HomeFragment extends BaseFragment {
gv = view.findViewById(R.id.gv); gv = view.findViewById(R.id.gv);
tv_todo_count = view.findViewById(R.id.tv_todo_count); tv_todo_count = view.findViewById(R.id.tv_todo_count);
ll_account = view.findViewById(R.id.ll_account); ll_account = view.findViewById(R.id.ll_account);
ll_tip = view.findViewById(R.id.ll_tip);
// mTestLayout = view.findViewById(R.id.layout_xui); // mTestLayout = view.findViewById(R.id.layout_xui);
// mTestLayout2 = view.findViewById(R.id.layout_xui2); // mTestLayout2 = view.findViewById(R.id.layout_xui2);
// recyclerView = view.findViewById(R.id.recycler_view); // recyclerView = view.findViewById(R.id.recycler_view);

@ -153,6 +153,29 @@
android:text="登录" /> android:text="登录" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="100dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#DAA520"
android:text="本平台为非涉密平台,严禁处理、传输"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#DAA520"
android:text="国家秘密、工作秘密、商业秘密、敏感信息"
android:textSize="16sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/tv_sbcChangePwd" android:id="@+id/tv_sbcChangePwd"

@ -15,7 +15,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#dddddd" android:background="#dddddd"
android:padding="5dp" android:padding="3dp"
android:minHeight="30px"> android:minHeight="30px">
<TextView <TextView
android:id="@+id/tv_zxsj" android:id="@+id/tv_zxsj"
@ -118,7 +118,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#dddddd" android:background="#dddddd"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp" android:padding="3dp"
android:minHeight="30px"> android:minHeight="30px">
<Button <Button
android:id="@+id/tv_last_day" android:id="@+id/tv_last_day"
@ -169,6 +169,32 @@
android:text="今年" android:text="今年"
android:textSize="24px" /> android:textSize="24px" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#dddddd"
android:minHeight="30px">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="5px"
android:layout_weight="1"
android:gravity="center|right"
android:minHeight="50px"
android:text="漏检总任务数:"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_ljzrws"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="5px"
android:layout_weight="1"
android:gravity="center|left"
android:minHeight="50px"
android:textColor="#ff0000"
android:text="0"
android:textSize="22sp" />
</LinearLayout>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"

@ -12,6 +12,25 @@
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/page_bg_mine"> android:background="@drawable/page_bg_mine">
<LinearLayout
android:id="@+id/ll_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFF00"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textColor="#d9524b"
android:text="本平台为非涉密平台,严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息。"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

Loading…
Cancel
Save