Add description display for common editor switch cell -- common editor switch cell 增加 description 显示(resolve: #14682)

ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditor/CommonEditorSwitchCellHolder.java

@@ -19,10 +19,13 @@ public class CommonEditorSwitchCellHolder extends CommonEditorCellHolder {
     public TextView title_lb;
     public Switch aSwitch;
 
+    public TextView desc_lb;
     public CommonEditorSwitchCellHolder(Context context, View view) {
         super(context, view);
         title_lb = (TextView) view.findViewById(R.id.switch_title_lb);
         aSwitch = (Switch) view.findViewById(R.id.switch_cell_switch);
+        desc_lb = (TextView) view.findViewById(R.id.switch_desc_lb);
+
     }
 
     @Override

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

@@ -3373,20 +3373,24 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
     public void setUpSwitchCellHolder(CommonEditorSwitchCellHolder holder, View cell, JSONObject item_json, boolean readonly, int group, int child) {
 
         String title = null;
+        String desc = null;
         String value = null;
         String required = null;
 
         holder.group = group;
         holder.child = child;
         holder.title_lb.setText(null);
+        holder.desc_lb.setText(null);
         holder.aSwitch.setTag(group + "_" + child + "_" + "switch");
         try {
 
             title = item_json.optString("aname");
+            desc = item_json.optString("desc");
             value = item_json.optString("value");
             required = item_json.optString("required");
 
             holder.title_lb.setText(title);
+            holder.desc_lb.setText(desc);
 
             if (required.equals("true")) {
                 holder.startMark.setVisibility(View.VISIBLE);

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_switch_cell_small.xml

@@ -59,6 +59,19 @@
                 android:layout_marginTop="10dp"
                 />
 
+            <TextView
+                android:id="@+id/switch_desc_lb"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="5dp"
+                android:layout_marginLeft="5dp"
+                android:layout_marginEnd="15dp"
+                android:layout_toStartOf="@+id/switch_cell_switch"
+                android:text=""
+                android:textSize="15sp" />
+
         </RelativeLayout>
 
     </LinearLayout>

ApexDrivers/ratradefiling/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.usai.ratradefiling"
         minSdkVersion 26
         targetSdkVersion 29
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.11"
 //        ndk.abiFilters 'armeabi-v7a',"arm64-v8a"
 
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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);

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/dataprovider/OnlineDataProvider.java

@@ -52,7 +52,7 @@ import com.usai.ratradefiling.dataprovider.RADataProvider;
 
 public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 {
-	public static final String SHORT_VER ="1.1";
+	public static final String SHORT_VER ="1.11";
 
 	public static final int		BEHAVIOR_SEARCH					= 0;
 	public static final int		BEHAVIOR_RESULT					= 1;
@@ -83,10 +83,10 @@ public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 
 
 	//DEBUG
-	public static String		BASE_URL						= "http://192.168.0.161/ACE_ISF_NEW";
+//	public static String		BASE_URL						= "http://192.168.0.161/ACE_ISF_NEW";
 
 	//RELEASE
-//	public static String		BASE_URL						= "https://ra.united-us.net/doc/bk";
+	public static String		BASE_URL						= "https://ra.united-us.net/doc/bk";
 
 
 //	URL

ApexDrivers/ratradefiling/src/main/res/layout/fragment_about.xml

@@ -68,7 +68,7 @@
             android:layout_marginBottom="30dp"
             android:autoLink="all"
             android:text="United Software Applications, Inc. \n7411 CENTRAL AVE, NEWARK, CA 94560 \nTEL : USA (1)510 574 8180 \n         China (86)028 81132160 \nEmail :RedAntSupport@united-us.net"
-            app:layout_constraintBottom_toTopOf="@+id/textView3"
+            app:layout_constraintBottom_toTopOf="@+id/switch_desc_lb"
             app:layout_constraintEnd_toEndOf="@+id/tv_about"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/tv_about" />
@@ -90,7 +90,7 @@
              />
 
         <TextView
-            android:id="@+id/textView3"
+            android:id="@+id/switch_desc_lb"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"