hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chage to news format

Browse Source
master
hwf452 2 years ago
parent 772718fda8
commit 0afee1120b
11 changed files with 70 additions and 45 deletions
Show Stats Download Patch File Download Diff File

15
app/build.gradle
Unescape Escape View File

@ -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 {

2
app/src/main/java/com/rehome/zhdcoa/ui/activity/HjbqdyActivity.java
Unescape Escape View File

@ -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;

2
app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java
Unescape Escape View File

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

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
Unescape Escape View File

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

2
app/src/main/java/com/rehome/zhdcoa/ui/activity/TmdyActivity.java
Unescape Escape View File

@ -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;

54
build.gradle
Unescape Escape View File

@ -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
//}

2
gradle.properties
Unescape Escape View File

@ -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

2
gradle/wrapper/gradle-wrapper.properties vendored
Unescape Escape View File

@ -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

0
proguard.cfg
Unescape Escape View File

20
settings.gradle
Unescape Escape View File

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

12
videocompressor/build.gradle
Unescape Escape View File

@ -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 {

Write Preview
Loading…
Cancel
Save