开发工具升级到最新版本 Android Studio 2023.3.1

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);
+            }
+        }
+    }
 }

app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt

@@ -180,8 +180,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         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<ActivityLoginBinding>() {
 //            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")
 
         }
 

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();

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();

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">
 
         <TextView

app/src/main/res/layout/tmdy_item.xml

@@ -108,7 +108,7 @@
             android:layout_width="180px"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="接收时间" />
+            android:text="到货时间" />
 
         <View
             android:layout_width="1dp"

build.gradle

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.1.1' apply false
+    id 'com.android.application' version '8.4.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip