Pārlūkot izejas kodu

Add common editor public library -- 添加common editor 公共库 (issue20: #14499)
Add and implement editor module -- 添加并实现editor 组件(issue10: #14504)

Ray Zhang 4 gadi atpakaļ
vecāks
revīzija
1a5ee380fd
59 mainītis faili ar 1009 papildinājumiem un 541 dzēšanām
  1. 4 1
      ApexDrivers/CommonEditorLib/build.gradle
  2. 0 28
      ApexDrivers/CommonEditorLib/src/androidTest/java/com/example/commoneditorlib/ExampleInstrumentedTest.java
  3. 1 1
      ApexDrivers/CommonEditorLib/src/main/AndroidManifest.xml
  4. 0 16
      ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/ImageViewActivity.java
  5. 0 314
      ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/Utils.java
  6. 2 3
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/AddressEditorActivity.java
  7. 1 1
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/Application.java
  8. 4 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/BrushView.java
  9. 8 5
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/BundleItemDialog.java
  10. 5 4
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/BundleModelActivity.java
  11. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorActionCellHolder.java
  12. 1 1
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorAutoCompleteAdapter.java
  13. 3 3
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorCellHolder.java
  14. 4 4
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorDateRangeCellHolder.java
  15. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorEditAutoCompleteCellHolder.java
  16. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorEditCellHolder.java
  17. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorEnumCellHolder.java
  18. 6 6
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorImageCellHolder.java
  19. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorLabelCellHolder.java
  20. 4 4
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorModelCellHolder.java
  21. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorMultipleActionCellHolder.java
  22. 4 3
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorRangeCellHolder.java
  23. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorSectionHeaderHolder.java
  24. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorSignatureCellHolder.java
  25. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorSwitchCellHolder.java
  26. 2 2
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorTextViewCellHolder.java
  27. 24 24
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditorActivity.java
  28. 5 4
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/ContactListActivity.java
  29. 6 4
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CreditCardEditorActivity.java
  30. 6 4
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/DatePickerActivity.java
  31. 3 3
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/EnumSelectAndSort/DragListView.java
  32. 5 5
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/EnumSelectAndSort/EnumSelectAndSortActivity.java
  33. 5 4
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/EnumSlectActivity.java
  34. 3 3
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/ImageUploadActivity.java
  35. 19 0
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/ImageViewActivity.java
  36. 14 16
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/MonthPickerActivity.java
  37. 42 36
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/SignatureActivity.java
  38. 294 0
      ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/Utils.java
  39. 71 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_bundle_model.xml
  40. 19 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_common_editor.xml
  41. 10 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_contact_list.xml
  42. 10 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_credit_card_editor.xml
  43. 18 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_date_picker.xml
  44. 47 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_enum_select_and_sort.xml
  45. 49 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_enum_slect.xml
  46. 57 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_image_upload.xml
  47. 10 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_image_view.xml
  48. 56 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_month_picker.xml
  49. 16 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/activity_signature.xml
  50. 55 0
      ApexDrivers/CommonEditorLib/src/main/res/layout/bundle_item_cell.xml
  51. 9 0
      ApexDrivers/CommonEditorLib/src/main/res/menu/action_bar_menu.xml
  52. 10 0
      ApexDrivers/CommonEditorLib/src/main/res/menu/set_menu.xml
  53. 15 0
      ApexDrivers/CommonEditorLib/src/main/res/menu/signature_action_bar_menu.xml
  54. 0 19
      ApexDrivers/CommonEditorLib/src/test/java/com/example/commoneditorlib/ExampleUnitTest.java
  55. 3 2
      ApexDrivers/ratradefiling/build.gradle
  56. 11 0
      ApexDrivers/ratradefiling/src/debug/assets/detail_isf.json
  57. 1 1
      ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/Const.java
  58. 39 0
      ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/tfeditor/TFEditorActivity.java
  59. 10 0
      ApexDrivers/ratradefiling/src/main/res/layout/activity_tfeditor.xml

+ 4 - 1
ApexDrivers/CommonEditorLib/build.gradle

@@ -29,9 +29,12 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+
+    implementation project(path: ':RAUtilsLibrary')
 }

+ 0 - 28
ApexDrivers/CommonEditorLib/src/androidTest/java/com/example/commoneditorlib/ExampleInstrumentedTest.java

@@ -1,28 +0,0 @@
-package com.example.commoneditorlib;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest
-{
-    @Test
-    public void useAppContext()
-    {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.example.commoneditorlib.test", appContext.getPackageName());
-    }
-}

+ 1 - 1
ApexDrivers/CommonEditorLib/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.commoneditorlib">
+    package="com.usai.commoneditorlib">
 
 </manifest>

+ 0 - 16
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/ImageViewActivity.java

@@ -1,16 +0,0 @@
-package com.example.commoneditorlib;
-
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-import com.usai.redant.redantmobile.R;
-
-
-public class ImageViewActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_image_view);
-    }
-}

+ 0 - 314
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/Utils.java

