From b0f6d5ef31ef341b03cef1137b4473cc2dcdac65 Mon Sep 17 00:00:00 2001 From: hwf453 Date: Thu, 23 May 2024 10:27:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=20Androi?= =?UTF-8?q?d=20Studio=202023.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rehome/zhdcoa/service/PushService.java | 14 ++++++++++++++ .../rehome/zhdcoa/ui/activity/LoginActivity.kt | 15 +++++++++++---- .../ui/activity/MateLablePrintFragment.java | 14 ++++++++++---- .../rehome/zhdcoa/ui/activity/SdjgzActivity.java | 3 +++ app/src/main/res/layout/activity_login.xml | 2 +- app/src/main/res/layout/tmdy_item.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 42 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java index 0ae5162..ae8c2c1 100755 --- a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java +++ b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java @@ -12,6 +12,8 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Environment; +import android.text.TextUtils; +import android.util.Log; import android.view.WindowManager; import androidx.appcompat.app.AlertDialog; @@ -174,6 +176,9 @@ public class PushService extends IntentService { } break; case 1: + showLog("1"); + showLog("点检"); + showLog(response.get()); DjjhList list = GsonToBean(response.get(), DjjhList.class); if (list != null) { if (list.getTotal() != 0) { @@ -485,4 +490,13 @@ public class PushService extends IntentService { } return 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); + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index 81c594b..00d3cef 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -180,8 +180,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { if (BuildConfig.LOG_ERROR) { // 管理员 -// binding.etUsername.setText("ZHPS_Admin") -// binding.etPassword.setText("Rehome.zhps@996") + binding.etUsername.setText("ZHPS_Admin") + binding.etPassword.setText("Rehome.zhps@996") // binding.etUsername.setText("310386") // binding.etPassword.setText("Zhps$cc0386") @@ -195,8 +195,15 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("ZHPs@040909") // binding.etUsername.setText("310707") // binding.etPassword.setText("Wxfnz666#") - - + //谭添欢 +// binding.etUsername.setText("310273") +// binding.etPassword.setText("#Tth8680004") + //吴云强 +// binding.etUsername.setText("310430") +// binding.etPassword.setText("Laq@201610") + //欧建荣 + binding.etUsername.setText("310285") + binding.etPassword.setText("@Ojr310285") } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MateLablePrintFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MateLablePrintFragment.java index ac5daeb..8b324cb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MateLablePrintFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MateLablePrintFragment.java @@ -123,14 +123,20 @@ public class MateLablePrintFragment extends BaseFragment implements PoInfoadapte @Override public void onClick(View v) { if (printSelect.getChecked() == 1) { + //办公室打印机的IP printFlag = true; - Contans.PRINTIP = "10.19.110.19"; + //Contans.PRINTIP = "10.19.110.19"; + Contans.PRINTIP = "10.19.110.225"; } else if (printSelect.getChecked() == 2) { + //1号仓库是打印机的IP + printFlag = true; + //Contans.PRINTIP = "10.19.110.24"; + Contans.PRINTIP = "10.19.110.220"; + } else if (printSelect.getChecked() == 3) { + //便携打印机的IP printFlag = false; + //Contans.PRINTIP = "10.19.110.12"; Contans.PRINTIP = "10.19.110.24"; - } else if (printSelect.getChecked() == 3) { - printFlag = true; - Contans.PRINTIP = "10.19.110.12"; } printSelect.close(); dialog.show(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java index 2ab2f97..95d1109 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java @@ -20,6 +20,7 @@ import com.rehome.zhdcoa.adapter.CommonAdapter; import com.rehome.zhdcoa.adapter.ViewHolder; import com.rehome.zhdcoa.base.BaseActivity2; import com.rehome.zhdcoa.entity.DjAjhGzInfo; +import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.utils.UiUtlis; import org.litepal.crud.DataSupport; import java.util.ArrayList; @@ -156,6 +157,8 @@ public class SdjgzActivity extends BaseActivity2 { list.add(info); } + showLog(GsonUtils.GsonString(list)); + // Cursor cursor = DataSupport.findBySQL("select * from djjhrwqy group by meaarea"); // while (cursor.moveToNext()) { // DjjhRwQyList rwqy = new DjjhRwQyList(); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index cb0f228..e43547d 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -172,7 +172,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginBottom="80dp" + android:layout_marginBottom="60dp" android:orientation="horizontal"> + android:text="到货时间" />