hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add list

Browse Source
master
hwf452 2 years ago
parent 8c10f7d10a
commit 9f9f9b66ce
13 changed files with 204 additions and 35 deletions
Show Stats Download Patch File Download Diff File

13
app/src/main/java/com/rehome/zhdcoa/base/BaseActivity.java
Unescape Escape View File

@ -2,12 +2,15 @@ package com.rehome.zhdcoa.base;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
import android.widget.Toast;
import androidx.annotation.Nullable;
import com.rehome.zhdcoa.App;
import com.rehome.zhdcoa.AppManager;
import com.rehome.zhdcoa.BuildConfig;
import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.bean.UserInfoBean;
import com.rehome.zhdcoa.utils.StatusBarUtil;
@ -131,4 +134,14 @@ public abstract class BaseActivity extends AutoLayoutActivity {
protected void setStatusBar() {
StatusBarUtil.setColor(this, getResources().getColor(R.color.colorPrimary));
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
}

14
app/src/main/java/com/rehome/zhdcoa/base/BaseActivity2.java
Unescape Escape View File

@ -17,10 +17,14 @@ import android.nfc.tech.NfcV;
import android.os.Bundle;
import android.os.Parcelable;
import androidx.annotation.LayoutRes;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import com.rehome.zhdcoa.App;
import com.rehome.zhdcoa.BuildConfig;
import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.bean.UserInfoBean;
import com.rehome.zhdcoa.utils.ControllerActivity;
@ -283,4 +287,14 @@ public abstract class BaseActivity2 extends AutoLayoutActivity {
//showToast(result);
//Toast.makeText(this, result, Toast.LENGTH_LONG).show();
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
}

15
app/src/main/java/com/rehome/zhdcoa/base/BaseActivityAutoToolbarViewBinding.kt
Unescape Escape View File

@ -11,10 +11,13 @@ import android.nfc.NfcAdapter
import android.nfc.tech.*
import android.os.Build
import android.os.Bundle
import android.text.TextUtils
import android.util.Log
import android.view.View
import android.widget.Toast
import androidx.viewbinding.ViewBinding
import com.rehome.zhdcoa.App
import com.rehome.zhdcoa.BuildConfig
import com.rehome.zhdcoa.R
import com.rehome.zhdcoa.bean.UserInfoBean
import com.rehome.zhdcoa.utils.ControllerActivity
@ -151,7 +154,7 @@ abstract class BaseActivityAutoToolbarViewBinding<T : ViewBinding> : AutoLayoutA
this,
0,
Intent(this, javaClass).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP),
0
PendingIntent.FLAG_UPDATE_CURRENT
)
}
@ -283,4 +286,14 @@ abstract class BaseActivityAutoToolbarViewBinding<T : ViewBinding> : AutoLayoutA
listenerRightClick: View.OnClickListener?
) {
}
open fun showLog(logText: String?) {
if (BuildConfig.LOG_ERROR) {
if (TextUtils.isEmpty(logText)) {
Log.i("app", "logText is null")
} else {
Log.i("app", logText!!)
}
}
}
}

14
app/src/main/java/com/rehome/zhdcoa/base/BaseActivityOaToolbarViewBinding.kt
Unescape Escape View File

@ -11,11 +11,14 @@ import android.nfc.NfcAdapter
import android.nfc.tech.*
import android.os.Build
import android.os.Bundle
import android.text.TextUtils
import android.util.Log
import android.view.View
import android.widget.EditText
import android.widget.Toast
import androidx.viewbinding.ViewBinding
import com.rehome.zhdcoa.App
import com.rehome.zhdcoa.BuildConfig
import com.rehome.zhdcoa.R
import com.rehome.zhdcoa.bean.UserInfoBean
import com.rehome.zhdcoa.utils.ControllerActivity
@ -155,7 +158,7 @@ abstract class BaseActivityOaToolbarViewBinding<T : ViewBinding> : AutoLayoutAct
this,
0,
Intent(this, javaClass).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP),
0
PendingIntent.FLAG_UPDATE_CURRENT
)
}
@ -335,4 +338,13 @@ abstract class BaseActivityOaToolbarViewBinding<T : ViewBinding> : AutoLayoutAct
mToolbar.setIvLeftOnClickListener(listenerLeftClick)
mToolbar.setTvRightOnClickListener(listenerRightClick)
}
open fun showLog(logText: String?) {
if (BuildConfig.LOG_ERROR) {
if (TextUtils.isEmpty(logText)) {
Log.i("app", "logText is null")
} else {
Log.i("app", logText!!)
}
}
}
}

