chage to news format

app/build.gradle

@@ -1,13 +1,15 @@
-apply plugin: 'com.android.application'
+plugins {
-apply plugin: 'org.jetbrains.kotlin.android'
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
 
 android {
-    compileSdk 33
+    namespace 'com.rehome.zhdcoa'
-    buildToolsVersion '33.0.0'
+    compileSdk 34
     defaultConfig {
         applicationId "com.rehome.zhdcoa"
-        minSdkVersion 24
+        minSdk 24
-        targetSdkVersion 33
+        targetSdk 34
         versionCode 7
         versionName "2.2.3"
         multiDexEnabled true
@@ -65,7 +67,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    namespace 'com.rehome.zhdcoa'
 }
 
 dependencies {

app/src/main/java/com/rehome/zhdcoa/ui/activity/HjbqdyActivity.java

@@ -72,7 +72,7 @@ public class HjbqdyActivity extends BaseActivity2 {
                             if (printSelect.getChecked() == 1) {
                                 printFlag = true;
                                 //办公室打印机的IP
-                                Contans.PRINTIP = "10.19.110.19";
+                                Contans.PRINTIP = "10.19.110.225";
                             } else if (printSelect.getChecked() == 2) {
                                 //1号仓库是打印机的IP
                                 printFlag = true;

app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java

@@ -147,7 +147,7 @@ public class KccxActivity extends BaseActivity2 {
         public void onSucceed(int what, Response<String> response) {
             KccxInfo info = GsonUtils.GsonToBean(response.get(), KccxInfo.class);
             if (info != null) {
-                //Log.i("app",GsonUtils.GsonString(info));
+                showLog(GsonUtils.GsonString(info));
                 if (!info.getTotal().equals("0")) {
                     lists.clear();
                     imgs.clear();

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

@@ -162,8 +162,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //        binding.etPassword.setText("Abc*00467309")
 //
 //        //马
-//        binding.etUsername.setText("310482")
+        binding.etUsername.setText("310482")
-//        binding.etPassword.setText("Maying0509?")
+        binding.etPassword.setText("Maying0509?")
 //
 //        //程宇翔
 //        binding.etUsername.setText("310673")

app/src/main/java/com/rehome/zhdcoa/ui/activity/TmdyActivity.java

@@ -126,7 +126,7 @@ public class TmdyActivity extends BaseActivity2 implements TmdyAdapter.CallBack
                             if (printSelect.getChecked() == 1) {
                                 //办公室打印机的IP
                                 printFlag = true;
-                                Contans.PRINTIP = "10.19.110.19";
+                                Contans.PRINTIP = "10.19.110.225";
                             } else if (printSelect.getChecked() == 2) {
                                 //1号仓库是打印机的IP
                                 printFlag = true;

build.gradle

@@ -1,28 +1,34 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
+plugins {
-buildscript {
+    id 'com.android.application' version '8.1.0' apply false
-    repositories {
+    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-        google()
-        jcenter()
-        // 增加这行
-        mavenCentral()
-        
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
-    }
 }
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven {url "https://jitpack.io"}
-        maven {url 'https://maven.google.com'}
-    }
-}
 
-task clean(type: Delete) {
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
-    delete rootProject.buildDir
+//buildscript {
-}
+//    repositories {
+//        google()
+//        jcenter()
+//        // 增加这行
+//        mavenCentral()
+//
+//    }
+//    dependencies {
+//        classpath 'com.android.tools.build:gradle:8.1.0'
+//        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
+//    }
+//}
+//
+//allprojects {
+//    repositories {
+//        google()
+//        jcenter()
+//        maven {url "https://jitpack.io"}
+//        maven {url 'https://maven.google.com'}
+//    }
+//}
+//
+//task clean(type: Delete) {
+//    delete rootProject.buildDir
+//}

gradle.properties

@@ -11,7 +11,7 @@ android.enableJetifier=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Thu Jul 09 09:43:00 CST 2020
+#Thu Aug 17 13:34:29 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,2 +1,22 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+        jcenter()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+        maven {url "https://jitpack.io"}
+        maven {url 'https://maven.google.com'}
+    }
+}
+
+
 include ':app', ':videocompressor'
 rootProject.name = "ZHDCOA"

videocompressor/build.gradle

@@ -1,15 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
-    buildToolsVersion "33.0.0"
+    //buildToolsVersion "33.0.0"
-
     defaultConfig {
-        minSdkVersion 15
+        //minSdkVersion 15
-        targetSdkVersion  33
+        minSdk 24
-
+        targetSdk 34
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {