common editor adds online enumeration type -- common editor 增加在线枚举类型(resolve: #14541)

ApexDrivers/CommonEditorLib/src/main/AndroidManifest.xml

@@ -66,5 +66,10 @@
             android:name=".EnumSelectAndSort.EnumSelectAndSortActivity"
             android:theme="@style/Theme.AppCompat.Light">
         </activity>
+        <activity
+            android:name=".EnumSlectOnlineActivity"
+            android:theme="@style/Theme.AppCompat.Light">
+        </activity>
+
     </application>>
 </manifest>

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

@@ -75,6 +75,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.usai.redant.rautils.utils.Network;
+import com.usai.redant.rautils.utils.RAConverter;
 import com.usai.redant.rautils.utils.RAUtil;
 
 import static android.view.Gravity.CENTER_VERTICAL;
@@ -2203,17 +2204,37 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
                     int max_select = item_json.optInt("max");
                     boolean singleSelect = single_select.toLowerCase().equals("true");
                     String cadedate_str = cadedate_json.toString();
-                    boolean sort = item_json.optBoolean("sort",false);
 
 
+                    boolean online = item_json.optBoolean("online");
+                    if(online)
+                    {
+
+                        String url = item_json.optString("url");
+
+                        JSONObject paramsjson = item_json.optJSONObject("params");
 
-                    if (sort) {
-                        intent = new EnumSelectAndSortActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,cadedate_str,singleSelect,true);
+                        Bundle params=RAUtil.Json2Bundle(paramsjson);
+
+                        intent = new EnumSlectOnlineActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,cadedate_str,singleSelect,true,url,params);
                     }
                     else
                     {
-                        intent = new EnumSlectActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,cadedate_str,singleSelect,true);
+                        boolean sort = item_json.optBoolean("sort",false);
+
+
+
+                        if (sort) {
+                            intent = new EnumSelectAndSortActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,cadedate_str,singleSelect,true);
+                        }
+                        else
+                        {
+                            intent = new EnumSlectActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,cadedate_str,singleSelect,true);
+                        }
                     }
+
+
+
                     request_code = 10;
 
                 } // enum

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

@@ -0,0 +1,586 @@
+package com.usai.commoneditorlib;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.usai.redant.rautils.utils.Network;
+import com.usai.redant.rautils.utils.RAUtil;
+
+import org.json.JSONObject;
+import org.w3c.dom.Text;
+
+import java.io.Serializable;
+
+public class EnumSlectOnlineActivity extends AppCompatActivity {
+
+    static String MAX_SELECT = "max_select";
+    static String GROUP_POSITION = "group";
+    static String CHILD_POSITION = "child";
+    static String CADEDATE = "cadedate";
+    static String SINGLE_SELECT = "single_select";
+    static String TITLE = "title";
+    static String AUTO_CLOSE = "auto_close";
+    static String URL = "url";
+    static String PARAMETERS = "params";
+
+    private final int LoadDataOptionInitial = 0;
+    private final int LoadDataOptionReload = 1;
+    private final int LoadDataOptionLoadMore = 2;
+
+
+//    Bundle params;
+//    String url;
+    int offset=0;
+    int limit=0;
+
+    void LoadData(int option)
+    {
+        Intent intent = getIntent();
+        Bundle params = intent.getBundleExtra(PARAMETERS);
+
+        String url = intent.getStringExtra(URL);
+        if(option == LoadDataOptionReload)
+        {
+            offset=0;
+            limit = 0;
+        }
+
+        if(params ==null)
+            params = new Bundle();
+        params.putInt("offset",offset);
+        params.putInt("limit",limit);
+        if(!TextUtils.isEmpty(mKeywords))
+        {
+            params.putString("keywords",mKeywords);
+
+        }
+
+        final ProgressDialog pd = RAUtil.waiting_alert(mCtx,"loading","please wait");
+        Bundle finalParams = params;
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                final JSONObject result_json = Network.GetCadedate(url, finalParams);
+
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+
+                        pd.dismiss();
+
+                        int result = result_json.optInt("result");
+                        if (result == 2) {
+
+                            if (option !=     LoadDataOptionLoadMore) {
+                                mCadedate = new JSONObject();
+                            }
+
+                            int count = result_json.optInt("count");
+                            for (int ipr = 0; ipr < count; ipr++) {
+                                JSONObject pr_item = editor_json.optJSONObject("item_" + ipr);
+                                String name = pr_item.optString("name");
+                                String value = pr_item.optString("value");
+                                setValue(name,value);
+                            }
+                        } else {
+                            RAUtil.alertMessage(mCtx,"",result_json.optString("err_msg"));
+                        }
+
+                    }
+                });
+            }
+        }).start();
+
+
+    }
+
+    public static class Builder {
+        public Intent build(Context context,String title, int max_select, int group, int child, String cadedate,boolean single_select,boolean auto_close,String url, Bundle params) {
+            if (context == null) {
+                return null;
+            }
+
+            Intent intent = new Intent(context, EnumSlectOnlineActivity.class);
+
+            intent.putExtra(MAX_SELECT,max_select);
+            intent.putExtra(GROUP_POSITION,group);
+            intent.putExtra(CHILD_POSITION,child);
+            intent.putExtra(PARAMETERS,params);
+            intent.putExtra(URL,url);
+
+            if (cadedate != null) {
+                intent.putExtra(CADEDATE,(Serializable) cadedate);
+            }
+            intent.putExtra(SINGLE_SELECT,single_select);
+            if (title != null) {
+                intent.putExtra(TITLE,title);
+            }
+            intent.putExtra(AUTO_CLOSE,auto_close);
+
+            return intent;
+        }
+    }
+
+    public class SearchBarWatcher implements TextWatcher {
+
+        Context mCtx;
+        EditText textView;
+
+        public SearchBarWatcher(Context ctx,EditText textView) {
+            this.mCtx = ctx;
+            this.textView = textView;
+
+
+        }
+
+        String origin_text;
+        String string;
+        int start_position;
+        int change_length; // 修改原文长度
+        int new_string_length;
+
+
+        /**
+         * s        改变前的内容
+         * start    增加内容前光标位置，删除内容后光标位置 （起始位置）
+         * count    选中s中的内容长度（发生改变的原内容长度），未选中为0
+         * after    新添加的内容长度，删除为0
+         * */
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+//            Log.d("TextChange", "before Text Changed: " + s + " Start: " + start + " Count: " + count + " After: " + after);
+
+            origin_text = s.toString();
+            start_position = start;
+            change_length = count;
+            new_string_length = after;
+        }
+
+        /**
+         * s        改变后的内容
+         * start    增加内容前光标位置，删除内容后光标位置 （起始位置）
+         * before   选中s中的内容长度（发生改变的原内容长度），未选中为0
+         * count    增加内容长度，删除内容为0
+         * */
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+//            Log.d("TextChange", "on Text Changed: " + s + " Start: " + start + " Before: " + before + " Count: " + count);
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+
+            /**
+             * 文本处理
+             * */
+            if (new_string_length == 0) {
+                string = "";
+            } else {
+                string = s.toString().substring(start_position,start_position + new_string_length);
+            }
+
+            if (change_length == 0) { // 新加内容
+
+            } else { // 替换原文或删除原文
+
+            }
+
+            /**
+             * 业务逻辑
+             * */
+
+            if (string.equals("\n") || string.equals("\r") || string.equals("\r\n")) {
+                textView.setText(origin_text);
+                return;
+            }
+
+            mKeywords = s.toString();
+            adapter.notifyDataSetChanged();
+
+        }
+    }
+
+
+    private int maxSelect;
+    private int mGroup;
+    private int mChild;
+    private boolean mSingleSelect;
+    private String mTitle;
+    private boolean mAuto_close;
+    private JSONObject mCadedate;
+    private boolean mDirty;
+
+    private String mKeywords;
+    private int filter_count;
+
+    private ListView enum_list_view;
+    private EnumAdapter adapter;
+    private Context mCtx;
+
+    private EditText searchBar;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_enum_slect);
+
+        init();
+
+        setTitle(mTitle);
+
+        searchBar = (EditText)findViewById(R.id.common_editor_enum_search_bar);
+        searchBar.addTextChangedListener(new SearchBarWatcher(mCtx,searchBar));
+
+        enum_list_view = (ListView)findViewById(R.id.enum_list_view);
+
+        adapter = new EnumAdapter(mCtx);
+        enum_list_view.setAdapter(adapter);
+
+        enum_list_view.setOnItemClickListener(new CellClickListener(mCtx));
+
+
+    }
+
+    @Override
+    public void finish() {
+
+        if (mDirty != false) {
+            Intent intent = new Intent();
+            intent.putExtra(CADEDATE,mCadedate.toString());
+            intent.putExtra(GROUP_POSITION,mGroup);
+            intent.putExtra(CHILD_POSITION,mChild);
+
+            setResult(RESULT_OK,intent);
+        }
+
+
+        super.finish();
+    }
+
+    private void init() {
+        mCtx = this;
+        Intent intent = getIntent();
+        String cadedate_str = intent.getStringExtra(CADEDATE);
+        try {
+            mCadedate = new JSONObject(cadedate_str);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        mSingleSelect = intent.getBooleanExtra(SINGLE_SELECT,true);
+        mGroup = intent.getIntExtra(GROUP_POSITION,0);
+        mChild = intent.getIntExtra(CHILD_POSITION,0);
+        mTitle = intent.getStringExtra(TITLE);
+        maxSelect = intent.getIntExtra(MAX_SELECT,0);
+        mAuto_close = intent.getBooleanExtra(AUTO_CLOSE,true);
+
+
+    }
+
+    private class CellClickListener implements AdapterView.OnItemClickListener {
+
+        private Context ctx;
+        public CellClickListener(Context ctx) {
+            this.ctx = ctx;
+        }
+
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+
+            mDirty = true;
+
+            try {
+                if (mSingleSelect) {
+
+                    boolean is_worked = false;
+
+                    if (mKeywords == null || mKeywords.isEmpty()) {
+
+                        for (int i = 0; i < mCadedate.optInt("count"); i++) {
+                            JSONObject val_json = mCadedate.optJSONObject("val_" + i);
+
+                            if (i == position) {
+                                int select = val_json.optInt("check");
+                                if (select == 0) {
+                                    val_json.put("check","1");
+                                } else {
+                                    val_json.put("check","0");
+                                }
+                                is_worked = select == 0;
+                            } else {
+                                val_json.put("check","0");
+                            }
+                            mCadedate.put("val_" + i,val_json);
+
+
+
+                        } // for
+
+                    } // keywords null
+                    else {
+
+
+                        JSONObject val_json = null;
+                        int count = 0;
+                        boolean getIt = false;
+                        for (int cc = 0; cc < mCadedate.optInt("count"); cc++) {
+
+                            JSONObject search_json = mCadedate.optJSONObject("val_" + cc);
+                            String value = search_json.optString("value");
+                            boolean contain = value.toUpperCase().contains(mKeywords.toUpperCase());
+                            if (contain && count < filter_count) {
+                                count++;
+                            }
+
+                            val_json = search_json;
+                            if (!getIt && count - 1 == position) {
+                                getIt = true;
+                                //==========
+                                int select = val_json.optInt("check");
+                                if (select != 0) {
+                                    val_json.put("check","0");
+                                } else {
+                                    val_json.put("check","1");
+                                }
+                                is_worked = select == 0;
+
+                            } else  {
+                                val_json.put("check","0");
+                            }
+
+                            mCadedate.put("val_" + cc,val_json);
+
+
+                        } // for cc
+
+//                        for (int sc = 0; sc < mCadedate.optInt("count"); sc++) {
+//
+//                            JSONObject sc_json = mCadedate.optJSONObject("val_" + sc);
+//
+//                            if (sc_json.optString("value").equals(val_json.optString("value"))) {
+//                                sc_json.put("check","1");
+//                            } else {
+//                                sc_json.put("check","0");
+//                            }
+//                            mCadedate.put("val_" + sc,sc_json);
+//
+//                        } // for sc
+
+
+                    }
+
+                    if (is_worked) {
+                        if (mAuto_close) {
+                            finish();
+                        } else {
+                            adapter.notifyDataSetChanged();
+                        }
+                    } else {
+                        adapter.notifyDataSetChanged();
+                    }
+
+
+                } // single select
+                else {
+
+                    int index = position;
+                    JSONObject val_json = null;
+                    if (mKeywords == null || mKeywords.isEmpty()) {
+                        val_json = mCadedate.optJSONObject("val_" + position);
+                    } else {
+                        int count = 0;
+                        for (int i = 0; i < mCadedate.optInt("count"); i++) {
+                            if (count >= filter_count) {
+                                break;
+                            }
+                            JSONObject search_json = mCadedate.optJSONObject("val_" + i);
+                            String value = search_json.optString("value");
+                            boolean contain = value.toUpperCase().contains(mKeywords.toUpperCase());
+                            if (contain) {
+                                count++;
+                            }
+
+                            if (count - 1 == position) {
+                                val_json = search_json;
+                                index = i;
+                                break;
+                            }
+                        }
+                    }
+
+                    int check = val_json.optInt("check");
+                    if (check == 1) {
+                        val_json.put("check","0");
+                    } else {
+                        if (check_count() >= maxSelect && maxSelect > 0) {
+                            new AlertDialog.Builder(this.ctx)
+                                    .setTitle("Max count reached")
+                                    .setMessage(maxSelect + " items at most for this field.")
+                                    .setPositiveButton("OK",null)
+                                    .show();
+                            return;
+
+                        }
+                        val_json.put("check","1");
+                    }
+                    mCadedate.put("val_" + index,val_json);
+
+                }
+                adapter.notifyDataSetChanged();
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+
+    public int check_count() {
+
+        int check_count = 0;
+        for (int i = 0; i < mCadedate.optInt("count"); i++) {
+            JSONObject val_json = mCadedate.optJSONObject("val_" + i);
+            int check = val_json.optInt("check");
+            if (check == 1) {
+                check_count++;
+            }
+        }
+        return check_count;
+    }
+
+
+    private class EnumAdapter extends BaseAdapter {
+
+        public class Holder {
+            public TextView value_tv;
+            public ImageView check_iv;
+
+            public Holder(View cell) {
+                if (cell == null) {
+                    return;
+                }
+                value_tv = (TextView)cell.findViewById(R.id.enum_value_tv);
+                check_iv = (ImageView)cell.findViewById(R.id.enum_check_iv);
+                check_iv.setClickable(false);
+                check_iv.setFocusable(false);
+                cell.setTag(this);
+
+            }
+        }
+
+
+        private Context ctx;
+        public EnumAdapter(Context context) {
+            this.ctx = context;
+        }
+
+        @Override
+        public int getCount() {
+
+            if (mCadedate == null) {
+                return 0;
+            }
+
+            if (mKeywords == null || mKeywords.isEmpty()) {
+                filter_count = 0;
+                return mCadedate.optInt("count");
+            }
+
+            int count = 0;
+            for (int i = 0; i < mCadedate.optInt("count"); i++) {
+                JSONObject val_json = mCadedate.optJSONObject("val_" + i);
+                String value = val_json.optString("value");
+                boolean contain = value.toUpperCase().contains(mKeywords.toUpperCase());
+                if (contain) {
+                    count++;
+                }
+            }
+            filter_count = count;
+            return count;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            JSONObject val_json = null;
+            if (mKeywords == null || mKeywords.isEmpty()) {
+                val_json = mCadedate.optJSONObject("val_" + position);
+            } else {
+                int count = 0;
+                for (int i = 0; i < mCadedate.optInt("count"); i++) {
+                    if (count >= filter_count) {
+                        break;
+                    }
+                    JSONObject search_json = mCadedate.optJSONObject("val_" + i);
+                    String value = search_json.optString("value");
+                    boolean contain = value.toUpperCase().contains(mKeywords.toUpperCase());
+                    if (contain) {
+                        count++;
+                    } else {
+                        continue;
+                    }
+
+                    if (count - 1 == position) {
+                        val_json = search_json;
+                        break;
+                    }
+
+                }
+            }
+            return val_json;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            JSONObject val_json = (JSONObject) getItem(position);
+//            if (mKeywords == null || mKeywords.isEmpty()) {
+//                val_json = mCadedate.optJSONObject("val_" + position);
+//            } else {
+//                val_json = (JSONObject) getItem(position);
+//            }
+
+            Holder holder;
+            if (convertView == null) {
+
+                convertView = LayoutInflater.from(this.ctx).inflate(R.layout.enum_select_cell,null);
+                holder = new Holder(convertView);
+
+            } else {
+                holder = (Holder) convertView.getTag();
+            }
+
+            String value = val_json.optString("value");
+            holder.value_tv.setText(value);
+
+            int check = val_json.optInt("check");
+            if (check == 1) {
+                holder.check_iv.setVisibility(View.VISIBLE);
+            } else {
+                holder.check_iv.setVisibility(View.INVISIBLE);
+            }
+
+            return convertView;
+        }
+    }
+}

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

@@ -972,6 +972,25 @@ public class Network {
     }
 
 
+    public static JSONObject GetCadedate(String request_url,Bundle params)
+    {
+        if (request_url == null || request_url.isEmpty() || params == null) {
+            return null;
+        }
+
+        String json_string = getJson(request_url,params,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 request_editor(String request_url,Bundle params) {
 
         if (request_url == null || request_url.isEmpty() || params == null) {