|
@@ -54,6 +54,7 @@ import com.usai.ratradefiling.home.dashmodel.pending.HomeDashACEM1ModelP;
|
|
|
import com.usai.ratradefiling.home.dashmodel.pending.HomeDashACIModelP;
|
|
import com.usai.ratradefiling.home.dashmodel.pending.HomeDashACIModelP;
|
|
|
import com.usai.ratradefiling.home.dashmodel.pending.HomeDashISFModelP;
|
|
import com.usai.ratradefiling.home.dashmodel.pending.HomeDashISFModelP;
|
|
|
import com.usai.ratradefiling.home.dashmodel.pending.HomeDasheManifestModelP;
|
|
import com.usai.ratradefiling.home.dashmodel.pending.HomeDasheManifestModelP;
|
|
|
|
|
+import com.usai.ratradefiling.result.ResultActivity;
|
|
|
import com.usai.redant.rautils.actionsheet.ActionSheet;
|
|
import com.usai.redant.rautils.actionsheet.ActionSheet;
|
|
|
import com.usai.redant.rautils.utils.Network;
|
|
import com.usai.redant.rautils.utils.Network;
|
|
|
|
|
|
|
@@ -731,6 +732,7 @@ public class HomeFragment extends Fragment
|
|
|
JSONObject section = sectionArr.getJSONObject(i);
|
|
JSONObject section = sectionArr.getJSONObject(i);
|
|
|
HomeSectionModel model = new HomeSectionModel(mCtx);
|
|
HomeSectionModel model = new HomeSectionModel(mCtx);
|
|
|
model.section = i;
|
|
model.section = i;
|
|
|
|
|
+ model.more = section.optJSONObject("more");
|
|
|
model.row_actions = section.optJSONArray("row_actions");
|
|
model.row_actions = section.optJSONArray("row_actions");
|
|
|
model.actions = section.optJSONArray("actions");
|
|
model.actions = section.optJSONArray("actions");
|
|
|
model.type = section.optInt("type");
|
|
model.type = section.optInt("type");
|
|
@@ -1195,6 +1197,35 @@ public class HomeFragment extends Fragment
|
|
|
{
|
|
{
|
|
|
HomeSectionModel sectionModel = weakSectionModel.get();
|
|
HomeSectionModel sectionModel = weakSectionModel.get();
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if(sectionModel.more==null)
|
|
|
|
|
+ return;
|
|
|
|
|
+// JSONObject item =(JSONObject) function_panel.getItemAtPosition(position);
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ Bundle parms = new Bundle();
|
|
|
|
|
+
|
|
|
|
|
+ JSONObject obj =sectionModel.more.optJSONObject("params");
|
|
|
|
|
+ if(obj!=null)
|
|
|
|
|
+ {
|
|
|
|
|
+ Iterator<?> it = obj.keys();
|
|
|
|
|
+ while (it.hasNext())
|
|
|
|
|
+ {
|
|
|
|
|
+
|
|
|
|
|
+ String key = (String) it.next();
|
|
|
|
|
+ parms.putString(key, obj.optString(key));
|
|
|
|
|
+
|
|
|
|
|
+// obj.put(key, searchParms.get(key).toString());
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+// parms.putString("sub_type",item.optString("sub_type",""));
|
|
|
|
|
+ ResultActivity.startResultActivity(mCtx, parms);
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
// Intent intent = HomeMoreActivity.build(mCtx, sectionModel.type, sectionModel.title);
|
|
// Intent intent = HomeMoreActivity.build(mCtx, sectionModel.type, sectionModel.title);
|
|
|
//
|
|
//
|
|
|
// startActivityForResult(intent, REQUEST_MORE_CODE);
|
|
// startActivityForResult(intent, REQUEST_MORE_CODE);
|
|
@@ -1520,6 +1551,7 @@ public class HomeFragment extends Fragment
|
|
|
int section;
|
|
int section;
|
|
|
long totalCount;
|
|
long totalCount;
|
|
|
int backendFlagCount;
|
|
int backendFlagCount;
|
|
|
|
|
+ JSONObject more;
|
|
|
JSONArray row_actions;
|
|
JSONArray row_actions;
|
|
|
JSONArray actions;
|
|
JSONArray actions;
|
|
|
SectionModelListener listener;
|
|
SectionModelListener listener;
|
|
@@ -1566,7 +1598,7 @@ public class HomeFragment extends Fragment
|
|
|
|
|
|
|
|
boolean hasMore()
|
|
boolean hasMore()
|
|
|
{
|
|
{
|
|
|
- return totalCount > orderCount();
|
|
|
|
|
|
|
+ return totalCount > 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void setOrders(JSONArray orders)
|
|
void setOrders(JSONArray orders)
|