Ver Fonte

Home dashboard more button is not displayed -- 首页 dashboard more 按钮没有显示 (issue60: #14497)
The release version of the registration agreement and about the text do not display -- release 版注册协议和 about 内文字不显示(resolve: #14496)

Ray Zhang há 4 anos atrás
pai
commit
a3934727fd

+ 2 - 1
ApexDrivers/ratradefiling/build.gradle

@@ -36,8 +36,9 @@ android {
             minifyEnabled true
             zipAlignEnabled true
             shrinkResources true
-
+//
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-project.txt'
+
         }
     }
 }

+ 33 - 1
ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/HomeFragment.java

@@ -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.HomeDashISFModelP;
 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.utils.Network;
 
@@ -731,6 +732,7 @@ public class HomeFragment extends Fragment
                         JSONObject section = sectionArr.getJSONObject(i);
                         HomeSectionModel model = new HomeSectionModel(mCtx);
                         model.section = i;
+                        model.more = section.optJSONObject("more");
                         model.row_actions = section.optJSONArray("row_actions");
                         model.actions = section.optJSONArray("actions");
                         model.type = section.optInt("type");
@@ -1195,6 +1197,35 @@ public class HomeFragment extends Fragment
             {
                 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);
 //
 //                startActivityForResult(intent, REQUEST_MORE_CODE);
@@ -1520,6 +1551,7 @@ public class HomeFragment extends Fragment
         int section;
         long totalCount;
         int backendFlagCount;
+        JSONObject more;
         JSONArray row_actions;
         JSONArray actions;
         SectionModelListener listener;
@@ -1566,7 +1598,7 @@ public class HomeFragment extends Fragment
 
         boolean hasMore()
         {
-            return totalCount > orderCount();
+            return totalCount > 0;
         }
 
         void setOrders(JSONArray orders)

+ 6 - 7
ApexDrivers/ratradefiling/src/main/res/layout/detail_cell_container.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,8 +11,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="13dp"
-        android:text="service"
         android:gravity="right"
+        android:text="service"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/tv_container_no"
         app:layout_constraintTop_toTopOf="@+id/tv_container_no" />
@@ -92,20 +91,20 @@
 
                 <TextView
                     android:id="@+id/tv_weight"
-                    android:ellipsize="end"
-                    android:singleLine="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:singleLine="true"
                     android:text="Weight" />
 
                 <TextView
                     android:id="@+id/tv_seal_no"
-                    android:ellipsize="end"
-                    android:singleLine="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:singleLine="true"
                     android:text="Seal No" />
             </LinearLayout>
         </LinearLayout>

+ 4 - 0
ApexDrivers/ratradefiling/src/main/res/raw/keep.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@raw/about_en,@raw/terms_en,@raw/my.json"
+    />