From e59b5ba9aac81ae8edfccc91ae3f09f103313c2f Mon Sep 17 00:00:00 2001 From: hwf453 Date: Thu, 21 Sep 2023 09:20:55 +0800 Subject: [PATCH] change project struct --- app/build.gradle | 7 ++--- .../zhapp/activity/LoginActivity.java | 7 +++-- build.gradle | 28 +++---------------- settings.gradle | 23 +++++++++++++++ 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2e4e974..0ecc6d2 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,10 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 - buildToolsVersion '33.0.0' + compileSdk 34 defaultConfig { applicationId "com.example.administrator.zhapp" - minSdkVersion 24 - targetSdkVersion 33 + minSdk 24 + targetSdk 34 versionCode 1 versionName "2.2.6" multiDexEnabled true diff --git a/app/src/main/java/com/example/administrator/zhapp/activity/LoginActivity.java b/app/src/main/java/com/example/administrator/zhapp/activity/LoginActivity.java index 5369375..626bdb3 100755 --- a/app/src/main/java/com/example/administrator/zhapp/activity/LoginActivity.java +++ b/app/src/main/java/com/example/administrator/zhapp/activity/LoginActivity.java @@ -153,8 +153,11 @@ public class LoginActivity extends BaseActivity { // SPUtils.put(this, Contans.KEY_WIFI_IP, "http://192.168.2.134:8082/"); } - et_use.setText("310673"); - et_pwd.setText("Abcd@1234"); +// et_use.setText("310673"); +// et_pwd.setText("Abcd@1234"); + +// et_use.setText("FGTL01"); +// et_pwd.setText("123"); } public void initData() { diff --git a/build.gradle b/build.gradle index 926b522..f235a44 100755 --- a/build.gradle +++ b/build.gradle @@ -1,25 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - jcenter() - - } - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - } -} - -allprojects { - repositories { - google() - jcenter() - maven {url "https://jitpack.io"} - maven {url 'https://maven.google.com'} - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} +plugins { + id 'com.android.application' version '8.1.1' apply false + id 'org.jetbrains.kotlin.android' version '1.8.0' apply false +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index e7b4def..a2117c8 100755 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,24 @@ +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' +rootProject.name = "ZHDCSBSSXC" \ No newline at end of file