Преглед изворни кода

1.修改Android RA Image增加POD模式。

Pen Li пре 7 година
родитељ
комит
1574cf4a1a

+ 10 - 0
RA Image/app/src/main/AndroidManifest.xml

@@ -173,6 +173,16 @@
                   android:stateNotNeeded="true"
                   android:theme="@style/Theme.AppCompat.Light">
         </activity>
+
+        <activity android:name=".POD.PodActivity"
+                  android:label="@string/app_name"
+                  android:stateNotNeeded="true"
+                  android:theme="@style/Theme.AppCompat.Light"
+                  android:windowSoftInputMode="stateHidden|adjustResize"
+            >
+
+        </activity>
+
     </application>
 
 </manifest>

+ 17 - 1
RA Image/app/src/main/java/com/usai/redant/raimage/MainActivity.java

@@ -588,6 +588,7 @@ public class MainActivity extends AppCompatActivity
 	static final int	REQUEST_SCAN_BARCODE	= 2;
 	static final int	REQUEST_LOCKER			= 3;
 	static final int 	REQUEST_MANUFACTURE 	= 5;
+    static final int 	REQUEST_SIGNATURE 	    = 6;
 	// HashMap<String, String> hashMap = new HashMap<String, String>();
 
 	// ArrayList<String> pic_file = new ArrayList<String>();
@@ -1463,6 +1464,14 @@ public class MainActivity extends AppCompatActivity
 
 	}
 
