The search fields setting interface display issue -- search fields 设置界面显示错误(resolve: #14451)

Additional fields of query results increase the number limit -- 查询结果的Addational fields 增加数量限制(resolve: #14450)
Optimize UI layout and display -- 优化界面布局和显示(issue60: #14439)
result After the custom field is not saved, it will be refreshed when returned -- result 自定义字段后，没有保存，返回也会刷新(issue20: #14446)

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/detail/DetailFragment.java

@@ -1049,14 +1049,14 @@ public class DetailFragment extends Fragment implements OnClickListener /*
 						if(bgcolor)
 						{
 							tvitem.setBackgroundResource(R.color.TFCache);
-							tvitem.setTextColor(getResources().getColor(
-									R.color.white));
+//							tvitem.setTextColor(getResources().getColor(
+//									R.color.white));
 						}
 						else
 						{
 							tvitem.setBackgroundResource(R.color.white);
-							tvitem.setTextColor(getResources().getColor(
-									R.color.TFTextBlack));
+//							tvitem.setTextColor(getResources().getColor(
+//									R.color.TFTextBlack));
 						}
 						tvitem.setText(val);
 						// tvitem.setBackgroundResource(R.drawable.detail_item);

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/fields/CustomizeFieldsActivity.java

@@ -72,23 +72,46 @@ public class CustomizeFieldsActivity extends Activity implements
 	public boolean dragListViewCanMoveItem(DragListView dragListView, int from, int to) {
 
 		int hidePosition = adapter.getPosition(mHideField);
-		// hide -> display && displayCount >= maxDisplayCount
-		if (from > hidePosition && to < hidePosition && hidePosition > maxDisplayCount) {
+		if(forNewResult)
+		{
+			if (from > hidePosition && to <= hidePosition && hidePosition > maxDisplayCount) {
+
+				new AlertDialog.Builder(this)
+						.setTitle("Warning")
+						.setMessage("the maximums count of display items is " + maxDisplayCount)
+						.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
+
+							}
+						})
+						.show();
+
+				return false;
+			}
+		}
+		else
+		{
+			if (from < hidePosition && to >= hidePosition && hidePosition <3) {
 
-			new AlertDialog.Builder(this)
-					.setTitle("Warning")
-					.setMessage("the maximums count of display items is " + maxDisplayCount)
-					.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-						@Override
-						public void onClick(DialogInterface dialog, int which) {
+				new AlertDialog.Builder(this)
+						.setTitle("Warning")
+						.setMessage("You must set at least 1 field visiable! ")
+						.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
 
-						}
-					})
-					.show();
+							}
+						})
+						.show();
 
-			return false;
+				return false;
+			}
 		}
 
+		// hide -> display && displayCount >= maxDisplayCount
+
+
 		return true;
 	}
 
@@ -131,10 +154,10 @@ public class CustomizeFieldsActivity extends Activity implements
 
 		DragListView dragListView = (DragListView) findViewById(R.id.drag_list);
 
-		if (forNewResult) {
+//		if (forNewResult) {
 
 			dragListView.setDelegate(this);
-		}
+//		}
 
 		adapter = new DragListAdapter(this, list);
 		dragListView.setAdapter(adapter);
@@ -230,18 +253,20 @@ public class CustomizeFieldsActivity extends Activity implements
 		// {
 		// navList.add("Aѡ��" + i);
 		// }
-//		if (forNewResult) {
-//			mDisplayField = new fieldedit("Additional Fields To Display", -1);
-//		} else {
-//			mDisplayField = new fieldedit(getString(R.string.str_displayitem), -1);
-//		}
+		if (forNewResult) {
+			mDisplayField=	new JSONObject("{\"name\":\""+getString(R.string.str_display_addational)+"\",\"id\":-1}");
+			mHideField = new JSONObject("{\"name\":\""+getString(R.string.str_hide_addational)+"\",\"id\":-2}");
+		} else {
+			mDisplayField=	new JSONObject("{\"name\":\""+getString(R.string.str_displayitem)+"\",\"id\":-1}");
+			mHideField = new JSONObject("{\"name\":\""+getString(R.string.str_hideitem)+"\",\"id\":-2}");
+		}
+
 
 
 
-			mDisplayField=	new JSONObject("{\"name\":\"Additional Fields To Display\",\"id\":-1}");
 			list.add(mDisplayField);
 			list.addAll(showList);
-			mHideField = new JSONObject("{\"name\":\"Additional Fields\",\"id\":-2}");
+
 			list.add(mHideField);
 			list.addAll(hideList);
 		} catch (Exception e)

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/fields/DragListView.java

@@ -146,13 +146,47 @@ public class DragListView extends ListView
 				lastClickTime = 0;
 				if (pos < adapter.switchpos())
 				{
-					adapter.remove(dclickitem);
-					adapter.insert(dclickitem, adapter.getCount());
+
+					DragListViewDelegate delegate = getDelegate();
+					if (delegate != null) {
+
+						int from = adapter.getPosition(dclickitem);
+						int to = adapter.getCount();
+						if (delegate.dragListViewCanMoveItem(DragListView.this, from, to)) {
+							adapter.remove(dclickitem);
+							adapter.insert(dclickitem, adapter.getCount());
+						}
+
+					}
+					else
+					{
+						adapter.remove(dclickitem);
+						adapter.insert(dclickitem, adapter.getCount());
+					}
+
+
 				}
 				else
 				{
-					adapter.remove(dclickitem);
-					adapter.insert(dclickitem, 1);
+					DragListViewDelegate delegate = getDelegate();
+					if (delegate != null) {
+
+						int from = adapter.getPosition(dclickitem);
+						int to = 1;
+						if (delegate.dragListViewCanMoveItem(DragListView.this, from, to)) {
+							adapter.remove(dclickitem);
+							adapter.insert(dclickitem, 1);
+						}
+
+					}
+					else
+					{
+						adapter.remove(dclickitem);
+						adapter.insert(dclickitem, 1);
+					}
+
+
+
 
 				}
 				// Intent intent = new Intent();

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/cell/ResulteManifestCell.java

@@ -164,7 +164,7 @@ public class ResulteManifestCell extends LinearLayout {
         if(isClose)
             statusIv.setBackgroundColor(getResources().getColor(R.color.white));
         else
-            statusIv.setBackgroundColor(getResources().getColor(R.color.icon_red));
+            statusIv.setBackgroundColor(getResources().getColor(R.color.TFWarring));
 //        primaryCCNTv.setText(primary_ccn);
 //        primaryCCNTv.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/res/values-zh/strings.xml

@@ -48,7 +48,8 @@
     <string name="str_displayitem">Display items</string>
     <string name="str_hideitem">Hide items</string>
     <string name="action_custom_fields">Customize Fields</string>
-
+    <string name="str_display_addational">"Additional Fields To Display"</string>
+    <string name="str_hide_addational">Additional Fields</string>
     <!--Save-->
     <string name="str_createname">Create a tag to save</string>
     <string name="str_deletemessage">Click delete button to begin delete</string>

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

@@ -37,7 +37,7 @@
     <color name="TFTextRed">#ff0000</color>
     <color name="TFTextBlack">#000000</color>
     <color name="TFGreen">#299D4D</color>
-
+    <color name="TFWarring">#E7A0A0</color>
 
 
 </resources>

ApexDrivers/ratradefiling/src/main/res/values/strings.xml

@@ -49,6 +49,11 @@
     <string name="str_to">to</string>
     <string name="str_displayitem">Display items</string>
     <string name="str_hideitem">Hide items</string>
+
+    <string name="str_display_addational">"Additional Fields To Display"</string>
+    <string name="str_hide_addational">Additional Fields</string>
+
+
     <string name="action_custom_fields">Customize Fields</string>
 
     <!--Save-->