From 0afee1120baa7d8ca413717ebdc60cf1d0590afe Mon Sep 17 00:00:00 2001 From: hwf452 Date: Mon, 21 Aug 2023 17:49:41 +0800 Subject: [PATCH] chage to news format --- app/build.gradle | 15 +++--- .../zhdcoa/ui/activity/HjbqdyActivity.java | 2 +- .../zhdcoa/ui/activity/KccxActivity.java | 2 +- .../zhdcoa/ui/activity/LoginActivity.kt | 4 +- .../zhdcoa/ui/activity/TmdyActivity.java | 2 +- build.gradle | 54 ++++++++++--------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- proguard.cfg | 0 settings.gradle | 20 +++++++ videocompressor/build.gradle | 12 ++--- 11 files changed, 70 insertions(+), 45 deletions(-) delete mode 100644 proguard.cfg diff --git a/app/build.gradle b/app/build.gradle index cadc216..7ea2544 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,15 @@ -apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} android { - compileSdk 33 - buildToolsVersion '33.0.0' + namespace 'com.rehome.zhdcoa' + compileSdk 34 defaultConfig { applicationId "com.rehome.zhdcoa" - minSdkVersion 24 - targetSdkVersion 33 + minSdk 24 + 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 { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HjbqdyActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/HjbqdyActivity.java index 52a7852..3a82bb2 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/HjbqdyActivity.java +++ b/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; diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java index ea3bfbb..78270a4 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java +++ b/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 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(); 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 7813ae1..7135365 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 @@ -162,8 +162,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("Abc*00467309") // // //马 -// binding.etUsername.setText("310482") -// binding.etPassword.setText("Maying0509?") + binding.etUsername.setText("310482") + binding.etPassword.setText("Maying0509?") // // //程宇翔 // binding.etUsername.setText("310673") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TmdyActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TmdyActivity.java index 0247820..42b042e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TmdyActivity.java +++ b/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; diff --git a/build.gradle b/build.gradle index f51edff..83c8042 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,34 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -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' - } +plugins { + id 'com.android.application' version '8.1.0' apply false + id 'org.jetbrains.kotlin.android' version '1.8.0' apply false } -allprojects { - repositories { - google() - jcenter() - maven {url "https://jitpack.io"} - maven {url 'https://maven.google.com'} - } -} -task clean(type: Delete) { - delete rootProject.buildDir -} +// Top-level build file where you can add configuration options common to all sub-projects/modules. +//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 +//} diff --git a/gradle.properties b/gradle.properties index 4fe5556..72ce466 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 86b3dfd..6380b87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/proguard.cfg b/proguard.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/settings.gradle b/settings.gradle index 6590554..48ec906 100644 --- a/settings.gradle +++ b/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" diff --git a/videocompressor/build.gradle b/videocompressor/build.gradle index 0572105..1a4acce 100644 --- a/videocompressor/build.gradle +++ b/videocompressor/build.gradle @@ -1,15 +1,13 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 - buildToolsVersion "33.0.0" - + compileSdk 34 + //buildToolsVersion "33.0.0" defaultConfig { - minSdkVersion 15 - targetSdkVersion 33 - + //minSdkVersion 15 + minSdk 24 + targetSdk 34 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } buildTypes { release {