迁移raimage 工程，与driver合并

ApexDrivers/apexcrm/src/main/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.usai.apex.apexcrm">
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.usai.apex.apexcrm">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".application.ApexCRMApp"
@@ -17,9 +17,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="android:theme,android:icon,android:roundIcon"
-        >
-
+        tools:replace="android:theme,android:icon,android:roundIcon">
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.usai.apex.apex.crm.fileprovider"
@@ -30,16 +28,15 @@
                 android:resource="@xml/apex_crm_provider_paths" />
         </provider>
 
-
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
-
+        <activity android:name=".Main2Activity"></activity>
     </application>
 
 </manifest>

ApexDrivers/apexcrm/src/main/java/com/usai/apex/apexcrm/Main2Activity.java

@@ -0,0 +1,18 @@
+package com.usai.apex.apexcrm;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class Main2Activity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main2);
+
+
+//        Button btn_ray = findViewById(btn_ray);
+//        Button btn_robert = findViewById(btn_robert);
+
+    }
+}

ApexDrivers/apexcrm/src/main/java/com/usai/apex/apexcrm/MainActivity.java

@@ -2,7 +2,6 @@ package com.usai.apex.apexcrm;
 
 import android.Manifest;
 import android.app.Activity;
-import android.app.DatePickerDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -12,24 +11,18 @@ import android.support.v4.content.PermissionChecker;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
-
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.webkit.ValueCallback;
-import android.widget.DatePicker;
 import android.widget.Toast;
 
 import com.usai.apex.apexcrm.dataProvider.DataProvider;
 import com.usai.redant.rautils.InfinitePhoto.InfinitePhotoActivity;
 import com.usai.redant.rautils.actionSheet.ActionSheet;
-import com.usai.redant.rautils.base.BaseDialog;
-import com.usai.redant.rautils.calendar_event.CalendarEventManager;
 import com.usai.redant.rautils.camera.CameraHelper;
 import com.usai.redant.rautils.dateTimePicker.DateTimePickerDialog;
 import com.usai.redant.rautils.email.EmailHelper;
-import com.usai.redant.rautils.fileViewer.FileViewerActivity;
 import com.usai.redant.rautils.map.MapHelper;
 import com.usai.redant.rautils.preview.RAPDFPreviewActivity;
 import com.usai.redant.rautils.signature.SignatureActivity;
@@ -50,10 +43,8 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
-
 import static com.usai.apex.apexcrm.RAWebView.RALocalFileScheme;
 import static com.usai.redant.rautils.InfinitePhoto.InfinitePhotoItem.PlaceHolderResIdNone;
-import static com.usai.redant.rautils.base.BaseDialog.BasicDialogContentGravityCenter;
 import static com.usai.redant.rautils.utils.Network.RESULT_TRUE;
 
 
@@ -113,8 +104,11 @@ public class MainActivity extends AppCompatActivity {
         } else {
             mExcuteJSArray = new JSONArray();
 
+
+
+            String url = "http://www.dcloud.io/hellomui/";
 //            String url = "http://192.168.0.138:8080/backend_test/index.html";
-            String url = "http://192.168.0.130:8080/MyWeb/html/test.html";
+//            String url = "http://192.168.0.130:8080/MyWeb/html/test.html";
             Intent intent = getIntent();
             if (intent != null) {
                 String tmpUrl = intent.getStringExtra("url");

ApexDrivers/apexcrm/src/main/java/com/usai/apex/apexcrm/RAJSInterface.java

@@ -55,7 +55,7 @@ public class RAJSInterface extends Object {
     @android.webkit.JavascriptInterface
     public void JumpTo(String msg) {
 
-        System.out.println("android JumpTo click");
+        System.out.println("android JumpTo click:"+msg);
         if (delegate != null) {
             delegate.JumpTo(msg);
         }

ApexDrivers/apexcrm/src/main/res/layout/activity_main2.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Main2Activity">
+
+    <Button
+        android:id="@+id/btn_ray"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="86dp"
+        android:layout_marginTop="68dp"
+        android:text="Ray"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/btn_robert"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="86dp"
+        android:layout_marginTop="40dp"
+        android:text="Robert"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btn_ray" />
+</android.support.constraint.ConstraintLayout>

ApexDrivers/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         
 
         // NOTE: Do not place your application dependencies here; they belong

ApexDrivers/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Dec 04 09:06:06 CST 2018
+#Wed Dec 05 10:39:45 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

ApexDrivers/settings.gradle

@@ -1 +1 @@
-include ':apexdriverslib', ':apexdriverscn', ':apexdriversi', ':apexcrm' ,':RAUtilsLibrary'
+include ':apexdriverslib', ':apexdriverscn', ':apexdriversi', ':apexcrm', ':RAUtilsLibrary', ':raimage'