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

2.3.6 release

Browse Source
master
hwf452 10 months ago
parent c4398c51f2
commit dd45c4610a
25 changed files with 279 additions and 54 deletions
Show Stats Download Patch File Download Diff File

4
app/build.gradle
Unescape Escape View File

@ -13,8 +13,8 @@ android {
applicationId "com.rehome.zhdcoa"
minSdk 24
targetSdk 35
versionCode 19
versionName "2.3.5"
versionCode 20
versionName "2.3.6"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

6
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -439,8 +439,7 @@
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.QrCodeActivity"
android:screenOrientation="portrait" />
<!-- <activity-->
android:screenOrientation="portrait" /> <!-- <activity -->
<!-- android:name=".ui.activity.CaptureActivity" -->
<!-- android:screenOrientation="portrait" /> -->
<activity
@ -497,6 +496,9 @@
<activity
android:name=".ui.activity.NFCInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.QrCodeInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.dqgzglActivity"
android:screenOrientation="portrait" />

2
app/src/main/java/com/rehome/zhdcoa/service/PushService.java
Unescape Escape View File

@ -430,7 +430,7 @@ public class PushService extends IntentService {
AlertDialog dialog = builder.create();
dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);
dialog.show();
//builder.show();
}
@Override

1
app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java
Unescape Escape View File

@ -227,7 +227,6 @@ public class AjhGzActivity extends BaseActivity2 {
// dialogInterface.dismiss();
// }
// });
// builder.show();
// } else {
// showToast("暂无该区域点检任务");
// }

10
app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.rehome.zhdcoa.ui.activity;
import android.content.DialogInterface;
import android.graphics.Color;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import android.view.View;
@ -288,7 +289,14 @@ public class AscFragment extends BaseFragment {
//toJson(rwqys);
}
});
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
} else {
//已经全部检查

3
app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java
Unescape Escape View File

@ -75,8 +75,8 @@ public class AxzFragment extends BaseFragment {
btnDel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(adapter!=null){
List<Ajhjh> ajhjhs = new ArrayList<>();
for (int i = 0; i < ajhjh.size(); i++) {
if (ajhjh.get(i).isChecked()) {
DataSupport.deleteAll(Ajhjh.class, "jhid = ?", ajhjh.get(i).getJHID());
@ -86,6 +86,7 @@ public class AxzFragment extends BaseFragment {
ajhjh.removeAll(ajhjhs);
adapter.notifyDataSetChanged();
}
}
});
}

19
app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.graphics.Color;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
@ -325,7 +326,14 @@ public class DjdscFragment extends BaseFragment {
showLog(toJson());
}
});
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
}
} else {
showToast("没有可上传计划");
@ -370,7 +378,14 @@ public class DjdscFragment extends BaseFragment {
}
}
});
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
} else {
showToast("你还没有选择项目");
}

23
app/src/main/java/com/rehome/zhdcoa/ui/activity/Gzqkgb1Activity.java
Unescape Escape View File

@ -1,8 +1,9 @@
package com.rehome.zhdcoa.ui.activity;
import android.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Color;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@ -72,8 +73,14 @@ public class Gzqkgb1Activity extends BaseActivity2 {
}
});
builder.create();
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
} else if (issave.equals("未保存")) {
@ -93,8 +100,14 @@ public class Gzqkgb1Activity extends BaseActivity2 {
}
});
builder.create();
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
}
}
});

24
app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkgbActivity.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.rehome.zhdcoa.ui.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Color;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@ -78,9 +79,14 @@ public class GzqkgbActivity extends BaseActivity2 {
}
});
builder.create();
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
} else if (issave.equals("未保存")) {
showToast("该工作状态还未保存");
}
@ -183,10 +189,14 @@ public class GzqkgbActivity extends BaseActivity2 {
}
});
builder.create();
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
}
}
});

11
app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqksblrActivity.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
@ -85,8 +86,14 @@ public class GzqksblrActivity extends BaseActivity2 implements DateTimePickDialo
}
});
builder.create();
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
}
});
}

10
app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java
Unescape Escape View File

@ -5,6 +5,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
@ -398,7 +399,14 @@ public class KccxActivity extends BaseActivity2 {
dialog.dismiss();
}
});
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
} else {
showToast("该物资没有图片");
}

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

@ -209,6 +209,9 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// 生产岗位 卢高波 可以进入巡视抄表
// binding.etUsername.setText("310492")
// binding.etPassword.setText("Dudu520520@")
//李昕逸 可以进入巡视抄表
// binding.etUsername.setText("310677")
// binding.etPassword.setText("LXY1997.qaz")
//陈坚标
// binding.etUsername.setText("310063")

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

