ra image 1.16 release

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/service/RAService3.java

@@ -83,7 +83,7 @@ public abstract class RAService3 extends Service {
         }
         else
         {
-            startService(serviceIntent);
+//            startService(serviceIntent);
         }
 
 
@@ -113,6 +113,8 @@ public abstract class RAService3 extends Service {
 ////            initLocation();
 ////
 ////        }
+
+        serviceIntent = intent;
         return super.onStartCommand(intent,flags,startId);
     }
 

ApexDrivers/raimage/build.gradle

@@ -13,10 +13,10 @@ android {
     compileSdkVersion 29
     defaultConfig {
         applicationId "com.usai.redant.raimage"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 29
-        versionCode 6
-        versionName "1.09.39521"
+        versionCode 7
+        versionName "1.16.39521"
     }
     buildTypes {
         release {
@@ -38,7 +38,7 @@ dependencies {
     //    compile 'org.bouncycastle.bcprov-jdk15on.1.57.org.bouncycastle:bcprov-jdk15on:1.57'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     api 'androidx.legacy:legacy-support-v4:1.0.0'
-    api 'androidx.constraintlayout:constraintlayout:2.0.1'
+    api 'androidx.constraintlayout:constraintlayout:2.0.4'
     api 'androidx.recyclerview:recyclerview:1.1.0'
     api project(path: ':RAUtilsLibrary')
     //    implementation files('libs/core-2.3.0.jar')

ApexDrivers/raimage/src/main/AndroidManifest.xml

@@ -124,6 +124,11 @@
             android:label="@string/app_name"
             android:stateNotNeeded="true"
             android:theme="@style/Theme.AppCompat.Light" />
+        <activity
+            android:name=".receiving.ReceivingPalletIDActivity"
+            android:label="@string/app_name"
+            android:stateNotNeeded="true"
+            android:theme="@style/Theme.AppCompat.Light" />
         <activity
             android:name=".Model.ModelActivity"
             android:label="@string/app_name"

ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/MainActivity.java

@@ -397,6 +397,7 @@ public class MainActivity extends AppCompatActivity
                     params.putString("_operate","upload");
                     params.putString("platform","android");
                     params.putString("md5",md5);
+                    params.putString("code_name",name);
 
 
                     if (mode.equals("Model")) {
@@ -408,7 +409,13 @@ public class MainActivity extends AppCompatActivity
                             params.putString("note",noteTextView.getText().toString());
                         }
                     }
+                    if (mode.equals("Receiving")&& name.equals("PalletID")) {
 
+
+                        if (!TextUtils.isEmpty(noteTextView.getText().toString())) {
+                            params.putString("note",noteTextView.getText().toString());
+                        }
+                    }
                     task.putBundle("params",params);
 
                     taskArr.add(task);
@@ -1059,6 +1066,7 @@ public class MainActivity extends AppCompatActivity
                     params.putString("barcode",pidval.getText().toString());
                     params.putString("_operate","upload");
                     params.putString("platform","android");
+                    params.putString("code_name",name);
 
                     if (mode.equals("Model")) {
 

ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/ModeActivity.java

@@ -31,6 +31,7 @@ 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.redant.raimage.receiving.ReceivingPalletIDActivity;
 import com.usai.util.Network;
 
 import org.json.JSONArray;
@@ -178,7 +179,13 @@ public class ModeActivity extends AppCompatActivity {
                 intent.putExtra("name",code_name);
                 startActivity(intent);
             }
-            else  if (name.equals("Receiving")) {
+            else  if (name.equals("Receiving")&&code_name.equals("PalletID")) {
+                Intent intent = new Intent(this, ReceivingPalletIDActivity.class);
+                intent.putExtra("mode","Receiving");
+                intent.putExtra("name",code_name);
+                startActivity(intent);
+            }
+            else  if (name.equals("Receiving")&&code_name.equals("PO#")) {
                 Intent intent = new Intent(this,PopActivity.class);
                 intent.putExtra("mode","Receiving");
                 intent.putExtra("name",code_name);

ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/RAImageApplication.java

@@ -140,6 +140,11 @@ public class RAImageApplication extends RedantApplication
 		/***/
     }
 
+	@Override
+	public Class getServiceClass() {
+		return mService.getClass();
+	}
+
 	@Override
 	public void onTerminate() {
 		Log.d("_RAIMAGE", "onTerminate: RedAntApplication");

ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/receiving/ReceivingPalletIDActivity.java

@@ -0,0 +1,55 @@
+package com.usai.redant.raimage.receiving;
+
+import android.os.Bundle;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.appcompat.app.ActionBar;
+
+import com.usai.redant.raimage.MainActivity;
+import com.usai.redant.raimage.R;
+
+public class ReceivingPalletIDActivity extends MainActivity {
+
+    TextView barcode_tv = null;
+//    EditText note_et = null;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_receivingpalletid);
+
+        ActionBar mActionBar = getSupportActionBar();
+        mActionBar.setHomeButtonEnabled(true);
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+        mActionBar.setTitle(mode);
+
+        barcode_tv=(TextView)findViewById(R.id.barcode_tv);
+//        noteTextView= (EditText)findViewById(R.id.note_et2) ;
+        barcode_tv.setText(name);
+//        note_et.setText("Reference");
+        initView();
+
+        recovery(savedInstanceState);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+    }
+
+
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//
+//        switch (item.getItemId()) {
+//            case android.R.id.home: {
+//                finish();
+//            }
+//            break;
+//        }
+//        return true;
+//    }
+
+    /**Method*/
+
+}

ApexDrivers/raimage/src/main/res/layout-land/activity_receivingpalletid.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_height="match_parent"
+    android:background="@color/white_color"
+    tools:context="com.usai.redant.raimage.receiving.ReceivingPalletIDActivity">
+
+    <EditText
+        android:id="@+id/note_et"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/black_border"
+        android:gravity="left"
+        android:hint="Reference"
+        android:inputType="textMultiLine"
+        android:textColor="#000000"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@+id/scan_btn"
+        app:layout_constraintEnd_toEndOf="@+id/upload_btn"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="@+id/camera_btn"
+        app:layout_constraintRight_toRightOf="@+id/upload_btn"
+        app:layout_constraintStart_toStartOf="@+id/scan_btn"
+        app:layout_constraintTop_toBottomOf="@+id/barcode_et" />
+
+    <ImageView
+        android:id="@+id/photo_iv"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginBottom="32dp"
+        android:layout_marginLeft="32dp"
+        android:layout_marginTop="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"></ImageView>
+
+    <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"
+        app:layout_constraintBottom_toBottomOf="@+id/photo_iv"
+        android:layout_marginBottom="8dp"
+        android:layout_marginRight="8dp"
+        app:layout_constraintRight_toRightOf="@+id/photo_iv"
+        android:layout_marginLeft="8dp"
+        app:layout_constraintLeft_toLeftOf="@+id/photo_iv" />
+
+
+    <TextView
+        android:id="@+id/barcode_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="PalletID"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        app:layout_constraintLeft_toRightOf="@+id/photo_iv"
+        app:layout_constraintStart_toStartOf="@+id/note_et"
+        app:layout_constraintTop_toTopOf="@+id/photo_iv"
+        tools:layout_constraintRight_creator="1"
+        tools:layout_constraintTop_creator="1" />
+
+    <EditText
+        android:id="@+id/barcode_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:background="@null"
+        android:editable="false"
+        android:gravity="center_vertical"
+        android:inputType="none"
+        android:textSize="17sp"
+        app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
+        app:layout_constraintHorizontal_bias="0.428"
+        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.625"/>
+
+    <ImageButton
+        android:id="@+id/camera_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/scan_btn"
+        app:layout_constraintRight_toLeftOf="@+id/upload_btn"
+        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="1dp"
+        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="48dp"
+        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_scan" />
+
+    <Button
+        android:id="@+id/btn_type"
+        style="@style/ResultButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="24dp"
+        android:text="Type"
+        android:textColor="@color/blue"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/barcode_tv"
+        android:layout_marginTop="0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
+        android:layout_marginBottom="0dp" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

ApexDrivers/raimage/src/main/res/layout/activity_pop.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white_color"
-    tools:context="com.usai.redant.raimage.POP.PopActivity">
+    tools:context="com.usai.redant.raimage.receiving.ReceivingPalletIDActivity">
 
     <ImageView
         android:id="@+id/photo_iv"

ApexDrivers/raimage/src/main/res/layout/activity_receivingpalletid.xml

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_height="match_parent"
+    android:background="@color/white_color"
+    tools:context="com.usai.redant.raimage.POP.PopActivity">
+
+    <EditText
+        android:id="@+id/note_et"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginLeft="48dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="48dp"
+        android:layout_marginBottom="16dp"
+        android:background="@drawable/black_border"
+        android:gravity="left"
+        android:hint="Reference:"
+        android:inputType="textMultiLine"
+        android:textColor="#000000"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@+id/camera_btn"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btn_type" />
+
+    <ImageView
+        android:id="@+id/photo_iv"
+        android:layout_width="260dp"
+        android:layout_height="260dp"
+        android:layout_marginTop="32dp"
+        android:background="@drawable/black_border"
+        android:padding="0.1dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="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:ems="10"
+        android:gravity="center_horizontal|bottom"
+        android:inputType="textPersonName"
+        android:text="No Photos"
+        android:textColor="@color/blue"
+        android:textSize="12sp"
+        tools:layout_constraintRight_creator="1"
+        tools:layout_constraintBottom_creator="1"
+        app:layout_constraintBottom_toBottomOf="@+id/photo_iv"
+        app:layout_constraintRight_toRightOf="@+id/photo_iv"
+        tools:layout_constraintLeft_creator="1"
+        android:layout_marginBottom="1dp"
+        app:layout_constraintLeft_toLeftOf="@+id/photo_iv" />
+
+    <TextView
+        android:id="@+id/barcode_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="15dp"
+        android:text="PalletID"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        app:layout_constraintStart_toStartOf="@+id/scan_btn"
+        app:layout_constraintTop_toBottomOf="@+id/photo_count_lb" />
+
+    <EditText
+        android:id="@+id/barcode_et"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="0dp"
+        android:background="@null"
+        android:editable="false"
+        android:gravity="center_vertical"
+        android:textSize="17sp"
+        app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
+        app:layout_constraintHorizontal_bias="0.636"
+        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.0"
+        tools:layout_constraintBottom_creator="1"
+        tools:layout_constraintLeft_creator="1" />
+
+    <ImageButton
+        android:id="@+id/scan_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:layout_marginLeft="48dp"
+        android:layout_marginStart="45dp"
+        android:background="@color/clear_color"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:srcCompat="@drawable/ic_action_scan"
+        tools:layout_constraintBottom_creator="1"
+        tools:layout_constraintLeft_creator="1" />
+
+    <ImageButton
+        android:id="@+id/camera_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_action_camera"
+        android:background="@color/clear_color"
+        tools:layout_constraintRight_creator="1"
+        tools:layout_constraintBottom_creator="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:layout_constraintLeft_creator="1"
+        android:layout_marginBottom="32dp"
+        app:layout_constraintRight_toLeftOf="@+id/upload_btn"
+        app:layout_constraintHorizontal_bias="0.504"
+        android:layout_marginRight="8dp"
+        app:layout_constraintLeft_toRightOf="@+id/scan_btn"
+        android:layout_marginLeft="8dp" />
+
+    <ImageButton
+        android:id="@+id/upload_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/clear_color"
+        app:srcCompat="@drawable/ic_action_upload"
+        tools:layout_constraintRight_creator="1"
+        tools:layout_constraintBottom_creator="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginEnd="46dp"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginBottom="32dp"
+        android:layout_marginRight="48dp" />
+
+    <Button
+        android:id="@+id/btn_type"
+        style="@style/ShareButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:background="@color/clear_color"
+        android:text="Type"
+        android:textAlignment="viewEnd"
+        android:textColor="@color/blue"
+        app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
+        app:layout_constraintEnd_toEndOf="@+id/upload_btn"
+        app:layout_constraintTop_toTopOf="@+id/barcode_tv"
+        app:layout_constraintVertical_bias="0.583"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>