gradle升级备份2222

WeiChat/build.gradle

@@ -119,6 +119,11 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.config
+
+            lintOptions {
+                checkReleaseBuilds false
+                abortOnError false
+            }
         }
         debug {
             //signingConfig signingConfigs.config
@@ -189,6 +194,7 @@ dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation deps.junit
     implementation deps.appcompatV7
+    implementation deps.supportV4
     implementation deps.design
     implementation(deps.stetho) {
         force = true
@@ -216,7 +222,7 @@ dependencies {
     api project(':appmusic')
     api project(':apputils')
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:support-v4:28.0.0'
+//    implementation 'com.android.support:support-v4:28.0.0'
 
     implementation(name: 'autoupdatesdk-release', ext: 'aar')
 }

WeiChat/src/main/AndroidManifest.xml

@@ -116,8 +116,12 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:persistent="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/MainBaseTheme"
         tools:replace="icon,label,theme">
+
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" />
@@ -976,7 +980,7 @@
         <activity android:name=".ui.erp.activity.ADActivity" />
         <activity
             android:name=".ui.erp.activity.oa.AddContactsActivity"
-            android:label="@string/add_contact"></activity>
+            android:label="新增联系人"></activity>
         <activity
             android:name=".ui.erp.activity.oa.AddVisitReportActivity"
             android:label="@string/visitrecord" />

WeiChat/src/main/res/values/strings.xml

@@ -2009,4 +2009,60 @@
         <item>电影</item>
         <item>其它</item>
     </string-array>
+
+    <string name="enterprise_license">营业执照</string>
+    <string name="work_off_time">下班时间</string>
+    <string name="add_contact">新增联系人</string>
+    <string name="msg_subscribe_data"> 查看企业数据</string>
+    <string name="work_oa_sigin">自动考勤</string>
+    <string name="work_oa_order">查看订单询价单</string>
+    <string name="task_endtimetask_endtime">截止时间</string>
+    <string name="only_input_Positive_real_number">只能输入正实数</string>
+    <string name="only_imput_aaa">只能输入数字和大小写英文和中文，限定字符长度不大于100</string>
+    <string name="only_imput_aaa1">限定字符长度不大于100</string>
+    <string name="only_imput_aaa2">限定字符长度不大于300</string>
+    <string name="select_flights">选择班次</string>
+    <string-array name="step_week1">
+        <item>日</item>
+        <item>一</item>
+        <item>二</item>
+        <item>三</item>
+        <item>四</item>
+        <item>五</item>
+        <item>六</item>
+    </string-array>
+    <string-array name="step_week2">
+        <item>周日</item>
+        <item>周一</item>
+        <item>周二</item>
+        <item>周三</item>
+        <item>周四</item>
+        <item>周五</item>
+        <item>周六</item>
+    </string-array>
+    <string name="step_Sunday">日</string>
+    <string name="step_Monday">一</string>
+    <string name="step_Tuesday">二</string>
+    <string name="step_Wednesday">三</string>
+    <string name="step_Thursday">四</string>
+    <string name="step_Friday">五</string>
+    <string name="step_Saturday">六</string>
+
+    <string name="visitting_type">拜访类型</string>
+    <string name="connect_businedd">关联商机</string>
+    <string name="startT_cannott_big_sT">开始时间不能大于当前系统时间</string>
+    <string name="endT_cannott_big_sT">截止时间不能大于当前系统时间</string>
+    <string name="input_vist_context">请输入拜访内容</string>
+    <string name="limit_unno_zijie">不能输入特殊字符</string>
+    <string name="Original_visit">原厂拜访</string>
+    <string name="ws_client_address_name">完善客户地址名称</string>
+    <string name="user_noOpen_app">该用户暂未开通app</string>
+
+    <string name="creater">创建人</string>
+    <string name="work_sign">上班打卡</string>
+    <string name="off_sign">下班打卡</string>
+    <string name="daily_record">日报记录</string>
+    <string name="error_phone">手机格式不正确</string>
+    <string name="change_qpw">修改查询密码</string>
+
 </resources>

app_core/common/build.gradle

@@ -24,27 +24,27 @@ android {
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation deps.junit
-    implementation deps.appcompatV7
+    api deps.appcompatV7
     api deps.fastjson
-    implementation deps.materialDialogs
-    implementation deps.multidex
-    implementation(deps.stetho)
+    api deps.materialDialogs
+    api deps.multidex
+    api(deps.stetho)
             {
                 force = true
             }
-    implementation deps.gif
-    implementation deps.circleimageview
-    implementation deps.activityOnCrash
-//    implementation 'com.umeng.analytics:analytics:6.1.2'
-    implementation deps.analytics
-    implementation deps.photoView
-    implementation deps.stickyListHeaders
-    implementation deps.stickyGridHeaders
-    implementation deps.cardviewV7
-    implementation deps.BaseRecyclerViewAdapterHelper
-    implementation deps.design
-    implementation deps.banner
-    implementation(deps.smartRefreshLayout) {
+    api deps.gif
+    api deps.circleimageview
+    api deps.activityOnCrash
+//    api 'com.umeng.analytics:analytics:6.1.2'
+    api deps.analytics
+    api deps.photoView
+    api deps.stickyListHeaders
+    api deps.stickyGridHeaders
+    api deps.cardviewV7
+    api deps.BaseRecyclerViewAdapterHelper
+    api deps.design
+    api deps.banner
+    api(deps.smartRefreshLayout) {
         exclude group: 'com.squareup.leakcanary'
         exclude group: 'com.umeng.analytics'
         exclude group: 'com.android.support'
@@ -52,7 +52,7 @@ dependencies {
         exclude group: 'com.sun.xml.stream.buffer'
         exclude group: 'javax.annotation.processing'
     }
-    implementation(deps.smartRefreshHeader) {
+    api(deps.smartRefreshHeader) {
         exclude group: 'com.squareup.leakcanary'
         exclude group: 'com.umeng.analytics'
         exclude group: 'com.android.support'
@@ -74,10 +74,10 @@ dependencies {
     api project(':library-refreshlayout')
     api project(':recyclerlibrary')
     api files('libs/hellocharts-library-1.5.8.jar')
-    implementation deps.wechatSdk
-    implementation 'com.github.hss01248:NotifyUtil:1.0.1'
-    implementation deps.basePopup
-    implementation deps.acprogress
+    api deps.wechatSdk
+    api 'com.github.hss01248:NotifyUtil:1.0.1'
+    api deps.basePopup
+    api deps.acprogress
 
 //    androidTestCompile deps.leakcanaryNp
 //    debugCompile deps.leakcanary

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -109,6 +109,7 @@ public class MyApplication extends BaseApplication {
         mRequestQueue = Volley.newRequestQueue(this);
         mHttpUtils = new HttpUtils();
         configHttpUtils();
+        MultiDex.install(this);
 
         new Handler().postDelayed(new Runnable() {
             @Override

app_core/imageload/build.gradle

@@ -23,6 +23,6 @@ dependencies {
     implementation deps.appcompatV7
 
 
-    implementation deps.glide
+    api deps.glide
     
 }

app_modular/appcontact/src/main/AndroidManifest.xml

@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.uas.appcontact">
+    package="com.uas.appcontact">
 
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
-        <activity android:name="com.uas.appcontact.ui.activity.NewFriendActivity" >
+        <activity android:name="com.uas.appcontact.ui.activity.NewFriendActivity">
             <intent-filter>
                 <action android:name="com.modular.appcontact.NewFriendActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -16,11 +16,12 @@
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity
             android:name="com.uas.appcontact.ui.activity.ContactsActivity"
-            android:windowSoftInputMode="adjustPan" />
-             <intent-filter>
-               <action android:name="com.modular.contact.ContactsActivity" />
+            android:windowSoftInputMode="adjustPan">
+            <intent-filter>
+                <action android:name="com.modular.contact.ContactsActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+        </activity>
         <activity
             android:name="com.uas.appcontact.ui.activity.CompanyContactsActivity"
             android:windowSoftInputMode="stateHidden|adjustResize" />

app_modular/appme/src/main/AndroidManifest.xml

@@ -117,7 +117,7 @@
             android:label="切换ip地址"/>
         <activity
             android:name=".settings.activity.FindWagePWActivity"
-            android:label="@string/change_qpw" />
+            android:label="请修改查询密码" />
         <!-- <activity android:name=".settings.activity.PayTestActivity"></activity> -->
 
         <activity android:name=".settings.activity.SystemAdminActivity" />

build.gradle

@@ -22,6 +22,22 @@ buildscript {
 //        classpath 'me.tatarka:gradle-retrolambda:3.2.2'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
     }
+
+    subprojects {
+        project.configurations.all {
+            resolutionStrategy.eachDependency { details ->
+                if (details.requested.group == 'com.android.support'
+                        && !details.requested.name.contains('multidex')) {
+                    details.useVersion "27.0.0"
+                }
+
+                if (details.requested.group == 'androidx.core'
+                        && !details.requested.name.contains('androidx')) {
+                    details.useVersion "1.0.1"
+                }
+            }
+        }
+    }
 }
 
 allprojects {

gradle.properties

@@ -1,9 +1,11 @@
 android.useDeprecatedNdk=true
 org.gradle.daemon=true
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx1024m
+#org.gradle.jvmargs=-Xmx1024m
+android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx1536m
 
 applicationId=com.xzjmyk.pm.activity
 versionCode=125
 versionName=6.0.5
-

version.gradle

@@ -7,7 +7,7 @@ Shared gradle properties
 ext {
     android = [
             compileSdkVersion: 28,
-            buildToolsVersion: '28.0.3',
+            buildToolsVersion: '27.0.3',
             minSdkVersion    : 17,
             targetSdkVersion : 28,
             javaVersion      : JavaVersion.VERSION_1_8,
@@ -17,10 +17,10 @@ ext {
 
     depsVersion = [
             junitVersion                        : '4.12',
-            supportVersion                      : '28.0.0',
+            supportVersion                      : '27.0.3',
             multidex                            : '1.0.1',
             butterknifeVersion                  : '8.2.1',
-            fastjsonVersion                     : '1.2.75',
+            fastjsonVersion                     : '1.2.24',
             logVersion                          : '1.15',
             rxJavaVersion                       : '1.1.8',
             rxAndroidVersion                    : '1.2.1',
@@ -36,9 +36,9 @@ ext {
             leakcanaryVersion                   : '1.5',
             materialDialogsVersion              : '0.9.0.2',
             stickyGridHeadersVersion            : '1.0.1',
-            stickyListHeadersVersion            : 'master-SNAPSHOT',
+            stickyListHeadersVersion            : '2.7.2',
             activityOnCrashVersion              : '1.5.0',
-            analyticsVersion                    : 'latest.integration',
+            analyticsVersion                    : '6.1.4',
             tagGroupVersion                     : '1.4@aar',
             jodatimeVersion                     : '2.9.4',
             gifVersion                          : '1.2.15',