@ -0,0 +1,58 @@
package com.rehome.zhdcoa.ui.activity
import android.content.Intent
import android.util.Log
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.rehome.zhdcoa.Contans
import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
import com.rehome.zhdcoa.databinding.ActivityQrCodeInfoBinding
class QrCodeInfoActivity : BaseActivityOaToolbarViewBinding<ActivityQrCodeInfoBinding>() {
private lateinit var launcherResult: ActivityResultLauncher<Intent>
override fun getViewBinding() = ActivityQrCodeInfoBinding.inflate(layoutInflater)
override fun getToolbar() = binding.toolbarView.toolbar
override fun initView() {
initToolbar("读取二维码")
setLeftOnClickListener {
finish()
}
launcherResult = createActivityResultLauncher()
binding.tvScan.setOnClickListener {
val intent = Intent(context, QrCodeActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
launcherResult.launch(intent)
}
}
override fun initData() {
}
//创建一个ActivityResultLauncher
private fun createActivityResultLauncher(): ActivityResultLauncher<Intent> {
//kotlin写法
return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
val resultIntent = it.data
val resultCode = it.resultCode
if (resultCode == RESULT_OK) {
if(resultIntent!=null){
val code = resultIntent.getStringExtra("code")
binding.tvNfc.text = code
showLog("---------二维码----------")
showLog(code)
}
}
}
}
}

10
app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java
Unescape Escape View File

@ -5,6 +5,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Color;
import android.nfc.NfcAdapter;
import android.os.Bundle;
@ -263,7 +264,14 @@ public class SdjgzActivity extends BaseActivity2 {
dialogInterface.dismiss();
}
});
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
} else {
showToast("暂无该区域点检任务");
}

11
app/src/main/java/com/rehome/zhdcoa/ui/activity/XaqksblrActivity.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.graphics.Color;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
@ -86,8 +87,14 @@ public class XaqksblrActivity extends BaseActivity2 implements DateTimePickDialo
}
});
builder.create();
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
}
});
}

5
app/src/main/java/com/rehome/zhdcoa/ui/activity/XsBackLogActivity.java
Unescape Escape View File

@ -101,9 +101,10 @@ public class XsBackLogActivity extends BaseActivity2 {
lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
XsJhListBean.DataBean item = datas.get(position);
String itemJson = GsonUtils.GsonString(item);
Intent intent = new Intent(XsBackLogActivity.this, XscbqyActivity.class);
intent.putExtra(Contans.KEY_XSCBJH, datas.get(position));
intent.putExtra(Contans.KEY_XSCBJH,itemJson);
startActivity(intent);
}
});

3
app/src/main/java/com/rehome/zhdcoa/ui/activity/XsHistoryActivity.java
Unescape Escape View File