+	void startSignatureActivity() {
+
+
+    }
+
+    public void receiveSignature(String signaturePath) {
+
+    }
 
 	/*
 	 * (non-Javadoc)
@@ -1624,7 +1633,14 @@ public class MainActivity extends AppCompatActivity
 				String manufacture = data.getStringExtra("manufacture");
 				setManufacture(manufacture);
 			}
-		}
+		} else if (requestCode == REQUEST_SIGNATURE) {
+
+		    if (resultCode == RESULT_OK) {
+                String path = data.getStringExtra("signaturePath");
+                receiveSignature(path);
+            }
+
+        }
 
 	}
 

+ 8 - 0
RA Image/app/src/main/java/com/usai/redant/raimage/ModeActivity.java

@@ -29,6 +29,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.usai.redant.raimage.Model.ModelActivity;
+import com.usai.redant.raimage.POD.PodActivity;
 import com.usai.redant.raimage.POP.PopActivity;
 import com.usai.util.Network;
 
@@ -189,6 +190,13 @@ public class ModeActivity extends AppCompatActivity {
                intent.putExtra("name",code_name);
                startActivity(intent);
            }
+           else  if (name.equals("POD")) {
+               Intent intent = new Intent(this,PodActivity.class);
+               intent.putExtra("mode",name);
+               intent.putExtra("name",code_name);
+               startActivity(intent);
+           }
+
        } catch (Exception e) {
            e.printStackTrace();
        }

+ 67 - 0
RA Image/app/src/main/java/com/usai/redant/raimage/POD/PodActivity.java

@@ -0,0 +1,67 @@
+package com.usai.redant.raimage.POD;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.usai.redant.raimage.MainActivity;
+import com.usai.redant.raimage.R;
+
+public class PodActivity extends MainActivity {
+
+    private static final String SignaturePathKey = "SignaturePathKey";
+
+    TextView barcode_tv = null;
+    private ImageView mSignatureIv;
+    private String mSignaturePath = null;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pod);
+
+        ActionBar mActionBar = getSupportActionBar();
+        mActionBar.setHomeButtonEnabled(true);
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+        mActionBar.setTitle(mode);
+
+        barcode_tv = findViewById(R.id.barcode_tv);
+        barcode_tv.setText(name + "#");
+        initView();
+
+        mSignatureIv = findViewById(R.id.signature_iv);
+        mSignatureIv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
+        mSignatureIv.setImageResource(R.drawable.tap_signature);
+
+        recovery(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            String path = savedInstanceState.getString(SignaturePathKey);
+            receiveSignature(path);
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        if (mSignaturePath != null) {
+            outState.putString(SignaturePathKey,mSignaturePath);
+        }
+    }
+
+    @Override
+    public void receiveSignature(String signaturePath) {
+        super.receiveSignature(signaturePath);
+        mSignaturePath = signaturePath;
+    }
+}

+ 1 - 2
RA Image/app/src/main/java/com/usai/util/Network.java

@@ -618,8 +618,7 @@ public class Network
 		// .getSharedPreferences(name + "_Apex_auth", Context.MODE_PRIVATE)
 		// .getInt("AuthInfoVer", 0);
 		// parms.putString("auth_ver", ver + "");
-		String jstr = getJson(RedAntApplication.active_address
-				+ Network.URL_LOGIN, parms);
+		String jstr = getJson("http://192.168.0.130:8080/MyWeb/Test", parms);
 		/*
 		 * error occur while get authorization info from server. include can not
 		 * reach server , wrong parms ,server get wrong , etc.

BIN
RA Image/app/src/main/res/drawable-hdpi/tap_signature.png


BIN
RA Image/app/src/main/res/drawable-ldpi/tap_signature.png


BIN
RA Image/app/src/main/res/drawable-mdpi/tap_signature.png


BIN
RA Image/app/src/main/res/drawable-xhdpi/tap_signature.png


BIN
RA Image/app/src/main/res/drawable-xxhdpi/tap_signature.png


+ 156 - 0
RA Image/app/src/main/res/layout-land/activity_pod.xml

@@ -0,0 +1,156 @@
+<?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"
+    android:background="@color/white_color"
+    tools:context="com.usai.redant.raimage.POD.PodActivity">
+
+    <ImageView
+        android:id="@+id/photo_iv"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="32dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginBottom="32dp"
+        android:background="@drawable/black_border"
+        android:padding="0.1dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="h,1:1"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/no_pic"/>
+
+
+
+    <TextView
+        android:id="@+id/photo_count_lb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/photo_iv"
+        android:layout_centerHorizontal="true"
+        android:gravity="center_horizontal|bottom"
+        android:text="No Photos"
+        android:textColor="@color/blue"
+        android:textSize="12sp"
+        android:layout_marginRight="8dp"
+        app:layout_constraintRight_toRightOf="@+id/photo_iv"
+        android:layout_marginLeft="8dp"
+        app:layout_constraintLeft_toLeftOf="@+id/photo_iv"
+        app:layout_constraintBottom_toBottomOf="@+id/photo_iv"
+        android:layout_marginBottom="8dp" />
+
+    <TextView
+        android:id="@+id/barcode_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Model:"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        tools:layout_constraintRight_creator="1"
+        app:layout_constraintTop_toTopOf="@+id/photo_iv"
+        android:layout_marginTop="0dp"
+        android:layout_marginLeft="8dp"
+        app:layout_constraintLeft_toLeftOf="@+id/camera_btn" />
+
+    <EditText
+        android:id="@+id/barcode_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0dp"
+        android:layout_marginEnd="21dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="0dp"
+        android:background="@null"
+        android:gravity="center_vertical"
+        android:inputType="none"
+        android:textSize="17sp"
+        android:editable="false"
+        app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toRightOf="@+id/barcode_tv"
+        app:layout_constraintRight_toLeftOf="@+id/btn_type"
+        app:layout_constraintTop_toTopOf="@+id/barcode_tv"
+        tools:layout_constraintBaseline_creator="1"
+        tools:layout_constraintRight_creator="1" />
+
+
+    <ImageView
+        android:id="@+id/signature_iv"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="24dp"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginTop="32dp"
+        app:layout_constraintBottom_toTopOf="@+id/scan_btn"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="@+id/camera_btn"
+        app:layout_constraintRight_toRightOf="@+id/upload_btn"
+        app:layout_constraintTop_toBottomOf="@+id/barcode_et"
+        android:scaleType="fitCenter"
+        />
+
+
+
+
+    <ImageButton
+        android:id="@+id/camera_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0dp"
+        android:layout_marginLeft="44dp"
+        android:layout_weight="1"
+        android:background="@color/clear_color"
+        app:layout_constraintBottom_toBottomOf="@+id/photo_iv"
+        app:layout_constraintLeft_toRightOf="@+id/photo_iv"
+        app:srcCompat="@drawable/ic_action_camera" />
+
+    <ImageButton
+        android:id="@+id/upload_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0dp"
+        android:layout_marginRight="48dp"
+        android:layout_weight="1"
+        android:background="@color/clear_color"
+        app:layout_constraintBottom_toBottomOf="@+id/photo_iv"
+        app:layout_constraintRight_toRightOf="parent"
+        app:srcCompat="@drawable/ic_action_upload" />
+
+    <ImageButton
+        android:id="@+id/scan_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="1dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_weight="1"
+        android:background="@color/clear_color"
+        app:layout_constraintBottom_toBottomOf="@+id/photo_iv"
+        app:layout_constraintLeft_toRightOf="@+id/camera_btn"
+        app:layout_constraintRight_toLeftOf="@+id/upload_btn"
+        app:srcCompat="@drawable/ic_action_scan" />
+
+    <Button
+        android:id="@+id/btn_type"
+        style="@style/ResultButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="8dp"
+        android:text="Type"
+        android:textColor="@color/blue"
+        app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
+        app:layout_constraintRight_toRightOf="@+id/upload_btn"
+        app:layout_constraintTop_toTopOf="@+id/barcode_tv" />
+
+
+</android.support.constraint.ConstraintLayout>

+ 152 - 0
RA Image/app/src/main/res/layout/activity_pod.xml

@@ -0,0 +1,152 @@
+<?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"
+                                             android:background="@color/white_color"
+                                             tools:context="com.usai.redant.raimage.POD.PodActivity">
+
+    <ImageView
+        android:id="@+id/photo_iv"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginLeft="32dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="32dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/black_border"
+        android:padding="0.1dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toTopOf="@+id/barcode_et"
+        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintHorizontal_bias="0.511"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/no_pic"
+        tools:layout_constraintLeft_creator="1"
+        tools:layout_constraintRight_creator="1"/>
+
+    <TextView
+        android:id="@+id/photo_count_lb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="6dp"
+        android:ems="10"
+        android:gravity="center_horizontal|bottom"
+        android:inputType="textPersonName"
+        android:text="No Photos"
+        android:textColor="@color/blue"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="@+id/photo_iv"
+        app:layout_constraintLeft_toLeftOf="@+id/photo_iv"
+        app:layout_constraintRight_toRightOf="@+id/photo_iv"
+        tools:layout_constraintBottom_creator="1"
+        tools:layout_constraintLeft_creator="1" />
+
+    <TextView
+        android:id="@+id/barcode_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:layout_marginLeft="8dp"
+        android:text="Model:"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        app:layout_constraintBottom_toTopOf="@+id/signature_iv"
+        app:layout_constraintLeft_toLeftOf="@+id/signature_iv" />
+
+    <EditText
+        android:id="@+id/barcode_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginTop="0dp"
+        android:background="@null"
+        android:gravity="center_vertical"
+        android:inputType="none"
+        android:editable="false"
+        android:textSize="17sp"
+        app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toRightOf="@+id/barcode_tv"
+        app:layout_constraintRight_toLeftOf="@+id/btn_type"
+        app:layout_constraintTop_toTopOf="@+id/barcode_tv"
+        app:layout_constraintVertical_bias="0.482" />
+
+
+    <ImageView
+        android:id="@+id/signature_iv"
+        android:layout_width="0dp"
+        android:layout_height="120dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginLeft="32dp"
+        android:layout_marginRight="32dp"
+        app:layout_constraintBottom_toTopOf="@+id/camera_btn"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:scaleType="fitCenter"
+        />
+
+    <ImageButton
+        android:id="@+id/upload_btn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:layout_marginRight="48dp"
+        android:layout_weight="1"
+        android:background="@color/clear_color"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:srcCompat="@drawable/ic_action_upload" />
+
+    <ImageButton
+        android:id="@+id/scan_btn"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:layout_marginLeft="48dp"
+        android:layout_weight="1"
+        android:background="@color/clear_color"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:srcCompat="@drawable/ic_action_scan" />
+
+    <ImageButton
+        android:id="@+id/camera_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_weight="1"
+        android:background="@color/clear_color"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/scan_btn"
+        app:layout_constraintRight_toLeftOf="@+id/upload_btn"
+        app:srcCompat="@drawable/ic_action_camera" />
+
+    <Button
+        android:id="@+id/btn_type"
+        style="@style/ResultButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginTop="8dp"
+        android:text="Type"
+        android:textColor="@color/blue"
+        app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
+        app:layout_constraintRight_toRightOf="@+id/signature_iv"
+        app:layout_constraintTop_toTopOf="@+id/barcode_tv" />
+
+
+</android.support.constraint.ConstraintLayout>