Add common editor public library -- 添加common editor 公共库 (resolve: #14499)

ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/BrushView.java

@@ -17,6 +17,8 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import com.usai.redant.rautils.utils.RAUtil;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,18 +38,27 @@ public class BrushView extends View {
     private float maxX;
     private float maxY;
     private float lineWidth;
+    Context mContext;
 
     public BrushView(Context context) {
+
         this(context,null);
+
+        mContext = context;
     }
 
     public BrushView(Context context, @Nullable AttributeSet attrs) {
+
         this(context, attrs,0);
+
+        mContext = context;
     }
 
     public BrushView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+
         super(context, attrs, defStyleAttr);
 
+        mContext = context;
         lineWidth = 10.f;
         init();
     }
@@ -173,7 +184,7 @@ public class BrushView extends View {
         Bitmap bitmap = getDrawingCache();
 
         // 裁剪绘图区域
-        String path = Utils.cacheTmpImage(bitmap);
+        String path = RAUtil.cacheTmpImage(mContext,bitmap);
 
         int width = getWidth();
         int height = getHeight();

ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditorActivity.java

@@ -69,6 +69,8 @@ import java.util.List;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import com.usai.redant.rautils.utils.Network;
 import com.usai.redant.rautils.utils.RAUtil;
 
 import static android.view.Gravity.CENTER_VERTICAL;
@@ -4355,6 +4357,8 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
 
     public JSONArray sync_loadCadidate(String keyword,JSONObject item_json) {
 
+
+
         if (keyword == null || keyword.isEmpty()) {
             return null;
         }
@@ -4364,7 +4368,12 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
         params.putString("name",item_json.optString("name"));
         params.putString("keyword",keyword);
 
-        JSONObject json = Network.queryAutoComplete(params);
+
+        if(true)
+            throw new AssertionError("Network.queryAutoComplete not impl");
+
+
+        JSONObject json = Network.queryAutoComplete("",params);
 
         if (json != null) {
             return json.optJSONArray("cadedate");

ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/ImageUploadActivity.java

@@ -19,6 +19,7 @@ import android.widget.Toast;
 
 
 import com.usai.commoneditorlib.R;
+import com.usai.redant.rautils.utils.RAUtil;
 
 import java.io.File;
 import java.util.UUID;
@@ -92,7 +93,7 @@ public class ImageUploadActivity extends AppCompatActivity {
 
 
                     UUID uuid = UUID.randomUUID();
-                    String img_path = Utils.cacheTmpImage(bitmap);
+                    String img_path = RAUtil.cacheTmpImage(ImageUploadActivity.this,bitmap);
 
                     // upload success
                     Intent intent = new Intent();

ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/SignatureActivity.java

@@ -11,6 +11,7 @@ import android.view.MenuItem;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.usai.redant.rautils.utils.RAUtil;
 
 
 public class SignatureActivity extends AppCompatActivity
@@ -62,7 +63,7 @@ public class SignatureActivity extends AppCompatActivity
             if (brushView.checkCanSave())
             {
                 Bitmap bitmap = brushView.getDrawBitmap();
-                String path = Utils.cacheTmpImage(bitmap);
+                String path = RAUtil.cacheTmpImage(SignatureActivity.this, bitmap);
 
                 // upload signature
 

ApexDrivers/CommonEditorLib/src/main/res/drawable/black_border.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!--背景色-->
+    <solid android:color="#FFFFFF" />
+
+    <!--边框颜色-->
+    <stroke
+        android:width="0.01dp"
+        android:color="#000000" />
+
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+
+</shape>

ApexDrivers/CommonEditorLib/src/main/res/drawable/circle_corner_border.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="10dp"/>
+
+    <solid android:color="@color/clear_color"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/dark_gray"
+        />
+
+</shape>

ApexDrivers/CommonEditorLib/src/main/res/values/colors.xml

@@ -0,0 +1,44 @@
+<?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="transparent_background">#50000000</color>
+
+    <color name="message_success">#ee00ff00</color>
+    <color name="message_fail">#eeff0000</color>
+
+    <color name="possible_result_points">
+        #c0ffbd21
+    </color>
+
+    <color name="result_points">
+        #c099cc00
+    </color>
+
+    <color name="result_view">
+        #b0000000
+    </color>
+    <color name="status_text">
+        #ffffffff
+    </color>
+    <color name="transparent">#00000000</color>
+    <color name="viewfinder_laser">
+        #ffcc0000
+    </color>
+    <color name="viewfinder_mask">
+        #60000000
+    </color>
+
+    <color name="black_overlay">#66000000</color>
+
+    <color name="dark_gray">#555555</color>
+
+    <color name="clear_color">#00000000</color>
+
+    <color name="blue">#2172ff</color>
+    <color name="white_color">#ffffff</color>
+</resources>

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/Network.java

@@ -30,6 +30,7 @@ import java.net.MalformedURLException;
 import java.net.ProtocolException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -887,4 +888,86 @@ public class Network {
 
         // return RESULT_ERROR;
     }
+
+ // common editor
+    public static JSONObject queryAutoComplete(String url,  Bundle upparams) {
+        upparams.putString("_action","ant_mobile");
+        upparams.putString("_operate","query_autocomplete");
+
+        String json_string = getJson(url,upparams , REQUEST_TIMEOUT);
+
+        if (json_string == null || json_string.isEmpty()) {
+            json_string = "{\"result\" : \"1\"}";
+        }
+
+        try {
+            return new JSONObject(json_string);
+        } catch (JSONException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static JSONObject commoneditor_partialrefresh(JSONObject params,String url) {
+
+        Bundle bundle = new Bundle();
+        Iterator<String> keys = params.keys();
+        try {
+            while (keys.hasNext()) {
+                String key = keys.next();
+                Object obj = params.get(key);
+
+                if (obj instanceof Boolean)
+                {
+                    bundle.putBoolean(key,((Boolean) obj).booleanValue());
+                }
+                else if(obj instanceof Byte)
+                {
+                    bundle.putByte(key, ((Byte) obj).byteValue());
+                }
+                else if(obj instanceof Character)
+                    {
+                        bundle.putChar(key, ((Character) obj).charValue());
+                    }
+                    else if(obj instanceof Double)
+                        {
+                            bundle.putDouble(key, ((Double) obj).doubleValue());
+                        }
+                        else if(obj instanceof Float)
+                            {
+                                bundle.putFloat(key, ((Float) obj).floatValue());
+                            }
+                            else if(obj instanceof Integer)
+                                {
+                                    bundle.putInt(key, ((Integer) obj).intValue());
+                                }
+                                else if(obj instanceof Long)
+                                    {
+                                        bundle.putLong(key, ((Long) obj).longValue());
+                                    }
+                                    else if(obj instanceof Short)
+                                        {
+                                            bundle.putShort(key, ((Short) obj).shortValue());
+                                        }
+                                        else if(obj instanceof String)
+                                            {
+                                                bundle.putString(key, obj.toString());
+                                            }
+
+            }
+
+            String json_string = getJson(url,bundle,REQUEST_TIMEOUT);
+
+            if (json_string == null || json_string.isEmpty()) {
+                json_string = "{\"result\" : \"1\"}";
+            }
+
+            return new JSONObject(json_string);
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/RAUtil.java

@@ -59,6 +59,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
@@ -1072,4 +1073,34 @@ public class RAUtil {
             }
         }).start();
     }
+    public static String cacheTmpImage(Context context,Bitmap bitmap) {
+        if (bitmap == null) {
+            return null;
+        }
+
+        bitmap = compressBitmap(bitmap);
+
+
+        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;
+
+    }
 }

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/tfeditor/TFEditorActivity.java

@@ -8,7 +8,7 @@ import android.os.Bundle;
 //import com.usai.redant.redantmobile.R;
 //import com.usai.redant.util.Network;
 
-import com.example.commoneditorlib.CommonEditorActivity;
+import com.usai.commoneditorlib.CommonEditorActivity;
 import com.usai.ratradefiling.R;
 
 import org.json.JSONObject;
@@ -33,7 +33,9 @@ public class TFEditorActivity extends CommonEditorActivity
 
     @Override
     public JSONObject request_editor(String request_url, Bundle params) {
-
-        return Network.require_orderdetail(request_url,params);
+        if(true)
+            throw new AssertionError("TFEditorActivity::request_editor not impl");
+return null;
+//        return Network.require_orderdetail(request_url,params);
     }
 }