Sfoglia il codice sorgente

The additional field of result is not displayed -- result的附加字段没有显示(resolve: #14386)
After successfully changing the password, it will automatically exit the program -- 修改密码成功后,会自动退出程序(resolve: #14383)

Ray Zhang 4 anni fa
parent
commit
fbb0505caa

+ 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 = true;
+    public static final boolean FAKE_DATA = false;
 
     public static final int MY_PERMISSIONS_REQUEST = 1;
     private static final AtomicInteger sNextGeneratedId = new AtomicInteger(1);

+ 7 - 2
ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/dataprovider/RADataProvider.java

@@ -266,9 +266,14 @@ public class RADataProvider {
             return OnlineDataProvider.request_download(params,download_url,dir);
         }
     }
-    public static String getDisplayFieldsForFunction(String module_name)
+    public static String getAddationalFieldsForFunction(String module_name)
     {
-        return null;
+        JSONObject json=RADataProvider.updateFieldsjson("result",module_name);
+        JSONArray arr = json.optJSONArray("show");
+        if(arr!=null)
+            return arr.toString();
+        else
+            return "";
     }
     public static JSONObject TabDetail(Bundle params)
     {

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

@@ -307,7 +307,7 @@ public class ChangePasswordActivity extends AppCompatActivity {
 						dialog.dismiss();
 						TradeFilingApplication.put_password(m_snewPassword);
 //						ApexTrackingApplication.put_password(m_snewPassword);
-						setResult(Activity.RESULT_OK, null);
+//						setResult(Activity.RESULT_OK, null);
 						finish();
 					}
 				});

+ 2 - 2
ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/my/MyFragment.java

@@ -59,8 +59,8 @@ public class MyFragment extends StaticModelistFragment
 //					Intent i = new Intent();
 //					i.setClass(getActivity(), ApexActivity.class);
 //					startActivityForResult(i, REQUEST_LOGINACTIVITY);
-                    getActivity().setResult(PASSWORD_CHANGED, null);
-                    getActivity().finish();
+//                    getActivity().setResult(PASSWORD_CHANGED, null);
+//                    getActivity().finish();
                 }
                 break;
             default:

+ 5 - 4
ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/ResultPresenter.java

@@ -347,6 +347,7 @@ public class ResultPresenter implements ResultAdapter.ApexResultAdapterDataSourc
                 Bundle params = (Bundle) mParams.clone();
                 params.putInt("offset", offset);
                 params.putInt("limit", detal);
+
                 params.putString("columns", mFields);
                 JSONObject json = RADataProvider.Search(params);
 
@@ -442,8 +443,8 @@ public class ResultPresenter implements ResultAdapter.ApexResultAdapterDataSourc
 
         if (dirty) {
             dirty = false;
-            String module_name = mParams.getString("module_name");
-            String fields = RADataProvider.getDisplayFieldsForFunction(module_name);
+            String sub_type = mParams.getString("sub_type");
+            String fields = RADataProvider.getAddationalFieldsForFunction(sub_type);
             mFields = fields;
         }
 
@@ -484,9 +485,9 @@ public class ResultPresenter implements ResultAdapter.ApexResultAdapterDataSourc
 
 //        final String paramStr = json.toString();
 
-        final String module_name = mParams.getString("sub_type");
+        final String sub_type = mParams.getString("sub_type");
 
-        boolean bsuccessful=RADataProvider.saveSearchParametersForModuleWithName(intentStr, json, module_name, name);
+        boolean bsuccessful=RADataProvider.saveSearchParametersForModuleWithName(intentStr, json, sub_type, name);
 
         getDelegate().onStopLoading();