@@ -1,314 +0,0 @@
-package com.example.commoneditorlib;
-
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.os.Environment;
-import android.support.v7.app.AlertDialog;
-
-import com.usai.redant.redantmobile.RedAntApplication;
-
-import org.json.JSONObject;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.UUID;
-
-/**
- * Created by macmini1 on 2017/8/17.
- */
-
-public class Utils {
-
-    public static String getApplicationName(Context context) {
-
-        if (context == null) {
-            return null;
-        }
-
-        PackageManager packageManager = null;
-        ApplicationInfo applicationInfo = null;
-        try {
-            packageManager = context.getPackageManager();
-            applicationInfo = packageManager.getApplicationInfo(context.getPackageName(), 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            applicationInfo = null;
-        }
-        String applicationName = (String) packageManager.getApplicationLabel(applicationInfo);
-        return applicationName;
-    }
-
-    public static String stringToMD5(String string) {
-        byte[] hash;
-
-        try {
-            hash = MessageDigest.getInstance("MD5").digest(string.getBytes("UTF-8"));
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-            return null;
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-            return null;
-        }
-
-        StringBuilder hex = new StringBuilder(hash.length * 2);
-        for (byte b : hash) {
-            if ((b & 0xFF) < 0x10)
-                hex.append("0");
-            hex.append(Integer.toHexString(b & 0xFF));
-        }
-
-        return hex.toString();
-    }
-
-    public static Bitmap loadCacheImage(String path,Bitmap holder) {
-
-//        System.gc();
-//        try {
-//            Context context = RedAntApplication.getInstance().getApplicationContext();
-//            String file_path = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Image" + stringToMD5(path);
-//            File file = new File(file_path);
-//            if (!file.exists()) {
-//                loadImage(path);
-//                return holder;
-//            }
-//            Bitmap bitmap = BitmapFactory.decodeFile(file_path);
-//            return bitmap;
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//
-//        return holder;
-
-        return loadCacheImage(path,holder,false);
-    }
-
-    public static Bitmap loadCacheImage(String path,Bitmap holder, boolean remoteLoad) {
-        System.gc();
-        try {
-            Context context = RedAntApplication.getInstance().getApplicationContext();
-            String file_path = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Image" + stringToMD5(path);
-            File file = new File(file_path);
-            if (!file.exists()) {
-                if (remoteLoad) {
-                    loadImage(path);
-                }
-                return holder;
-            }
-            Bitmap bitmap = BitmapFactory.decodeFile(file_path);
-            return bitmap;
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return holder;
-    }
-
-    public static String cacheTmpImage(Bitmap bitmap) {
-        if (bitmap == null) {
-            return null;
-        }
-
-        bitmap = compressBitmap(bitmap);
-
-        Context context = RedAntApplication.getInstance().getApplicationContext();
-        String file_path = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Tmp";
-        File dir_file = new File(file_path);
-        if (!dir_file.exists()) {
-            dir_file.mkdirs();
-        }
-        file_path = file_path + UUID.randomUUID().toString();
-        try {
-
-            BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file_path));
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, bos);
-            bos.flush();
-            bos.close();
-
-            return file_path;
-        } catch (IOException e) {
-            e.printStackTrace();
-
-        }
-
-        return null;
-
-    }
-
-    public static void loadImage(final String path) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                HttpURLConnection cnn = null;
-                Bitmap bitmap = null;
-                try {
-                    URL url = new URL(path);
-                    cnn = (HttpURLConnection)url.openConnection();
-                    cnn.setRequestMethod("GET");
-                    cnn.setUseCaches(false);
-                    cnn.setConnectTimeout(1500);
-                    cnn.setReadTimeout(1500);
-                    bitmap = BitmapFactory.decodeStream(cnn.getInputStream());
-
-                    if (bitmap != null) {
-                        cacheImage(path,bitmap);
-                    }
-
-
-                } catch (IOException e) {
-                    e.printStackTrace();
-
-                } finally {
-                    if (cnn != null) {
-                        cnn.disconnect();
-                    }
-
-                }
-            }
-        }).start();
-    }
-
-    public static void cacheLocalImageToURL(String path,String url) {
-
-
-        String filename =stringToMD5(url);
-        File file = new File(path);
-
-
-
-        if (file.exists()) {
-
-            Context context = RedAntApplication.getInstance().getApplicationContext();
-            String file_path = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Image";
-            File tmpF = new File(file_path);
-            if (!tmpF.exists()) {
-                tmpF.mkdirs();
-            }
-            file_path = file_path + "/" + filename;
-
-            InputStream is = null;
-            FileOutputStream os = null;
-            try {
-                is = new FileInputStream(file);
-                os = new FileOutputStream(file_path);
-                byte[] buffer = new byte[1024];
-                int read = 0;
-                while ((read = is.read(buffer)) != -1) {
-                    os.write(buffer,0,read);
-                }
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                try {
-
-                    os.flush();
-                    os.close();
-                    is.close();
-
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
-        }
-
-    }
-
-    public static void cacheImage(String path,Bitmap bitmap) {
-
-
-        bitmap = compressBitmap(bitmap);
-
-        try {
-
-            Context context = RedAntApplication.getInstance().getApplicationContext();
-            String file_dir = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Image";
-            File dir = new File(file_dir);
-            if (!dir.exists()) {
-                dir.mkdirs();
-            }
-            String file_path = file_dir + "/" + stringToMD5(path);
-
-            File file = new File(file_path);
-
-            savePhotoToFile(bitmap,file);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
-    }
-
-    private static Bitmap compressBitmap(Bitmap bitmap) {
-        int width = 500;
-        int height = 500;
-        if (bitmap.getWidth() > width || bitmap.getHeight() > height) {
-            bitmap = Bitmap.createScaledBitmap(bitmap,width,height,false);
-        }
-        return bitmap;
-    }
-
-    private static void savePhotoToFile(Bitmap bitmap, File photoFile) {
-        if (photoFile == null || bitmap == null) {
-            return;
-        }
-        try {
-
-            BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(photoFile));
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, bos);
-            bos.flush();
-            bos.close();
-
-        } catch (IOException e) {
-            e.printStackTrace();
-
-        }
-    }
-
-
-    public static ProgressDialog waiting_alert(Context ctx,String title, String msg) {
-        if (ctx == null) {
-            return null;
-        }
-        ProgressDialog pd = new ProgressDialog(ctx);
-        pd.setTitle(title);
-        pd.setMessage(msg);
-
-        pd.setCancelable(true);
-
-        pd.show();
-
-        return pd;
-    }
-
-    public static void message_alert(Context ctx,String title,String msg) {
-        if (ctx == null) {
-            return;
-        }
-        new AlertDialog.Builder(ctx)
-                .setTitle(title)
-                .setMessage(msg)
-                .show();
-    }
-
-
-
-
-}

