bonus
/
hn-xbg-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app bug 修改

This commit is contained in:
fl 2025-06-30 17:36:27 +08:00
parent db0d5ad950
commit 45f7a6d1df
10 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -124,8 +124,8 @@ dependencies {
// fastjson
implementation 'com.alibaba:fastjson:1.2.55'
//下拉刷新
// implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-header:1.1.5'
// implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-layout:1.1.5'
// implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-header:1.1.0'
// implementation 'com.github.xuexiangjys.SmartRefreshLayout:refresh-layout:1.1.0'
//Android崩溃
implementation 'io.github.inflationx:calligraphy3:3.1.1'
implementation 'io.github.inflationx:viewpump:2.0.3'

5
app/src/main/java/com/bonus/gzvis/app/activity/basic/MainActivity.java
View File

@ -485,8 +485,9 @@ public class MainActivity extends BaseActivity implements DrawerAdapter.OnItemSe
msg = String.valueOf(errorCode);
}
Log.e("errorCode", msg + "");
Toast.makeText(MainActivity.this,
"身份证OCR识别"+msg, Toast.LENGTH_SHORT).show();
XToastUtils.showToast(2,"身份证OCR识别"+msg);
// Toast.makeText(MainActivity.this,
// "身份证OCR识别"+msg, Toast.LENGTH_SHORT).show();
}
});
}

9
app/src/main/java/com/bonus/gzvis/app/adapter/ContractExamineAdapter.java
View File

@ -10,6 +10,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.bonus.gzvis.app.entity.person.ContractBean;
import com.bonus.gzvis.app.util.StringHelper;
import com.bonus.gzvis.app.util.Strings;
import org.easydarwin.easypusher.R;
@ -103,7 +104,13 @@ public class ContractExamineAdapter extends BaseAdapter {
}
}
holder.proName.setText("工作地点：" + bean.getWorkAdress());
holder.isXbgGroup.setText("是否为小包干班组：" + bean.getIsXbg());
if("1".equals(bean.getIsXbg())){
holder.isXbgGroup.setText("是否为小包干班组：是");
}else if("0".equals(bean.getIsXbg())){
holder.isXbgGroup.setText("是否为小包干班组：否");
}else{
holder.isXbgGroup.setText("是否为小包干班组：" + ((StringHelper.isEmpty(bean.getIsXbg()))? "":bean.getIsXbg()));
}
holder.partyA.setText("甲方：" + bean.getPartA());
holder.effectiveDate.setText("生效日期：" + bean.getEffectDate());
holder.signingDate.setText("签订日期：" + bean.getSigningDate());

8
app/src/main/java/com/bonus/gzvis/app/adapter/ContractNoExamineAdapter.java
View File

@ -99,7 +99,13 @@ public class ContractNoExamineAdapter extends BaseAdapter {
}
}
holder.proName.setText("工作地点：" + bean.getWorkAdress());
holder.isXbgGroup.setText("是否为小包干班组：" + ((StringHelper.isEmpty(bean.getIsXbg()))? "":bean.getIsXbg()));
if("1".equals(bean.getIsXbg())){
holder.isXbgGroup.setText("是否为小包干班组：是");
}else if("0".equals(bean.getIsXbg())){
holder.isXbgGroup.setText("是否为小包干班组：否");
}else{
holder.isXbgGroup.setText("是否为小包干班组：" + ((StringHelper.isEmpty(bean.getIsXbg()))? "":bean.getIsXbg()));
}
holder.partyA.setText("甲方：" + bean.getPartA());
holder.effectiveDate.setText("生效日期：" + bean.getEffectDate());
holder.signingDate.setText("签订日期：" + bean.getSigningDate());

9
app/src/main/java/com/bonus/gzvis/app/adapter/ContractSignAdapter.java
View File

@ -9,6 +9,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.bonus.gzvis.app.entity.person.ContractBean;
import com.bonus.gzvis.app.util.StringHelper;
import com.bonus.gzvis.app.util.Strings;
import org.easydarwin.easypusher.R;
@ -98,7 +99,13 @@ public class ContractSignAdapter extends BaseAdapter {
}
}
holder.proName.setText("工作地点：" + bean.getWorkAdress());
holder.isXbgGroup.setText("是否为小包干班组：" + bean.getIsXbg());
if("1".equals(bean.getIsXbg())){
holder.isXbgGroup.setText("是否为小包干班组：是");
}else if("0".equals(bean.getIsXbg())){
holder.isXbgGroup.setText("是否为小包干班组：否");
}else{
holder.isXbgGroup.setText("是否为小包干班组：" + ((StringHelper.isEmpty(bean.getIsXbg()))? "":bean.getIsXbg()));
}
holder.partyA.setText("甲方：" + bean.getPartA());
holder.effectiveDate.setText("生效日期：" + bean.getEffectDate());
holder.signingDate.setText("签订日期：" + bean.getSigningDate());