15
app/src/main/java/com/rehome/zhdcoa/base/BaseFragment.java
Unescape Escape View File

@ -5,11 +5,16 @@ import android.content.Context;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import com.rehome.zhdcoa.BuildConfig;
/**
* Created by Rehome-rjb1 on 2017/5/8.
* fragment的基类，所有的fragment都继承它
@ -72,4 +77,14 @@ public abstract class BaseFragment extends Fragment {
this.context = null;
mActivity =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);
}
}
}
}

15
app/src/main/java/com/rehome/zhdcoa/base/BaseLazyFragment.java
Unescape Escape View File

@ -5,11 +5,16 @@ import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import com.rehome.zhdcoa.BuildConfig;
/**
* Created by ruihong on 2018/4/20.
*/
@ -204,4 +209,14 @@ public abstract class BaseLazyFragment extends Fragment {
Toast.makeText(context, strId, Toast.LENGTH_SHORT).show();
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
}

16
app/src/main/java/com/rehome/zhdcoa/base/BaseViewBindingActivity.java
Unescape Escape View File

@ -19,9 +19,13 @@ import android.os.Bundle;
import android.os.Parcelable;
import androidx.appcompat.widget.Toolbar;
import androidx.viewbinding.ViewBinding;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Toast;
import com.rehome.zhdcoa.App;
import com.rehome.zhdcoa.BuildConfig;
import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.bean.UserInfoBean;
import com.rehome.zhdcoa.utils.ControllerActivity;
@ -145,7 +149,7 @@ public abstract class BaseViewBindingActivity<T extends ViewBinding> extends Aut
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
pendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
} else {
pendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
pendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), PendingIntent.FLAG_UPDATE_CURRENT);
}
@ -271,4 +275,14 @@ public abstract class BaseViewBindingActivity<T extends ViewBinding> extends Aut
protected void setStatusBar() {
StatusBarUtil.setColor(this, getResources().getColor(R.color.colorPrimary));
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
}

