Просмотр исходного кода

1.修改Android Apex Driver工程错误。

Pen Li 7 лет назад
Родитель
Сommit
9391025a26
24 измененных файлов с 40 добавлено и 198 удалено
  1. 1 1
      ApexDrivers/RAUtilsLibrary/src/main/res/layout/upload_list_activity.xml
  2. 5 4
      ApexDrivers/apexdriverslib/src/main/res/layout/pop_cell.xml
  3. 3 3
      ApexDrivers/apexdriverslib/src/main/res/layout/upload_cell.xml
  4. 1 2
      ApexDrivers/apexmobile/src/main/java/com/usai/apex/BaiduMapFragment.java
  5. 3 1
      ApexDrivers/apexmobile/src/main/java/com/usai/apex/DragListView.java
  6. 1 2
      ApexDrivers/apexmobile/src/main/java/com/usai/apex/FunctionSelectActivity.java
  7. 1 2
      ApexDrivers/apexmobile/src/main/java/com/usai/apex/LocationDetailActivity.java
  8. 1 2
      ApexDrivers/apexmobile/src/main/java/com/usai/apex/SearchResult.java
  9. 1 1
      ApexDrivers/apexmobile/src/main/java/com/usai/apex/SegmentView.java
  10. 1 1
      ApexDrivers/apexmobile/src/main/java/com/usai/util/commonUtil.java
  11. 0 69
      ApexDrivers/apexmobile/src/main/res/layout/activity_cargo_tracking.xml
  12. 0 14
      ApexDrivers/apexmobile/src/main/res/layout/activity_pdf_preview.xml
  13. 3 3
      ApexDrivers/apexmobile/src/main/res/layout/activity_result.xml
  14. 1 1
      ApexDrivers/apexmobile/src/main/res/layout/announcement_cell.xml
  15. 1 1
      ApexDrivers/apexmobile/src/main/res/layout/detail_fragment.xml
  16. 1 1
      ApexDrivers/apexmobile/src/main/res/layout/detail_fragment_withmap.xml
  17. 1 1
      ApexDrivers/apexmobile/src/main/res/layout/detail_tracking_cell.xml
  18. 0 63
      ApexDrivers/apexmobile/src/main/res/layout/fragment_direct_tracking.xml
  19. 0 13
      ApexDrivers/apexmobile/src/main/res/layout/fragment_inner_tools.xml
  20. 3 2
      ApexDrivers/apexmobile/src/main/res/layout/group_tag.xml
  21. 1 1
      ApexDrivers/apexmobile/src/main/res/layout/saved_cell.xml
  22. 1 1
      ApexDrivers/apexmobile/src/main/res/layout/saved_doc.xml
  23. 1 1
      ApexDrivers/apexmobile/src/main/res/layout/static_modelist_cell.xml
  24. 9 8
      ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/PhotoPreviewActivity.java

+ 1 - 1
ApexDrivers/RAUtilsLibrary/src/main/res/layout/upload_list_activity.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".upload.TaskActivity">
+    tools:context=".upload.UploadListActivity">
 
     <ListView
         android:id="@+id/task_list"

+ 5 - 4
ApexDrivers/apexdriverslib/src/main/res/layout/pop_cell.xml

@@ -1,6 +1,7 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="40dp">
 
@@ -8,11 +9,11 @@
         android:id="@+id/pop_title_tv"
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:textSize="17sp"
-        android:textColor="#000000"
-        android:textAlignment="center"
         android:gravity="center"
         android:text="201805300010"
-        />
+        android:textAlignment="center"
+        android:textColor="#000000"
+        android:textSize="17sp"
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </android.support.constraint.ConstraintLayout>

+ 3 - 3
ApexDrivers/apexdriverslib/src/main/res/layout/upload_cell.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
@@ -98,13 +99,12 @@
                 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="0dp"
                 android:layout_height="16dp"
