Jelajahi Sumber

Apex Mobile
Saved search / detail 左划闪退

Ray Zhang 8 tahun lalu
induk
melakukan
a61fa9491d

+ 57 - 11
Apex Mobile/app/src/main/java/com/usai/apex/DetailFragment.java

@@ -1,30 +1,22 @@
 package com.usai.apex;
 
-import java.io.File;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-import com.usai.util.Network;
-import com.usai.util.commonUtil;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
 import android.app.Dialog;
 import android.app.DownloadManager;
-import android.app.AlertDialog.Builder;
 import android.app.DownloadManager.Request;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
+import android.support.constraint.ConstraintLayout;
 import android.support.v4.app.Fragment;
 import android.text.Html;
 import android.util.Log;
@@ -38,12 +30,19 @@ import android.webkit.DownloadListener;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.usai.util.Network;
+import com.usai.util.commonUtil;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public class DetailFragment extends Fragment implements OnClickListener /*
 																		 * ,
 																		 * OnGestureListener
@@ -445,6 +444,53 @@ public class DetailFragment extends Fragment implements OnClickListener /*
 					ll_root.addView(wv);
 					Log.d("table content", content);
 
+				}
+				if (grouptype.equals("tracking"))
+				{
+					LinearLayout listview = (LinearLayout) inflater.inflate(
+							R.layout.list_content, null);
+
+					listview.setId(commonUtil.generateViewId());
+
+
+					ViewGroup.LayoutParams lp=listview.getLayoutParams();
+					control.put(v.getId(), listview.getId());
+					ll_root.addView(listview);
+					long list_count = groupobj.getInt("count");
+					for (int j = 0; j < list_count; j++)
+					{
+						JSONObject itemobj = groupobj.getJSONObject("item" + j);
+
+						ConstraintLayout listitem = (ConstraintLayout) inflater
+								.inflate(R.layout.detail_tracking_cell, null);
+
+						ViewGroup.LayoutParams lp1=listitem.getLayoutParams();
+						ImageView icon = (ImageView)  listitem
+								.findViewById(R.id.iv_icon);
+
+						String iconname = itemobj.getString("icon");
+						int rid = commonUtil.iconName2Rid(getActivity(),iconname);
+						icon.setImageResource(rid);
+						if(j!=0)
+						{
+							icon.setColorFilter(Color.GRAY);
+//							ColorMatrix matrix = new ColorMatrix();
+//							matrix.setSaturation(0);
+//							ColorMatrixColorFilter filter = new ColorMatrixColorFilter(matrix);
+//							icon..image.setColorFilter(filter);
+						}
+
+						TextView tvitem = (TextView) listitem
+								.findViewById(R.id.tv_msg);
+						String val = itemobj.getString("msg");
+						tvitem.setText(val);
+
+						// tvitem.setBackgroundResource(R.drawable.detail_item);
+					//	listitem.removeView(tvitem);
+
+						listview.addView(listitem);
+					}
+
 				}
 				if (grouptype.equals("list"))
 				{

+ 1 - 4
Apex Mobile/app/src/main/java/com/usai/apex/LocationDetailActivity.java

@@ -7,18 +7,15 @@ import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 //import android.provider.Contacts;
 import android.app.Activity;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.util.Log;
-import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -72,7 +69,7 @@ public class LocationDetailActivity extends Activity
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_location_detail);
 		detail = (LocationDetail) getIntent().getSerializableExtra("detail");
-		TextView tv_name = (TextView) findViewById(R.id.tv_name);
+		TextView tv_name = (TextView) findViewById(R.id.tv_msg);
 		tv_name.setText(detail.Name);
 		// tv_name.setMovementMethod(LinkMovementMethod.getInstance());
 		TextView tv_addr = (TextView) findViewById(R.id.tv_addr);

+ 1 - 1
Apex Mobile/app/src/main/java/com/usai/apex/mainframe/StaticModelistFragment.java

@@ -75,7 +75,7 @@ public class StaticModelistFragment extends ListFragment {
         JSONObject jsonobj=loadjson(rawid);
         adapter        = new SimpleAdapter(this.getActivity(),
                 getData(jsonobj), R.layout.static_modelist_cell, new String[] { "title",
-                "img","detail" }, new int[] { R.id.tv_name, R.id.iv_icon,R.id.tv_detail });
+                "img","detail" }, new int[] { R.id.tv_msg, R.id.iv_icon,R.id.tv_detail });
 
         View headerView = initHeaderView();
         if(headerView!=null) {

+ 1 - 1
Apex Mobile/app/src/main/java/com/usai/apex/saved/SavedDetailFragment.java

@@ -120,7 +120,7 @@ public class SavedDetailFragment extends ListFragment implements OnTouchListener
 			convertView = mInflater.inflate(R.layout.saved_cell, null);// 根据布局文件实例化view
 
 			TextView message = (TextView) convertView
-					.findViewById(R.id.tv_name);// 找某个控件
+					.findViewById(R.id.tv_msg);// 找某个控件
 
 			message.setText(searchresult.getData().get(position).get("name")
 					.toString());// 给该控件设置数据(数据从集合类中来)

+ 2 - 2
Apex Mobile/app/src/main/java/com/usai/apex/saved/SavedDocumentsFragment.java

@@ -256,8 +256,8 @@ public class SavedDocumentsFragment extends ListFragment/* implements View.OnTou
 
 
         SimpleAdapter adapter = new DocumentsAdapter(getActivity(),
-                getData(), R.layout.saved_cell, new String[] { "title",
-                "img","lastmodify" }, new int[] { R.id.tv_name, R.id.iv_icon,R.id.tv_detail });
+                getData(), R.layout.saved_doc, new String[] { "title",
+                "img","lastmodify" }, new int[] { R.id.tv_msg, R.id.iv_icon,R.id.tv_detail });
         setListAdapter(adapter);
         getListView().setBackgroundColor(Color.WHITE);
         // this.getListView().setBackgroundColor(Color.WHITE);

+ 1 - 1
Apex Mobile/app/src/main/java/com/usai/apex/saved/SavedSearchFragment.java

@@ -147,7 +147,7 @@ public class SavedSearchFragment extends ListFragment implements OnTouchListener
 			convertView = mInflater.inflate(R.layout.saved_cell, null);// 根据布局文件实例化view
 
 			TextView message = (TextView) convertView
-					.findViewById(R.id.tv_name);// 找某个控件
+					.findViewById(R.id.tv_msg);// 找某个控件
 
 			String name = (String) searchresult.getData().get(position).get("name");
 			if(TextUtils.isEmpty(name))

+ 3 - 3
Apex Mobile/app/src/main/java/com/usai/util/Network.java

@@ -108,12 +108,12 @@ public class Network
 
 	public static String		URL_UPDATE_AUTH					= "https://ra.apexshipping.com/login.php";
 	public static String		URL_REQUEST_COUNT				= "https://ra.apexshipping.com/main_new.php";
-	public static String		URL_REQUEST_RECORDS				= "https://ra.apexshipping.com/main.php";
-	public static String		URL_RETRIEVE_PASS				= "https://ra.apexshipping.com/main.php";
+	public static String		URL_REQUEST_RECORDS				= "https://ra.apexshipping.com/main_new.php";
+	public static String		URL_RETRIEVE_PASS				= "https://ra.apexshipping.com/main_new.php";
 	public static String		URL_ANNOUNCEMENTS				= "https://ra.apexshipping.com/mobile_news.php";
 	public static String		URL_NEWS						= "https://ra.apexshipping.com/mobile_news.php";
 	public static String		URL_LOCATIONS					= "https://ra.apexshipping.com/mobile_news.php";
-	public static String		URL_PUSH						= "https://ra.apexshipping.com/main.php";
+	public static String		URL_PUSH						= "https://ra.apexshipping.com/main_new.php";
 	public static String		URL_LOG						= "https://ra.apexshipping.com/mobile_news.php";
 
 

+ 1 - 1
Apex Mobile/app/src/main/res/layout/activity_location_detail.xml

@@ -11,7 +11,7 @@
     tools:context=".LocationDetailActivity" >
 
     <TextView
-        android:id="@+id/tv_name"
+        android:id="@+id/tv_msg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         

+ 45 - 0
Apex Mobile/app/src/main/res/layout/detail_tracking_cell.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.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:id="@+id/constraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:background="@drawable/list_bg">
+
+    <TextView
+        android:id="@+id/tv_msg"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginBottom="4dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:gravity="left"
+        android:lines="2"
+        android:text="Tool name"
+        android:textAlignment="viewStart"
+        android:textColor="@android:color/black"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/iv_icon"
+        app:layout_constraintTop_toTopOf="@+id/iv_icon" />
+
+    <ImageView
+        android:id="@+id/iv_icon"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:src="@drawable/ic_launcher"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</android.support.constraint.ConstraintLayout>

+ 1 - 1
Apex Mobile/app/src/main/res/layout/fragment_direct_tracking.xml

@@ -12,7 +12,7 @@
         android:orientation="vertical" >
 
         <TextView
-            android:id="@+id/tv_name"
+            android:id="@+id/tv_msg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Track your cargo by selected customers" />

+ 3 - 3
Apex Mobile/app/src/main/res/layout/list_content.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-    
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
 
 </LinearLayout>

+ 3 - 3
Apex Mobile/app/src/main/res/layout/saved_doc.xml

@@ -12,7 +12,7 @@
         android:layout_height="56dp">
 
         <TextView
-            android:id="@+id/tv_name"
+            android:id="@+id/tv_msg"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -46,8 +46,8 @@
             android:lines="1"
             android:text="TextView"
             android:textSize="9.7sp"
-            app:layout_constraintStart_toStartOf="@+id/tv_name"
-            app:layout_constraintTop_toBottomOf="@+id/tv_name" />
+            app:layout_constraintStart_toStartOf="@+id/tv_msg"
+            app:layout_constraintTop_toBottomOf="@+id/tv_msg" />
 
         <ImageView
             android:id="@+id/iv_share"

+ 2 - 2
Apex Mobile/app/src/main/res/layout/static_modelist_cell.xml

@@ -12,7 +12,7 @@
         android:layout_height="56dp">
 
         <TextView
-            android:id="@+id/tv_name"
+            android:id="@+id/tv_msg"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -48,7 +48,7 @@
             android:text="TextView"
             android:textSize="9.7sp"
             app:layout_constraintStart_toEndOf="@+id/iv_icon"
-            app:layout_constraintTop_toBottomOf="@+id/tv_name" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_msg" />
     </android.support.constraint.ConstraintLayout>
 
 </LinearLayout>