15
app/src/main/java/com/rehome/zhdcoa/base/BaseViewBindingFragment.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.rehome.zhdcoa.base;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -11,6 +13,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.viewbinding.ViewBinding;
import com.rehome.zhdcoa.BuildConfig;
/**
* Create By HuangWenFei
* 创建日期：2022-12-23 15:12
@ -72,4 +77,14 @@ public abstract class BaseViewBindingFragment<T extends ViewBinding> extends Fra
public void showToast(int strId) {
Toast.makeText(context, strId, Toast.LENGTH_SHORT).show();
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
}

67
app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt
Unescape Escape View File

@ -1,6 +1,7 @@
package com.rehome.zhdcoa.ui.activity
import android.content.Intent
import android.os.Build
import android.text.TextUtils
import android.util.Log
import android.view.View
@ -97,28 +98,23 @@ class AddDagerEnterApplyActivity :
private fun setAdapter() {
adapter = WhpListAdapter(context, whpList, object : WhpListAdapter.CallBack {
override fun deleteClick(position: Int) {
// val intent = Intent(context, AddDagerEnterApplyActivity::class.java)
// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
// intent.putExtra("isEdit",true)
// intent.putExtra("id",item.id)
// startActivity(intent)
}
})
binding.lv.adapter = adapter
binding.lv.onItemClickListener = AdapterView.OnItemClickListener { parent: AdapterView<*>?, view: View?, position: Int, id: Long ->
binding.lv.onItemClickListener =
AdapterView.OnItemClickListener { parent: AdapterView<*>?, view: View?, position: Int, id: Long ->
val item = whpList[position]
// if( item.istj==0){
// //已保存，未提交，进入新增/编辑页面
// //编辑危化品入厂申请
// val intent = Intent(context, AddDagerEnterApplyActivity::class.java)
// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
// intent.putExtra("isEdit",true)
// intent.putExtra("id",item.id)
// startActivity(intent)
// }else{
// //已提交，进入审核页面
// val intent = Intent(context, DagerEnterApplyDetailActivity::class.java)
// intent.putExtra("id", item.id)
// intent.putExtra("DepartmentNameId", item.dcfzbz)
// startActivity(intent)
// }
//编辑危化品入厂申请
val intent = Intent(context, AddDagerEnterApplyListActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
intent.putExtra("item", item)
launcherResultAddList.launch(intent)
}
}
@ -138,17 +134,46 @@ class AddDagerEnterApplyActivity :
}
}
//创建一个ActivityResultLauncher
//创建一个ActivityResultLauncher，添加一条危化品清单数据
private fun createActivityResultLauncherAddList(): ActivityResultLauncher<Intent> {
//kotlin写法
return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
val data = it.data
val resultCode = it.resultCode
if (resultCode == RESULT_OK) {
val callbackItem = data != null
showLog("---------------------")
showLog("$callbackItem")
if (data != null) {
departmentId = data.getStringExtra("departmentId")
departmentName = data.getStringExtra("departmentName")
binding.ilDinnerUnit.content = departmentName
val item: WhpListItemBean? =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
data.getParcelableExtra("item", WhpListItemBean::class.java)
} else {
data.getParcelableExtra("item")
}
val callbackItem1 =item != null
showLog("$callbackItem1")
if (item != null) {
if (item.id == null) {
whpList.add(item)
} else {
for (i in whpList.indices){
val itemBean = whpList[i]
if(itemBean.id.equals(item.id)){
itemBean.hspmc = item.hspmc
itemBean.wslb = item.wslb
itemBean.sybm = item.sybm
itemBean.zrr = item.zrr
itemBean.srcl = item.srcl
itemBean.ccdd = item.ccdd
itemBean.rt = item.rt
itemBean.msds = item.msds
}
}
}
}
adapter.notifyDataSetChanged()
}
}
}

32
app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyListActivity.kt
Unescape Escape View File

@ -1,15 +1,18 @@
package com.rehome.zhdcoa.ui.activity
import android.content.Intent
import android.os.Build
import android.text.TextUtils
import android.widget.Toast
import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
import com.rehome.zhdcoa.bean.WhpListItemBean
import com.rehome.zhdcoa.databinding.ActivityAddDagerEnterApplyListBinding
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself
class AddDagerEnterApplyListActivity :
BaseActivityOaToolbarViewBinding<ActivityAddDagerEnterApplyListBinding>() {
private var itemSource: WhpListItemBean? = null
override fun getViewBinding() = ActivityAddDagerEnterApplyListBinding.inflate(layoutInflater)
override fun getToolbar() = binding.toolbarView.toolbar
@ -26,13 +29,34 @@ class AddDagerEnterApplyListActivity :
item.ccdd = binding.ilCCDD.content
item.rt = binding.ilRT.content
item.msds = binding.ilMSDS.content
if (itemSource != null && itemSource?.id != null) {
item.id = itemSource?.id
}
//处理回填
val intent = Intent()
intent.putExtra("item", item)
setResult(RESULT_OK, intent)
finish()
}
}
itemSource = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
intent.getParcelableExtra("item", WhpListItemBean::class.java)
} else {
intent.getParcelableExtra("item")
}
}
override fun initData() {
if (itemSource != null) {
binding.ilHSPMC.content = itemSource!!.hspmc
binding.ilWSLB.content = itemSource!!.wslb
binding.ilSYBM.content = itemSource!!.sybm
binding.ilZRR.content = itemSource!!.zrr
binding.ilSRCL.content= itemSource!!.srcl
binding.ilCCDD.content= itemSource!!.ccdd
binding.ilRT.content= itemSource!!.rt
binding.ilMSDS.content= itemSource!!.msds
}
}
private fun checkForm(): Boolean {

17
app/src/main/res/layout/activity_add_dager_enter_apply.xml
Unescape Escape View File

@ -7,6 +7,7 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical"
android:background="#ffffff"
tools:context=".ui.activity.AddDagerEnterApplyActivity">
<include
@ -68,14 +69,18 @@
app:must="true"
app:tv_title="危化品清单" />
<com.rehome.zhdcoa.weiget.ListViewForScrollView
android:id="@+id/lv"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="50dp"
android:divider="@color/gray"
android:dividerHeight="1px" />
android:layout_margin="10dp"
android:background="#ffffff">
<com.rehome.zhdcoa.weiget.ListViewForScrollView
android:id="@+id/lv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@null"
android:dividerHeight="5dp" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="120px"

1
app/src/main/res/layout/activity_add_dager_enter_apply_list.xml
Unescape Escape View File

@ -26,7 +26,6 @@
android:id="@+id/il_HSPMC"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:isShowTextView="true"
app:must="true"
app:tv_title="危险化学品名称"/>
<com.rehome.zhdcoa.weiget.InputLayout

5
app/src/main/res/layout/adapter_whp_list.xml
Unescape Escape View File

@ -3,6 +3,11 @@
android:id="@+id/ll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="1dp"
android:paddingTop="5dp"
android:paddingEnd="5dp"
android:paddingBottom="5dp"
android:background="#eeeeee"
android:orientation="vertical">
<RelativeLayout

Write Preview
Loading…
Cancel
Save