-                android:layout_marginRight="0dp"
-                android:layout_marginTop="0dp"
                 android:max="100"
                 android:progress="0"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintHorizontal_bias="0.0" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/upload_progress_tv"

+ 1 - 2
ApexDrivers/apexmobile/src/main/java/com/usai/apex/BaiduMapFragment.java

@@ -358,8 +358,7 @@ public class BaiduMapFragment extends Fragment implements BDLocationListener
 		@Override
 		protected void onPostExecute(Boolean success)
 		{
-			String tag = "onPostExecute@BaiduMapFragment";
-			Log.d(tag, "entry");
+
 			m_task = null;
 			// showProgress(false);
 

+ 3 - 1
ApexDrivers/apexmobile/src/main/java/com/usai/apex/DragListView.java

@@ -17,6 +17,8 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
 
+import static android.content.Context.WINDOW_SERVICE;
+
 public class DragListView extends ListView
 {
 
@@ -180,7 +182,7 @@ public class DragListView extends ListView
 
 		ImageView imageView = new ImageView(getContext());
 		imageView.setImageBitmap(bm);
-		windowManager = (WindowManager) getContext().getSystemService("window");
+		windowManager = (WindowManager) getContext().getSystemService(WINDOW_SERVICE);
 		windowManager.addView(imageView, windowParams);
 		dragImageView = imageView;
 	}

+ 1 - 2
ApexDrivers/apexmobile/src/main/java/com/usai/apex/FunctionSelectActivity.java

@@ -158,8 +158,7 @@ public class FunctionSelectActivity extends FragmentActivity implements
 	@Override
 	public void onClick(View v)
 	{
-		String TAG = "onClick@FunctionSelectActivity";
-		Log.d(TAG, "ID=" + v.getId());
+
 		switch (v.getId())
 		{
 			case R.id.btn_clear:

+ 1 - 2
ApexDrivers/apexmobile/src/main/java/com/usai/apex/LocationDetailActivity.java

@@ -29,8 +29,7 @@ public class LocationDetailActivity extends Activity
 	boolean isIntentAvailable(Context context, Intent intent)
 	{
 		final PackageManager packageManager = context.getPackageManager();
-		List<ResolveInfo> list = packageManager.queryIntentActivities(intent,
-				PackageManager.GET_ACTIVITIES);
+		List<ResolveInfo> list = packageManager.queryIntentActivities(intent, PackageManager.GET_ACTIVITIES);
 		return list.size() > 0;
 	}
 

+ 1 - 2
ApexDrivers/apexmobile/src/main/java/com/usai/apex/SearchResult.java

@@ -54,8 +54,7 @@ public class SearchResult implements Serializable
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		String TAG = "init_fields@ResultActivity.SearchResult";
-		Log.d(TAG, jsonstr);
+
 	}
 
 	public int get_totalcount() {

+ 1 - 1
ApexDrivers/apexmobile/src/main/java/com/usai/apex/SegmentView.java

@@ -138,7 +138,7 @@ public class SegmentView extends LinearLayout {
     /**
      * 获取当前选中状态 0=left, 1=right
      *
-     * @param i
+     *
      */
     public int getSelect() {
         if (leftTextView.isSelected()) {

+ 1 - 1
ApexDrivers/apexmobile/src/main/java/com/usai/util/commonUtil.java

@@ -76,7 +76,7 @@ public class commonUtil {
     }
 
     /**
-     * Generate a value suitable for use in {@link #setId(int)}.
+     * Generate a value suitable for use in setId(int)
      * This value will not collide with ID values generated at build time by aapt for R.id.
      *
      * @return a generated ID value

+ 0 - 69
ApexDrivers/apexmobile/src/main/res/layout/activity_cargo_tracking.xml

@@ -1,69 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".CargoTrackingActivity" >
-
-    <TextView
-        android:id="@+id/tv_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/str_search_by"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <RadioGroup
-        android:id="@+id/radioGroup1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
-
-        <RadioButton
-            android:id="@+id/radio0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="H_BOL" />
-
-        <RadioButton
-            android:id="@+id/radio1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Container#" />
-    </RadioGroup>
-
-    <EditText
-        android:id="@+id/et_criterion"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/prompt_search_criterion"
-        android:inputType="textAutoComplete"
-        android:maxLines="1"
-        android:singleLine="true" >
-
-        <requestFocus />
-    </EditText>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <Button
-            android:id="@+id/btn_cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/str_cancel"/>
-
-        <Button
-            android:id="@+id/btn_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/str_search" />
-    </LinearLayout>
-
-</LinearLayout>

+ 0 - 14
ApexDrivers/apexmobile/src/main/res/layout/activity_pdf_preview.xml

@@ -1,14 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.usai.redant.mytestpdf.MyQLActivity">
-
-    <com.github.barteksc.pdfviewer.PDFView
-        android:id="@+id/pdfView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</android.support.constraint.ConstraintLayout>

+ 3 - 3
ApexDrivers/apexmobile/src/main/res/layout/activity_result.xml

@@ -72,13 +72,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            style="@android:attr/buttonBarButtonStyle"
+            style="?android:attr/buttonBarButtonStyle"
             android:text="@string/str_prepage" 
             android:enabled="false"/>
 
         <Button
             android:id="@+id/btn_next"
-            style="@android:attr/buttonBarButtonStyle"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -122,7 +122,7 @@
                 android:layout_marginTop="10dp"
 
                 android:drawableLeft="@android:drawable/ic_popup_sync"
-                style="@android:attr/buttonBarButtonStyle"
+                style="?android:attr/buttonBarButtonStyle"
                 android:text="Refresh" />
      <!--    <FrameLayout
             android:layout_width="wrap_content"

+ 1 - 1
ApexDrivers/apexmobile/src/main/res/layout/announcement_cell.xml

@@ -20,9 +20,9 @@
             android:layout_marginStart="7dp"
             android:layout_marginTop="2dp"
             android:layout_weight="1"
-            android:gravity="left"
             android:text="Tool name"
             android:textAlignment="viewStart"
+            android:gravity="start"
             android:textColor="@android:color/black"
             android:textSize="12.7sp"
             app:layout_constraintEnd_toEndOf="parent"

+ 1 - 1
ApexDrivers/apexmobile/src/main/res/layout/detail_fragment.xml

@@ -79,7 +79,7 @@
 
                         <Button
                             android:id="@+id/btn_refresh"
-                            style="@android:attr/buttonBarButtonStyle"
+                            style="?android:attr/buttonBarButtonStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"

+ 1 - 1
ApexDrivers/apexmobile/src/main/res/layout/detail_fragment_withmap.xml

@@ -76,7 +76,7 @@
 
                         <Button
                             android:id="@+id/btn_refresh"
-                            style="@android:attr/buttonBarButtonStyle"
+                            style="?android:attr/buttonBarButtonStyle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"

+ 1 - 1
ApexDrivers/apexmobile/src/main/res/layout/detail_tracking_cell.xml

@@ -20,10 +20,10 @@
         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:gravity="start"
         android:textColor="@android:color/black"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="@+id/iv_thumb"

+ 0 - 63
ApexDrivers/apexmobile/src/main/res/layout/fragment_direct_tracking.xml

@@ -1,63 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".DirectTrackingFragment" >
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/tv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Track your cargo by selected customers" />
-
-        <RadioGroup
-            android:id="@+id/radioGroup1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
-
-            <RadioButton
-                android:id="@+id/radio0"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:text="House B/L number" />
-
-            <RadioButton
-                android:id="@+id/radio1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Air WayBill number" />
-
-            <RadioButton
-                android:id="@+id/radio2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Trucking number" />
-
-        </RadioGroup>
-
-        <EditText
-            android:id="@+id/et_from"
-            android:layout_width="wrap_content" android:inputType="" 
-            android:layout_height="wrap_content"
-            android:ems="12" >
-
-            <requestFocus />
-        </EditText>
-
-        <Button
-            android:id="@+id/btn_cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:text="Search" />
-    </LinearLayout>
-
-</RelativeLayout>

+ 0 - 13
ApexDrivers/apexmobile/src/main/res/layout/fragment_inner_tools.xml

@@ -1,13 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.usai.apex.InnerToolsActivity$PlaceholderFragment" >
-
-
-
-</RelativeLayout>

+ 3 - 2
ApexDrivers/apexmobile/src/main/res/layout/group_tag.xml

@@ -27,8 +27,9 @@
         android:id="@+id/group_expand_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:contentDescription="TODO"
+        android:src="@drawable/ic_expand_more"
         app:layout_constraintEnd_toEndOf="parent"
-        android:contentDescription="TODO" android:src="@drawable/ic_expand_more"
-        />
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </android.support.constraint.ConstraintLayout>

+ 1 - 1
ApexDrivers/apexmobile/src/main/res/layout/saved_cell.xml

@@ -20,9 +20,9 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="4dp"
             android:layout_weight="1"
-            android:gravity="left"
             android:text="Tool name"
             android:textAlignment="viewStart"
+            android:gravity="start"
             android:textColor="@android:color/black"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"

+ 1 - 1
ApexDrivers/apexmobile/src/main/res/layout/saved_doc.xml

@@ -20,9 +20,9 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="4dp"
             android:layout_weight="1"
-            android:gravity="left"
             android:text="Tool name"
             android:textAlignment="viewStart"
+            android:gravity="start"
             android:textColor="@android:color/black"
             android:textSize="14sp"
             app:layout_constraintEnd_toStartOf="@+id/iv_share"

+ 1 - 1
ApexDrivers/apexmobile/src/main/res/layout/static_modelist_cell.xml

@@ -20,9 +20,9 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="4dp"
             android:layout_weight="1"
-            android:gravity="left"
             android:text="Tool name"
             android:textAlignment="viewStart"
+            android:gravity="start"
             android:textColor="@android:color/black"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"

+ 9 - 8
ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/PhotoPreviewActivity.java

@@ -90,8 +90,8 @@ public class PhotoPreviewActivity extends Activity implements
 			imgview.setLayoutParams(searchParams);
 			imgview.setBackgroundResource(R.drawable.picture_frame);
 			imgview.setTag(i);
-			Loadtask t = new Loadtask();
-			t.execute(imgview, null);
+			Loadtask t = new Loadtask(imgview);
+			t.execute(i, null);
 			imgview.setOnClickListener(new OnClickListener()
 			{
 
@@ -172,21 +172,22 @@ public class PhotoPreviewActivity extends Activity implements
 
 	// private Integer[] mImageIds = {
 	// };
-	public class Loadtask extends AsyncTask<ImageView, Integer, Boolean>
+	public class Loadtask extends AsyncTask<Integer, Integer, Boolean>
 	{
 		// int err_code = ERR_CODE_NONE;
 		ImageView	iv		= null;
 		Bitmap		thumb	= null;
 
 		// int netconnect;
+		public Loadtask(ImageView imageView) {
+			iv = imageView;
+		}
 
 		@Override
-		protected Boolean doInBackground(ImageView... params)
+		protected Boolean doInBackground(Integer... params)
 		{
-			iv = params[0];
-			Integer idx = (Integer) iv.getTag();
-			thumb = ThumbnailUtils.extractThumbnail(
-					BitmapFactory.decodeFile(pic_file.get(idx)), 160, 120);
+			Integer idx = params[0];
+			thumb = ThumbnailUtils.extractThumbnail(BitmapFactory.decodeFile(pic_file.get(idx)), 160, 120);
 			return true;
 		}