+ 2 - 3
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/AddressEditorActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/AddressEditorActivity.java

@@ -1,13 +1,12 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.content.Context;
 import android.content.Intent;
-//import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-//import com.usai.redant.redantmobile.R;
+
 
 public class AddressEditorActivity extends AppCompatActivity
 {

+ 1 - 1
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/Application.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/Application.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import org.json.JSONObject;
 

+ 4 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/BrushView.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/BrushView.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -10,11 +10,13 @@ import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
+
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;

+ 8 - 5
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/BundleItemDialog.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/BundleItemDialog.java

@@ -1,10 +1,8 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StyleRes;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +11,12 @@ import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.usai.redant.redantmobile.R;
+//;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+
+import  com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 5 - 4
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/BundleModelActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/BundleModelActivity.java

@@ -1,8 +1,8 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,11 +12,12 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 
-import com.usai.redant.redantmobile.R;
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.json.JSONObject;
 
-public class BundleModelActivity extends AppCompatActivity {
+public class BundleModelActivity extends AppCompatActivity
+{
 
 
     private JSONObject items_json;

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorActionCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorActionCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.view.View;
 import android.widget.TextView;
 
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 1 - 1
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorAutoCompleteAdapter.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorAutoCompleteAdapter.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.util.Log;

+ 3 - 3
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorCellHolder.java

@@ -1,13 +1,13 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 
 
-//import com.usai.redant.redantmobile.R;
+//import com.usai.commoneditorlib.R;
 
-import com.example.commoneditorlib.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 4 - 4
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorDateRangeCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorDateRangeCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,9 +7,9 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.usai.redant.CommonEditor.CommonEditorActivity;
-import com.usai.redant.CommonEditor.DatePickerActivity;
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.CommonEditorActivity;
+import com.usai.commoneditorlib.DatePickerActivity;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorEditAutoCompleteCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorEditAutoCompleteCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 
@@ -7,7 +7,7 @@ import android.widget.AutoCompleteTextView;
 
 import android.widget.TextView;
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorEditCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorEditCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.text.TextWatcher;
@@ -7,7 +7,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorEnumCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorEnumCellHolder.java

@@ -1,11 +1,11 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 6 - 6
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorImageCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorImageCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 
 import android.app.Activity;
@@ -10,9 +10,9 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 
 
-import com.usai.redant.CommonEditor.ImageUploadActivity;
-import com.usai.redant.CommonEditor.ImageViewActivity;
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.ImageUploadActivity;
+import com.usai.commoneditorlib.ImageViewActivity;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 
@@ -81,7 +81,7 @@ public class CommonEditorImageCellHolder extends CommonEditorCellHolder{
             if (editable) {
                 // 上传Image
 
-                Intent intent = new Intent(mCtx,ImageUploadActivity.class);
+                Intent intent = new Intent(mCtx, ImageUploadActivity.class);
                 intent.putExtra("group",group);
                 intent.putExtra("child",child);
                 intent.putExtra("btn",btn_tag);
@@ -91,7 +91,7 @@ public class CommonEditorImageCellHolder extends CommonEditorCellHolder{
             } else {
                 // 查看Image
 
-                Intent intent = new Intent(mCtx,ImageViewActivity.class);
+                Intent intent = new Intent(mCtx, ImageViewActivity.class);
                 if (btn_tag == 0) {
                     if (path0 == null || path0.isEmpty()) {
                         intent = null;

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorLabelCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorLabelCellHolder.java

@@ -1,11 +1,11 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 4 - 4
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorModelCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorModelCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,8 +8,8 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 
 
-import com.usai.redant.CommonEditor.BundleModelActivity;
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.BundleModelActivity;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 
@@ -56,7 +56,7 @@ public class CommonEditorModelCellHolder extends CommonEditorCellHolder {
         @Override
         public void onClick(View v) {
             if (bundle_item != null) {
-                Intent intent = new Intent(mCtx,BundleModelActivity.class);
+                Intent intent = new Intent(mCtx, BundleModelActivity.class);
                 intent.putExtra("bundle_items",bundle_item.toString());
                 ((Activity)mCtx).startActivity(intent);
 

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorMultipleActionCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorMultipleActionCellHolder.java

@@ -1,11 +1,11 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.view.View;
 import android.widget.Button;
 
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 4 - 3
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorRangeCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorRangeCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.text.Editable;
@@ -8,8 +8,9 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.usai.redant.CommonEditor.CommonEditorActivity;
-import com.usai.redant.redantmobile.R;
+
+import com.usai.commoneditorlib.CommonEditorActivity;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorSectionHeaderHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorSectionHeaderHolder.java

@@ -1,10 +1,10 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorSignatureCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorSignatureCellHolder.java

@@ -1,11 +1,11 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorSwitchCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorSwitchCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.view.View;
@@ -6,7 +6,7 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 2 - 2
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditor/CommonEditorTextViewCellHolder.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorTextViewCellHolder.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib.CommonEditor;
+package com.usai.commoneditorlib.CommonEditor;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -12,7 +12,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 24 - 24
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CommonEditorActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditorActivity.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -6,8 +6,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputFilter;
@@ -31,25 +30,25 @@ import android.widget.ExpandableListView;
 import android.widget.Switch;
 
 
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorActionCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorAutoCompleteAdapter;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorDateRangeCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorEditAutoCompleteCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorEditCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorEnumCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorImageCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorLabelCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorModelCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorMultipleActionCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorRangeCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorSectionHeaderHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorSignatureCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorSwitchCellHolder;
-import com.usai.redant.CommonEditor.CommonEditor.CommonEditorTextViewCellHolder;
-import com.usai.redant.CommonEditor.EnumSelectAndSort.EnumSelectAndSortActivity;
-import com.usai.redant.redantmobile.R;
-import com.usai.redant.util.Network;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.usai.commoneditorlib.CommonEditor.CommonEditorActionCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorAutoCompleteAdapter;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorDateRangeCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorEditAutoCompleteCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorEditCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorEnumCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorImageCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorLabelCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorModelCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorMultipleActionCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorRangeCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorSectionHeaderHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorSignatureCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorSwitchCellHolder;
+import com.usai.commoneditorlib.CommonEditor.CommonEditorTextViewCellHolder;
+import com.usai.commoneditorlib.EnumSelectAndSort.EnumSelectAndSortActivity;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -68,6 +67,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import com.usai.redant.rautils.utils.RAUtil;
 
 import static android.view.Gravity.CENTER_VERTICAL;
 import static android.view.Gravity.LEFT;
@@ -291,7 +291,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
                                         adapter.notifyDataSetChanged();
 
                                     } else {
-                                        Utils.message_alert(mCtx,"Warning","Error");
+                                        Utils.alertMessage(mCtx,"Warning","Error");
                                     }
 
                                 } else {
@@ -4056,7 +4056,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
                                             setValue(name,value);
                                         }
                                     } else {
-                                        Utils.message_alert(mCtx,"",editor_json.optString("err_msg"));
+                                        Utils.alertMessage(mCtx,"",editor_json.optString("err_msg"));
                                     }
 
                                 }

+ 5 - 4
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/ContactListActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/ContactListActivity.java

@@ -1,17 +1,18 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
-import com.usai.redant.redantmobile.R;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.json.JSONObject;
 
 import java.io.Serializable;
 
-public class ContactListActivity extends AppCompatActivity {
+public class ContactListActivity extends AppCompatActivity
+{
 
 
     static String IS_SUBACTION = "is_subaction";

+ 6 - 4
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/CreditCardEditorActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CreditCardEditorActivity.java

@@ -1,17 +1,19 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
 
-import com.usai.redant.redantmobile.R;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.json.JSONObject;
 
 import java.io.Serializable;
 
-public class CreditCardEditorActivity extends AppCompatActivity {
+public class CreditCardEditorActivity extends AppCompatActivity
+{
 
 
     static String URL_TYPE = "url_type";

+ 6 - 4
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/DatePickerActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/DatePickerActivity.java

@@ -1,17 +1,19 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.widget.DatePicker;
 
-import com.usai.redant.redantmobile.R;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-public class DatePickerActivity extends AppCompatActivity {
+public class DatePickerActivity extends AppCompatActivity
+{
 
     public static class Builder {
         public Intent build(Context context, Date date, SimpleDateFormat formatter,int pickerMode,String time,int group,int child) {

+ 3 - 3
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/EnumSelectAndSort/DragListView.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/EnumSelectAndSort/DragListView.java

@@ -1,6 +1,6 @@
-package com.example.commoneditorlib.EnumSelectAndSort;
+package com.usai.commoneditorlib.EnumSelectAndSort;
 
-//import com.usai.redant.redantmobile.R;
+//import com.usai.commoneditorlib.R;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -17,7 +17,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
 
-import com.example.commoneditorlib.R;
+import com.usai.commoneditorlib.R;
 
 public class DragListView extends ListView
 {

+ 5 - 5
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/EnumSelectAndSort/EnumSelectAndSortActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/EnumSelectAndSort/EnumSelectAndSortActivity.java

@@ -1,9 +1,10 @@
-package com.example.commoneditorlib.EnumSelectAndSort;
+package com.usai.commoneditorlib.EnumSelectAndSort;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -19,8 +20,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.usai.redant.CommonEditor.EnumSlectActivity;
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONException;
 import org.json.JSONObject;

+ 5 - 4
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/EnumSlectActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/EnumSlectActivity.java

@@ -1,9 +1,10 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -17,7 +18,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import org.json.JSONObject;
 

+ 3 - 3
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/ImageUploadActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/ImageUploadActivity.java

@@ -1,4 +1,4 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -10,7 +10,7 @@ import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageButton;
@@ -18,7 +18,7 @@ import android.widget.ImageView;
 import android.widget.Toast;
 
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import java.io.File;
 import java.util.UUID;

+ 19 - 0
ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/ImageViewActivity.java

@@ -0,0 +1,19 @@
+package com.usai.commoneditorlib;
+
+//import androidx.appcompat.app.AppCompatActivity;
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.usai.commoneditorlib.R;
+
+
+public class ImageViewActivity extends AppCompatActivity
+{
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_image_view);
+    }
+}

+ 14 - 16
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/MonthPickerActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/MonthPickerActivity.java

@@ -1,15 +1,15 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.NumberPicker;
 
-import com.usai.redant.redantmobile.R;
+import com.usai.commoneditorlib.R;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -94,19 +94,17 @@ public class MonthPickerActivity extends AppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.set_item: {
-                int year = yearPicker.getValue();
-                int month = monthPicker.getValue() + 1;
-                String date_str = month + "/" + year;
-                Intent intent = new Intent();
-                intent.putExtra("value",date_str);
-                intent.putExtra("group",group);
-                intent.putExtra("child",child);
-                setResult(RESULT_OK,intent);
-                finish();
-            }
-            break;
+        if (item.getItemId() == R.id.set_item)
+        {
+            int year = yearPicker.getValue();
+            int month = monthPicker.getValue() + 1;
+            String date_str = month + "/" + year;
+            Intent intent = new Intent();
+            intent.putExtra("value", date_str);
+            intent.putExtra("group", group);
+            intent.putExtra("child", child);
+            setResult(RESULT_OK, intent);
+            finish();
         }
         return true;
     }

+ 42 - 36
ApexDrivers/CommonEditorLib/src/main/java/com/example/commoneditorlib/SignatureActivity.java → ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/SignatureActivity.java

@@ -1,17 +1,20 @@
-package com.example.commoneditorlib;
+package com.usai.commoneditorlib;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.usai.redant.redantmobile.R;
+import androidx.appcompat.app.AppCompatActivity;
+
 
-public class SignatureActivity extends AppCompatActivity {
+
+public class SignatureActivity extends AppCompatActivity
+{
 
 
     public static class Builder {
@@ -53,40 +56,43 @@ public class SignatureActivity extends AppCompatActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 
-        switch (item.getItemId()) {
-            case R.id.save_signature_item: {
-                if (brushView.checkCanSave()) {
-                    Bitmap bitmap = brushView.getDrawBitmap();
-                    String path = Utils.cacheTmpImage(bitmap);
-
-                    // upload signature
-
-                    // upload success
-                    Intent intent = new Intent();
-                    intent.putExtra("url_down",path);
-                    intent.putExtra("url_up",path);
-                    intent.putExtra("path",path);
-                    intent.putExtra("group",group);
-                    intent.putExtra("child",child);
-
-                    setResult(RESULT_OK,intent);
-                    finish();
-                } else {
-
-                    new AlertDialog.Builder(this)
-                            .setTitle("Warning")
-                            .setMessage("Please Sign")
-                            .setPositiveButton("Ok",null)
-                            .show();
-
-                }
+        int itemId = item.getItemId();
+        if (itemId == R.id.save_signature_item)
+        {
+            if (brushView.checkCanSave())
+            {
+                Bitmap bitmap = brushView.getDrawBitmap();
+                String path = Utils.cacheTmpImage(bitmap);
+
+                // upload signature
+
+                // upload success
+                Intent intent = new Intent();
+                intent.putExtra("url_down", path);
+                intent.putExtra("url_up", path);
+                intent.putExtra("path", path);
+                intent.putExtra("group", group);
+                intent.putExtra("child", child);
+
+                setResult(RESULT_OK, intent);
+                finish();
             }
-            break;
-            case R.id.clear_signature_item: {
-                brushView.clear();
+            else
+            {
+
+                new AlertDialog.Builder(this)
+                        .setTitle("Warning")
+                        .setMessage("Please Sign")
+                        .setPositiveButton("Ok", null)
+                        .show();
+
             }
-            break;
         }
+        else
+            if (itemId == R.id.clear_signature_item)
+            {
+                brushView.clear();
+            }
 
         return true;
     }

+ 294 - 0
ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/Utils.java

@@ -0,0 +1,294 @@
+package com.usai.commoneditorlib;
+
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.os.Environment;
+
+
+//import com.usai.commoneditorlib.RedAntApplication;
+
+import org.json.JSONObject;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
+
+/**
+ * Created by macmini1 on 2017/8/17.
+ */
+
+public class Utils {
+
+//    public static String getApplicationName(Context context) {
+//
+//        if (context == null) {
+//            return null;
+//        }
+//
+//        PackageManager packageManager = null;
+//        ApplicationInfo applicationInfo = null;
+//        try {
+//            packageManager = context.getPackageManager();
+//            applicationInfo = packageManager.getApplicationInfo(context.getPackageName(), 0);
+//        } catch (PackageManager.NameNotFoundException e) {
+//            applicationInfo = null;
+//        }
+//        String applicationName = (String) packageManager.getApplicationLabel(applicationInfo);
+//        return applicationName;
+//    }
+
+//
+//
+//    public static Bitmap loadCacheImage(String path,Bitmap holder) {
+//
+////        System.gc();
+////        try {
+////            Context context = RedAntApplication.getInstance().getApplicationContext();
+////            String file_path = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Image" + stringToMD5(path);
+////            File file = new File(file_path);
+////            if (!file.exists()) {
+////                loadImage(path);
+////                return holder;
+////            }
+////            Bitmap bitmap = BitmapFactory.decodeFile(file_path);
+////            return bitmap;
+////
+////        } catch (Exception e) {
+////            e.printStackTrace();
+////        }
+////
+////        return holder;
+//
+//        return loadCacheImage(path,holder,false);
+//    }
+//
+//    public static Bitmap loadCacheImage(String path,Bitmap holder, boolean remoteLoad) {
+//        System.gc();
+//        try {
+//            Context context = RedAntApplication.getInstance().getApplicationContext();
+//            String file_path = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Image" + stringToMD5(path);
+//            File file = new File(file_path);
+//            if (!file.exists()) {
+//                if (remoteLoad) {
+//                    loadImage(path);
+//                }
+//                return holder;
+//            }
+//            Bitmap bitmap = BitmapFactory.decodeFile(file_path);
+//            return bitmap;
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//
+//        return holder;
+//    }
+//
+//    public static String cacheTmpImage(Bitmap bitmap) {
+//        if (bitmap == null) {
+//            return null;
+//        }
+//
+//        bitmap = compressBitmap(bitmap);
+//
+//        Context context = RedAntApplication.getInstance().getApplicationContext();
+//        String file_path = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Tmp";
+//        File dir_file = new File(file_path);
+//        if (!dir_file.exists()) {
+//            dir_file.mkdirs();
+//        }
+//        file_path = file_path + UUID.randomUUID().toString();
+//        try {
+//
+//            BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file_path));
+//            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, bos);
+//            bos.flush();
+//            bos.close();
+//
+//            return file_path;
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//
+//        }
+//
+//        return null;
+//
+//    }
+//
+//    public static void loadImage(final String path) {
+//        new Thread(new Runnable() {
+//            @Override
+//            public void run() {
+//                HttpURLConnection cnn = null;
+//                Bitmap bitmap = null;
+//                try {
+//                    URL url = new URL(path);
+//                    cnn = (HttpURLConnection)url.openConnection();
+//                    cnn.setRequestMethod("GET");
+//                    cnn.setUseCaches(false);
+//                    cnn.setConnectTimeout(1500);
+//                    cnn.setReadTimeout(1500);
+//                    bitmap = BitmapFactory.decodeStream(cnn.getInputStream());
+//
+//                    if (bitmap != null) {
+//                        cacheImage(path,bitmap);
+//                    }
+//
+//
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//
+//                } finally {
+//                    if (cnn != null) {
+//                        cnn.disconnect();
+//                    }
+//
+//                }
+//            }
+//        }).start();
+//    }
+//
+//    public static void cacheLocalImageToURL(String path,String url) {
+//
+//
+//        String filename =stringToMD5(url);
+//        File file = new File(path);
+//
+//
+//
+//        if (file.exists()) {
+//
+//            Context context = RedAntApplication.getInstance().getApplicationContext();
+//            String file_path = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Image";
+//            File tmpF = new File(file_path);
+//            if (!tmpF.exists()) {
+//                tmpF.mkdirs();
+//            }
+//            file_path = file_path + "/" + filename;
+//
+//            InputStream is = null;
+//            FileOutputStream os = null;
+//            try {
+//                is = new FileInputStream(file);
+//                os = new FileOutputStream(file_path);
+//                byte[] buffer = new byte[1024];
+//                int read = 0;
+//                while ((read = is.read(buffer)) != -1) {
+//                    os.write(buffer,0,read);
+//                }
+//
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            } finally {
+//                try {
+//
+//                    os.flush();
+//                    os.close();
+//                    is.close();
+//
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//
+//        }
+//
+//    }
+//
+//    public static void cacheImage(String path,Bitmap bitmap) {
+//
+//
+//        bitmap = compressBitmap(bitmap);
+//
+//        try {
+//
+//            Context context = RedAntApplication.getInstance().getApplicationContext();
+//            String file_dir = Environment.getExternalStorageDirectory().getPath() + "/" + getApplicationName(context) + "/Cache/Image";
+//            File dir = new File(file_dir);
+//            if (!dir.exists()) {
+//                dir.mkdirs();
+//            }
+//            String file_path = file_dir + "/" + stringToMD5(path);
+//
+//            File file = new File(file_path);
+//
+//            savePhotoToFile(bitmap,file);
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//
+//
+//    }
+//
+//    private static Bitmap compressBitmap(Bitmap bitmap) {
+//        int width = 500;
+//        int height = 500;
+//        if (bitmap.getWidth() > width || bitmap.getHeight() > height) {
+//            bitmap = Bitmap.createScaledBitmap(bitmap,width,height,false);
+//        }
+//        return bitmap;
+//    }
+//
+//    private static void savePhotoToFile(Bitmap bitmap, File photoFile) {
+//        if (photoFile == null || bitmap == null) {
+//            return;
+//        }
+//        try {
+//
+//            BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(photoFile));
+//            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, bos);
+//            bos.flush();
+//            bos.close();
+//
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//
+//        }
+//    }
+//
+//
+//    public static ProgressDialog waiting_alert(Context ctx,String title, String msg) {
+//        if (ctx == null) {
+//            return null;
+//        }
+//        ProgressDialog pd = new ProgressDialog(ctx);
+//        pd.setTitle(title);
+//        pd.setMessage(msg);
+//
+//        pd.setCancelable(true);
+//
+//        pd.show();
+//
+//        return pd;
+//    }
+//
+//    public static void message_alert(Context ctx,String title,String msg) {
+//        if (ctx == null) {
+//            return;
+//        }
+//        new AlertDialog.Builder(ctx)
+//                .setTitle(title)
+//                .setMessage(msg)
+//                .show();
+//    }
+//
+//
+
+
+}

+ 71 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_bundle_model.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<RelativeLayout-->
+    <!--xmlns:android="http://schemas.android.com/apk/res/android"-->
+    <!--xmlns:tools="http://schemas.android.com/tools"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent"-->
+    <!--tools:context="com.usai.redant.CommonEditor.BundleModelActivity">-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <LinearLayout
+        android:id="@+id/title_ll"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:orientation="horizontal"
+        >
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="4"
+            android:gravity="center"
+            android:textColor="#555555"
+            android:text="Model"
+            />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="7"
+            android:gravity="center"
+            android:textColor="#555555"
+            android:text="Description"
+            />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="2"
+            android:gravity="center"
+            android:textColor="#555555"
+            android:text="QTY"
+            />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="3"
+            android:gravity="center"
+            android:textColor="#555555"
+            android:text="Unit Price"
+            />
+
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/bundle_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/title_ll"
+        android:layout_marginBottom="5dp"
+        >
+
+    </ListView>
+
+
+</RelativeLayout>

+ 19 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_common_editor.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/root_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.usai.redant.CommonEditor.CommonEditorActivity">
+
+    
+    <ExpandableListView
+        android:id="@+id/list_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+    
+
+</RelativeLayout>

+ 10 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_contact_list.xml

@@ -0,0 +1,10 @@
+<?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="com.usai.redant.CommonEditor.ContactListActivity">
+
+</android.support.constraint.ConstraintLayout>

+ 10 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_credit_card_editor.xml

@@ -0,0 +1,10 @@
+<?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="com.usai.redant.CommonEditor.CreditCardEditorActivity">
+
+</android.support.constraint.ConstraintLayout>

+ 18 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_date_picker.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.usai.redant.CommonEditor.DatePickerActivity">
+
+    <DatePicker
+        android:id="@+id/date_picker"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:datePickerMode="spinner"
+        android:calendarViewShown="false"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"/>
+
+</RelativeLayout>

+ 47 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_enum_select_and_sort.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.usai.redant.CommonEditor.EnumSelectAndSort.EnumSelectAndSortActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@drawable/circle_corner_border"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            >
+            <EditText
+                android:id="@+id/common_editor_enum_select_sort_search_bar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="5dp"
+                android:background="@null"
+                android:hint="filter"
+                android:imeOptions="actionGo"
+                android:maxLines="1"
+                />
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <com.usai.redant.CommonEditor.EnumSelectAndSort.DragListView
+        android:id="@+id/enum__select_sort_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+
+</LinearLayout>

+ 49 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_enum_slect.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    tools:context="com.usai.redant.CommonEditor.EnumSlectActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@drawable/circle_corner_border"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            >
+            <EditText
+                android:id="@+id/common_editor_enum_search_bar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="5dp"
+                android:background="@null"
+                android:hint="filter"
+                android:imeOptions="actionGo"
+                android:maxLines="1"
+                />
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <ListView
+        android:id="@+id/enum_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+
+        />
+
+
+</LinearLayout>

+ 57 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_image_upload.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.usai.redant.CommonEditor.ImageUploadActivity">
+
+
+    <LinearLayout
+        android:id="@+id/control_bar"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal"
+        >
+
+        <ImageButton
+            android:id="@+id/photo_library_btn"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitCenter"
+            android:src="@drawable/album"
+            />
+
+        <ImageButton
+            android:id="@+id/tack_photo_btn"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitCenter"
+            android:src="@drawable/camera"
+            />
+
+        <ImageButton
+            android:id="@+id/photo_upload_btn"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitCenter"
+            android:src="@drawable/upload"
+            />
+
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/img_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/not_found"
+        android:layout_above="@id/control_bar"
+        />
+
+
+</RelativeLayout>

+ 10 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_image_view.xml

@@ -0,0 +1,10 @@
+<?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="com.usai.redant.CommonEditor.ImageViewActivity">
+
+</android.support.constraint.ConstraintLayout>

+ 56 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_month_picker.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.usai.redant.CommonEditor.MonthPickerActivity">
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="10dp"
+        android:orientation="horizontal"
+        >
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_margin="5dp"
+            >
+
+            <NumberPicker
+                android:id="@+id/year_picker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_margin="5dp"
+            >
+
+            <NumberPicker
+                android:id="@+id/month_picker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                />
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+
+
+</RelativeLayout>

+ 16 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/activity_signature.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.usai.redant.CommonEditor.SignatureActivity">
+
+    <com.example.macmini1.listviewdemo.BrushView
+        android:id="@+id/brush_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+
+</RelativeLayout>

+ 55 - 0
ApexDrivers/CommonEditorLib/src/main/res/layout/bundle_item_cell.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="160dp">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="160dp"
+        >
+
+        <TextView
+            android:id="@+id/model_name_tv"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="4"
+            android:gravity="center"
+            android:textColor="#000000"
+            />
+
+        <TextView
+            android:id="@+id/model_desc_tv"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="7"
+            android:gravity="left|center_vertical"
+            android:textColor="#000000"
+            android:maxLines="10"
+            android:minLines="1"
+            />
+
+        <TextView
+            android:id="@+id/model_qty_tv"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:gravity="center"
+            android:textColor="#000000"
+            />
+
+        <TextView
+            android:id="@+id/model_unit_price_tv"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="3"
+            android:gravity="center"
+            android:textColor="#000000"
+            />
+
+
+
+    </LinearLayout>
+
+
+</LinearLayout>

+ 9 - 0
ApexDrivers/CommonEditorLib/src/main/res/menu/action_bar_menu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/save_item"
+        android:title="Save"
+        />
+
+</menu>

+ 10 - 0
ApexDrivers/CommonEditorLib/src/main/res/menu/set_menu.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <item
+        android:id="@+id/set_item"
+        android:title="Set"
+        />
+
+</menu>

+ 15 - 0
ApexDrivers/CommonEditorLib/src/main/res/menu/signature_action_bar_menu.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <item
+        android:id="@+id/clear_signature_item"
+        android:title="Clear"
+        />
+
+    <item
+        android:id="@+id/save_signature_item"
+        android:title="Save"
+        />
+
+</menu>

+ 0 - 19
ApexDrivers/CommonEditorLib/src/test/java/com/example/commoneditorlib/ExampleUnitTest.java

@@ -1,19 +0,0 @@
-package com.example.commoneditorlib;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest
-{
-    @Test
-    public void addition_isCorrect()
-    {
-        assertEquals(4, 2 + 2);
-    }
-}

+ 3 - 2
ApexDrivers/ratradefiling/build.gradle

@@ -16,10 +16,10 @@ android {
     defaultConfig {
         applicationId "com.usai.ratradefiling"
         minSdkVersion 26
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        ndk.abiFilters 'armeabi-v7a',"arm64-v8a"
+//        ndk.abiFilters 'armeabi-v7a',"arm64-v8a"
 
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -57,6 +57,7 @@ dependencies {
 //    api 'com.android.support:support-v4:27.1.0'
 //
     implementation project(path: ':RAUtilsLibrary')
+    implementation project(path: ':CommonEditorLib')
     implementation project(path: ':rapdflib')
 //    implementation 'androidx.wear:wear:1.0.0'
 //    compileOnly 'com.google.android.wearable:wearable:2.6.0'

+ 11 - 0
ApexDrivers/ratradefiling/src/debug/assets/detail_isf.json

@@ -131,5 +131,16 @@
     "_name": "Addtional Reference",
     "count": 8
   },
+  "page_menu": [
+    {
+      "type": "editor",
+      "title": "Edit",
+      "params":{
+        "id":"123456",
+        "action":"editor",
+        "sub_type":"isf"
+      }
+    }
+  ],
   "count": 4
 }

+ 1 - 1
ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/Const.java

@@ -4,7 +4,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class Const {
 
-    public static final boolean FAKE_DATA = false;
+    public static final boolean FAKE_DATA = true;
 
     public static final int MY_PERMISSIONS_REQUEST = 1;
     private static final AtomicInteger sNextGeneratedId = new AtomicInteger(1);

+ 39 - 0
ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/tfeditor/TFEditorActivity.java

@@ -0,0 +1,39 @@
+package com.usai.ratradefiling.tfeditor;
+
+import android.content.Context;
+//import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+//import com.usai.redant.CommonEditor.CommonEditorActivity;
+//import com.usai.redant.redantmobile.R;
+//import com.usai.redant.util.Network;
+
+import com.example.commoneditorlib.CommonEditorActivity;
+import com.usai.ratradefiling.R;
+
+import org.json.JSONObject;
+
+public class TFEditorActivity extends CommonEditorActivity
+{
+
+    private Context mContext;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+
+        mContext = this;
+
+        hasChildView = true;
+//        setContentView(R.layout.activity_tfeditor);
+
+        super.onCreate(savedInstanceState);
+    }
+
+
+
+    @Override
+    public JSONObject request_editor(String request_url, Bundle params) {
+
+        return Network.require_orderdetail(request_url,params);
+    }
+}

+ 10 - 0
ApexDrivers/ratradefiling/src/main/res/layout/activity_tfeditor.xml

@@ -0,0 +1,10 @@
+<?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="com.usai.redant.Detail.OrderDetailActivity">
+
+</android.support.constraint.ConstraintLayout>