Explorar el Código

Crm 1.17
修改状态栏颜色
锁定网页字体大小
支持64位指令集

Ray Zhang hace 6 años
padre
commit
a68b856b6d

+ 10 - 10
ApexDrivers/apexcrm/build.gradle

@@ -14,12 +14,12 @@ android {
     compileSdkVersion 26
     defaultConfig {
         applicationId "com.usai.apex.apexcrm"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 26
-        versionCode 1
-        versionName "1.16.40964"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        versionCode 2
+        versionName "1.17.40964"
+        ndk.abiFilters 'armeabi-v7a',"arm64-v8a"
+//        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -48,11 +48,11 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    api 'com.android.support:appcompat-v7:26.0.0'
+    api 'com.android.support.constraint:constraint-layout:1.1.3'
+//    testImplementation 'junit:junit:4.12'
+//    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+//    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation project(path: ':RAUtilsLibrary')
     implementation 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.5'
 }

+ 2 - 0
ApexDrivers/apexcrm/src/main/AndroidManifest.xml

@@ -10,6 +10,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <!--Service-->
+
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />-->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.alarm.permission.SET_ALARM"/>

+ 6 - 0
ApexDrivers/apexcrm/src/main/java/com/usai/apex/apexcrm/MainActivity.java

@@ -27,6 +27,7 @@ import android.webkit.SslErrorHandler;
 import android.webkit.ValueCallback;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.ProgressBar;
@@ -122,6 +123,11 @@ public class MainActivity extends AppCompatActivity implements RAWebView.WebView
 
         mWebView = RAWebView.findWebViewByIdWithDelegate(this, R.id.webview);
 
+
+
+
+
+
         mJSInterface = new RAJSInterface(mActionHandler);
         mWebView.addJSInterface(mJSInterface, "RAJSInterface");
 

+ 4 - 0
ApexDrivers/apexcrm/src/main/java/com/usai/apex/apexcrm/RAWebView.java

@@ -129,9 +129,13 @@ public class RAWebView extends RelativeLayout {
 
     private void initWebSetting() {
         if (mWebView != null) {
+
+//            mWebView.zoom
             //声明WebSettings子类
             WebSettings webSettings = mWebView.getSettings();
 
+            webSettings.setTextZoom(100);
+
             //如果访问的页面中要与Javascript交互,则webview必须设置支持Javascript
             webSettings.setJavaScriptEnabled(true);
 

+ 4 - 4
ApexDrivers/apexcrm/src/main/java/com/usai/apex/apexcrm/dataProvider/DataProvider.java

@@ -23,14 +23,14 @@ public class DataProvider {
     public static final int PUSH_TIME_OUT_INTERVAL = 5 * 1000;
     // region URL
 
-//    public static final String URL_PULL_NOTIFICATION = "http://192.168.1.108:8081/j/crm/mobile/getAndroidNotifications.mo/";
-//    public static final String URL_UPLOAD_DEVICEID = "http://192.168.1.108:8081/j/crm/mobile/token.mo/";
-//    public static final String URL_LOGIN = "http://192.168.1.108:8081/j/crm/mobile/login";
+//    public static final String URL_PULL_NOTIFICATION = "http://192.168.1.160:8080/CRMSuiteOnline/crm/mobile/getAndroidNotifications.mo/";
+//    public static final String URL_UPLOAD_DEVICEID = "http://192.168.1.160:8080/CRMSuiteOnline/crm/mobile/token.mo/";
+//    public static final String URL_LOGIN = "http://192.168.1.160:8080/CRMSuiteOnline/crm/mobile/login";
 
     public static final String URL_PULL_NOTIFICATION = "https://ra.apexshipping.com/apexcrm/crm/mobile/getAndroidNotifications.mo/";
     public static final String URL_UPLOAD_DEVICEID = "https://ra.apexshipping.com/apexcrm/crm/mobile/token.mo/";
     public static final String URL_LOGIN = "https://ra.apexshipping.com/apexcrm/crm/mobile/login";
-
+//
 
     // endregion
 

+ 3 - 3
ApexDrivers/apexcrm/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#FFE15825</color>
+    <color name="colorPrimaryDark">#FFE15825</color>
+    <color name="colorAccent">#E15825</color>
 </resources>