5
app/src/main/java/com/bonus/gzvis/app/fragment/pay/FaceContrastNoFragment.java
View File

@ -77,11 +77,6 @@ public class FaceContrastNoFragment extends BaseFragment {
.add("proId", getArguments().getString("proId"))
.add("startDay", getArguments().getString("startDayText"))
.add("endDay", getArguments().getString("endDayText"))
// .add("proId", "142")
// .add("name", name)
// .add("teamId","507")
// .add("startDay", "2025-06-01")
// .add("endDay", "2025-06-10")
//查询未审核
.add("auditStatus", "0")
.build();

2
app/src/main/java/com/bonus/gzvis/app/fragment/person/attendance/FaceAttendanceFragment.java
View File

@ -917,7 +917,7 @@ public class FaceAttendanceFragment extends BaseFragment implements ViewTreeObse
System.out.println("idCardInfo=" + idCardInfo);
// 判断是否签订合同
if ("0".equals(idCardInfo.getIsXbg())) {
XToastUtils.warning(compareResult.getUserName() + "未签订小包干协议！请打计日卡，或者重新签订合同！");
XToastUtils.error(compareResult.getUserName() + "未签订小包干协议！请打计日卡，或者重新签订合同！");
} else {
faceAttendanceDao.addFaceAttendance(attendanceBean);
XToastUtils.success(compareResult.getUserName() + "考勤成功");

9
app/src/main/java/com/bonus/gzvis/app/fragment/person/attendance/ScanFragment.java
View File

@ -5,8 +5,11 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
@ -14,13 +17,17 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import com.alibaba.fastjson.JSONObject;
import com.bonus.gzvis.app.base.BaseFragment;
import com.bonus.gzvis.app.util.CustomScannerActivity;
import com.bonus.gzvis.app.util.DateTimeHelper;
import com.bonus.gzvis.app.util.GlideUtil;
import com.bonus.gzvis.app.util.JsonHelper;
import com.bonus.gzvis.app.util.OffLineUnitl;
import com.bonus.gzvis.app.util.SignatureView;
import com.bonus.gzvis.app.util.StringHelper;
import com.bonus.gzvis.app.util.WorkConfig;
@ -30,6 +37,8 @@ import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import com.xuexiang.xpage.annotation.Page;
import com.xuexiang.xpage.enums.CoreAnim;
import com.xuexiang.xui.widget.dialog.materialdialog.MaterialDialog;
import org.easydarwin.easypusher.R;
import java.io.File;

5
app/src/main/java/com/bonus/gzvis/app/fragment/person/collection/CollectionPersonFragment.java
View File

@ -1933,7 +1933,6 @@ public class CollectionPersonFragment extends BaseFragment implements TabLayout.
.content("施工人员未满16岁禁止录入系统")
.positiveText("确定")
.show();
return;
} else if (idCardBean.getAge() > 70) {
new MaterialDialog.Builder(getActivity())
.iconRes(R.drawable.icon_tip)
@ -1941,7 +1940,6 @@ public class CollectionPersonFragment extends BaseFragment implements TabLayout.
.content("施工人员大于70岁禁止录入系统")
.positiveText("确定")
.show();
return;
} else {
showBlackUser(idCard.getText().toString());
}
@ -1960,7 +1958,7 @@ public class CollectionPersonFragment extends BaseFragment implements TabLayout.
}
public void showBlackUser(String idNumber) {
showDialog("黑名单查询中......");
// showDialog("黑名单查询中......");
new Thread(new Runnable() {
@Override
public void run() {
@ -2252,6 +2250,7 @@ public class CollectionPersonFragment extends BaseFragment implements TabLayout.
XToastUtils.success((String) msg.obj);
break;
case 2:
//{"res":1,"resMsg":"黑名单！","obj":[{"name":"方亮","idNumber":"342401199711082516","event":" 不会","dept":"接口"}]}
JSONObject jsonObject = (JSONObject) msg.obj;
String code = jsonObject.getString("resMsg");
if ("黑名单".contains(code)) {

2
app/src/main/java/com/bonus/gzvis/app/util/WorkConfig.java
View File

@ -8,7 +8,7 @@ public class WorkConfig {
* test 测试
* prod 固定
*/
public static String environment = "test";
public static String environment = "local";
protected static final String GZRAMA_URL_LOCAL = "http://192.168.0.137:1917/hnAma/";