@ -111,8 +111,9 @@ public class XsHistoryActivity extends BaseActivity2 {
xsjh.setScsj(jh.getScsj());
String itemJson = GsonUtils.GsonString(xsjh);
Intent intent = new Intent(XsHistoryActivity.this, XscbqyActivity.class);
intent.putExtra(Contans.KEY_XSCBJH, xsjh);
intent.putExtra(Contans.KEY_XSCBJH, itemJson);
intent.putExtra("QX", datas.get(groupPosition).getXgqx());
intent.putExtra(Contans.KEY_XS_HISTORY, true);
startActivity(intent);

10
app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.rehome.zhdcoa.ui.activity;
import android.content.DialogInterface;
import android.graphics.Color;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
@ -581,7 +582,14 @@ public class XscFragment extends BaseFragment {
}
}
});
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
}
} else {
showToast("没有可上传计划");

7
app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java
Unescape Escape View File

@ -23,8 +23,8 @@ public class XscbglActivity extends BaseActivity2 {
GridView gv;
private final String[] str = {"待办任务", "历史抄表", "读取NFC标签"};
private final int[] imageId = {R.drawable.icon_xs1, R.drawable.icon_xs5, R.drawable.icon11};
private final String[] str = {"待办任务", "历史抄表", "读取NFC标签", "读取二维码"};
private final int[] imageId = {R.drawable.icon_xs1, R.drawable.icon_xs5, R.drawable.icon11,R.drawable.icon_xs2};
// private int[] colors = {R.drawable.radius_b1, R.drawable.radius_a4, R.drawable.radius_b2};
private GridViewYXAdapter adapter;
@ -62,6 +62,9 @@ public class XscbglActivity extends BaseActivity2 {
case 2:
intent = new Intent(XscbglActivity.this, NFCInfoActivity.class);
break;
case 3:
intent = new Intent(XscbglActivity.this, QrCodeInfoActivity.class);
break;
}
if (intent != null) {

10
app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyActivity.java
Unescape Escape View File

@ -61,7 +61,10 @@ public class XscbqyActivity extends BaseActivity2 {
protected void initView() {
lv = findViewById(R.id.lv);
Intent mIntent = getIntent();
xscbjh = mIntent.getParcelableExtra(Contans.KEY_XSCBJH);
String itemJson = mIntent.getStringExtra(Contans.KEY_XSCBJH);
xscbjh = GsonUtils.GsonToBean(itemJson,XsJhListBean.DataBean.class);
isHistory = mIntent.getBooleanExtra(Contans.KEY_XS_HISTORY, false);
launcherResultQRCode = createQRCodeActivityResultLauncher();
@ -161,7 +164,6 @@ public class XscbqyActivity extends BaseActivity2 {
intent.putExtra(Contans.KEY_IS_HIS, isSHOW);
startActivity(intent);
}
} else {
/**
@ -213,9 +215,12 @@ public class XscbqyActivity extends BaseActivity2 {
if (resultCode == RESULT_OK) {
if(data!=null){
String ewm = data.getStringExtra("code");
showLog("code:-------");
showLog(ewm);
for (XsjhQyBean.DataBeanX qy : qys) {
if (ewm!=null&&ewm.equals(qy.getTxm())) {
if (xscbjh.getJhlx().equals(XscbqyWorkActivity.JHLX_XS)) {
showLog("XscbqyWorkXsActivity");
Intent intent = new Intent(XscbqyActivity.this, XscbqyWorkXsActivity.class);
intent.putExtra(Contans.KEY_QY, qy);
intent.putExtra(Contans.KEY_EWM_OR_NFC, "扫描条码");
@ -223,6 +228,7 @@ public class XscbqyActivity extends BaseActivity2 {
intent.putExtra(Contans.KEY_IS_HIS, false);
startActivity(intent);
} else {
showLog("XscbqyWorkActivity");
Intent intent = new Intent(XscbqyActivity.this, XscbqyWorkActivity.class);
intent.putExtra(Contans.KEY_QY, qy);
intent.putExtra(Contans.KEY_EWM_OR_NFC, "扫描条码");

13
app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkActivity.java
Unescape Escape View File

@ -1,7 +1,8 @@
package com.rehome.zhdcoa.ui.activity;
import android.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.content.DialogInterface;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
@ -63,8 +64,14 @@ public class XscbqyWorkActivity extends BaseActivity2 {
}
});
builder.create();
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
}
});
}

14
app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkXsActivity.java
Unescape Escape View File

@ -1,7 +1,9 @@
package com.rehome.zhdcoa.ui.activity;
import android.app.AlertDialog;
//import android.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.content.DialogInterface;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
@ -63,8 +65,14 @@ public class XscbqyWorkXsActivity extends BaseActivity2 {
}
});
builder.create();
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
}
});
}

1
app/src/main/java/com/rehome/zhdcoa/ui/activity/XzaxlFragment.java
Unescape Escape View File

@ -109,7 +109,6 @@ public class XzaxlFragment extends BaseFragment {
//
// }
// });
// builder.show();
// }
// });
}

11
app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.graphics.Color;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@ -110,8 +111,14 @@ public class XzjhFragment extends BaseFragment {
adapter.notifyDataSetChanged();
}
});
builder.show();
AlertDialog dialog = builder.create();
dialog.show();
//确定按钮
Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
//取消按钮
Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
btnPos.setTextColor(Color.BLACK);
btnNeg.setTextColor(Color.BLACK);
} else {
showToast("没有可删除计划");
}

46
app/src/main/res/layout/activity_qr_code_info.xml
Unescape Escape View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.activity.QrCodeInfoActivity">
<include
android:id="@+id/toolbarView"
layout="@layout/layout_base" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="10px"
android:layout_marginEnd="10px"
android:layout_marginBottom="10px"
android:layout_weight="1">
<TextView
android:id="@+id/tv_nfc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/viewfinder_mask"
android:textSize="24sp"
android:gravity="center"
android:text="读取二维码" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/colorPrimary"
android:orientation="vertical">
<TextView
android:id="@+id/tv_scan"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/white"
android:gravity="center"
android:textSize="18sp"
android:text="开始扫描二维码"/>
</LinearLayout>
</LinearLayout>
Write Preview
Loading…
Cancel
Save