Browse Source

功能优化

guilin 1 year ago
parent
commit
49442a9709

+ 7 - 0
app/src/main/AndroidManifest.xml

@@ -194,6 +194,13 @@
             tools:ignore="LockedOrientationActivity"/>
 
 
+        <activity
+            android:name=".putIn.CheckUnpackingMainActivity"
+            android:windowSoftInputMode="stateHidden|adjustPan"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity"/>
+
+
 
 
         <activity

+ 3 - 0
app/src/main/java/com/fxy/adapter/GridImageAdapter.java

@@ -17,6 +17,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -100,12 +101,14 @@ public class GridImageAdapter extends RecyclerView.Adapter<GridImageAdapter.View
         ImageView mImg;
         LinearLayout ll_del;
         TextView tv_duration;
+        ProgressBar progressBar;
 
         ViewHolder(View view) {
             super(view);
             mImg = view.findViewById(R.id.fiv);
             ll_del = view.findViewById(R.id.ll_del);
             tv_duration = view.findViewById(R.id.tv_duration);
+            progressBar = view.findViewById(R.id.progressBar);
         }
     }
 

+ 30 - 12
app/src/main/java/com/fxy/base/RealmMigrations.java

@@ -2,6 +2,7 @@ package com.fxy.base;
 
 import io.realm.DynamicRealm;
 import io.realm.RealmMigration;
+import io.realm.RealmObjectSchema;
 import io.realm.RealmSchema;
 
 public class RealmMigrations implements RealmMigration {
@@ -9,18 +10,35 @@ public class RealmMigrations implements RealmMigration {
     public void migrate(DynamicRealm realm, long oldVersion, long newVersion) {
         final RealmSchema schema = realm.getSchema();
         if(oldVersion == 1) {
-            schema.create("CutRuleRealm")
-                    .addField("id", int.class)
-                    .addField("company_id", int.class)
-                    .addField("number_start", String.class)
-                    .addField("number_length", int.class)
-                    .addField("cut_type", int.class)
-                    .addField("start_index", int.class)
-                    .addField("cut_length", int.class)
-                    .addField("is_delete", String.class)
-                    .addField("create_user", int.class)
-                    .addField("create_date", String.class);
-            oldVersion++;
+            if (schema.get("CutRuleRealm")==null){
+                schema.create("CutRuleRealm")
+                        .addField("id", int.class)
+                        .addField("company_id", int.class)
+                        .addField("number_start", String.class)
+                        .addField("number_length", int.class)
+                        .addField("cut_type", int.class)
+                        .addField("start_index", int.class)
+                        .addField("cut_length", int.class)
+                        .addField("is_delete", String.class)
+                        .addField("create_user", int.class)
+                        .addField("create_date", String.class);
+                oldVersion++;
+            }
+
+        }
+        if (oldVersion < 2) {
+            // 如果oldVersion小于1,这意味着数据库需要迁移
+//            RealmObjectSchema objectSchema = schema.get("TakePhotosRealm");
+//            if (objectSchema == null) {
+//                // 对象不存在,创建它
+//                objectSchema = schema.create("TakePhotosRealm");
+//            }
+//            // 添加新字段
+//            objectSchema.addField("businessType", String.class);
+//            oldVersion++;
+
+
         }
     }
+
 }

+ 2 - 1
app/src/main/java/com/fxy/common/CosService.java

@@ -139,7 +139,8 @@ public class CosService {
                     // todo Do something to update progress...
                     int progress = (int) ((double) complete / (double) target * 100);
                     Message msg = new Message();
-                    msg.arg1 = progress;
+                    msg.arg1 = current;
+                    msg.arg2 = progress;
                     msg.what = 3;
                     uploadHandler.sendMessage(msg);
 

+ 1 - 1
app/src/main/java/com/fxy/common/FiledUpload.java

@@ -93,7 +93,7 @@ public class FiledUpload {
                         break;
                     case 3:
                         //设置进度条
-                        progressDialog.setProgress(msg.arg1);
+                        progressDialog.setProgress(msg.arg2);
                         //progressDialog.show();
                         return;
                     case 4:

+ 2 - 1
app/src/main/java/com/fxy/common/OssService.java

@@ -188,7 +188,8 @@ public class OssService {
                     // 进度逻辑
                     int progress = (int) ((double) currentSize / (double) totalSize * 100);
                     Message msg = new Message();
-                    msg.arg1 = progress;
+                    msg.arg1 = current;
+                    msg.arg2 = progress;
                     msg.what = 3;
                     uploadHandler.sendMessage(msg);
                 }

+ 41 - 21
app/src/main/java/com/fxy/common/PictureSelectorUpload.java

@@ -59,6 +59,8 @@ public class PictureSelectorUpload {
     private ProgressDialog progressDialog;
     List<String> errorList =  new ArrayList<String> ();
 
+    private int progressType = 1;// 1弹窗 2页面进度条
+
     //资源类型
     private int pictureType=1;
 
@@ -152,6 +154,10 @@ public class PictureSelectorUpload {
         this.onlyCamera = onlyCamera;
     }
 
+    public void setProgressType(int progressType){
+        this.progressType = progressType;
+    }
+
     /**
      * 设置操作类型
      * @return
@@ -186,7 +192,7 @@ public class PictureSelectorUpload {
     public void getSelectImg (Intent data){
         List<LocalMedia>  images = PictureSelector.obtainMultipleResult(data);
         //selectList = PictureSelector.obtainMultipleResult(data);
-        awaitUploadList.addAll(images);
+        awaitUploadList.addAll(awaitUploadList.size(),images);
         // 例如 LocalMedia 里面返回三种path
         // 1.media.getPath(); 为原图path
         // 2.media.getCutPath();为裁剪后path,需判断media.isCut();是否为true
@@ -194,27 +200,33 @@ public class PictureSelectorUpload {
         // 如果裁剪并压缩了,以取压缩路径为准,因为是先裁剪后压缩的
 
 
+        if (progressType==1){
+            //显示进度条
+            if (progressDialog != null && progressDialog.isShowing()) {
+                progressDialog.dismiss();
+                progressDialog = null;
+            }
+            progressDialog = new ProgressDialog(mActivity);
+            progressDialog.setTitle("待上传文件"+awaitUploadList.size()+"个");
+            progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+            progressDialog.setCanceledOnTouchOutside(false);
+            progressDialog.show();
+            //监听取消事件
+            progressDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                @Override
+                public void onCancel(DialogInterface dialog) {
+                    // TODO Auto-generated method stub
+                    taskCancel();
+                    return ;
+                }
 
-        if (progressDialog != null && progressDialog.isShowing()) {
-            progressDialog.dismiss();
-            progressDialog = null;
+            });
+        }else{
+            //
         }
-        progressDialog = new ProgressDialog(mActivity);
-        progressDialog.setTitle("待上传文件"+awaitUploadList.size()+"个");
-        progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-        progressDialog.setCanceledOnTouchOutside(false);
-        progressDialog.show();
-
-        //监听取消事件
-        progressDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-            @Override
-            public void onCancel(DialogInterface dialog) {
-                // TODO Auto-generated method stub
-                taskCancel();
-                return ;
-            }
 
-        });
+
+
 
 
         filedUpload();
@@ -320,13 +332,21 @@ public class PictureSelectorUpload {
                             adapter.setPhotoPath(file_path);
                             adapter.setList(selectList);
                             adapter.notifyDataSetChanged();
-                            progressDialog.setTitle(showTitle);
+                            if (progressType==1){
+                                progressDialog.setTitle(showTitle);
+                            }
+
 
                         }
                         break;
                     case 3:
                         //设置进度条
-                        progressDialog.setProgress(msg.arg1);
+                        if (progressType==1){
+                            progressDialog.setProgress(msg.arg2);
+                        }else{
+
+                        }
+
                         //progressDialog.show();
                         return;
                     case 4:

+ 3 - 1
app/src/main/java/com/fxy/main/fragment/HomePagerFragment.java

@@ -30,6 +30,7 @@ import com.fxy.login.LoginActivity;
 import com.fxy.net.MyDialogCallback;
 import com.fxy.net.Urls;
 import com.fxy.putIn.CheckGoodsMainActivity;
+import com.fxy.putIn.CheckUnpackingMainActivity;
 import com.fxy.putIn.PutinPalletMainActivity;
 import com.fxy.putIn.PutinPhotosMainActivity;
 import com.fxy.putIn.SortationMainActivity;
@@ -190,7 +191,8 @@ public class HomePagerFragment extends BaseFragment implements View.OnClickListe
                 intent2Page(getActivity(), OrderToolMainActivity.class, false,bundle);;
                 break;
             case R.id.ivt_check:
-                intent2Page(getActivity(), CheckGoodsMainActivity.class, false,bundle);;
+//                intent2Page(getActivity(), CheckGoodsMainActivity.class, false,bundle);;
+                intent2Page(getActivity(), CheckUnpackingMainActivity.class, false,bundle);;
                 break;
             case R.id.ivt_handle_work_order:
                 intent2Page(getActivity(), StartWorkOrderMainActivity.class, false,bundle);

+ 2 - 1
app/src/main/java/com/fxy/net/Urls.java

@@ -182,7 +182,8 @@ public class Urls {
     public static final String FXY_HK_PICKUP_CTNS = "/pda/HongkongOutbound/pickupCtns";
 
     //
-
+    //快递入库
+    public static final String FXY_PICTURE_CHECK = "/pda/inbound/pictureCheck";
 
     /*返修易 -- end*/
 

+ 476 - 0
app/src/main/java/com/fxy/putIn/CheckUnpackingMainActivity.java

@@ -0,0 +1,476 @@
+package com.fxy.putIn;
+
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.elvishew.xlog.XLog;
+import com.fxy.R;
+import com.fxy.baselibrary.base.BaseActivity;
+import com.fxy.baselibrary.bean.BaseEventBusBean;
+import com.fxy.baselibrary.interfaces.OnRxScanerListener;
+import com.fxy.baselibrary.qrcode.ActivityScanerCode;
+import com.fxy.baselibrary.util.JsonUtil;
+import com.fxy.baselibrary.util.StringUtils;
+import com.fxy.bean.ActionBean;
+import com.fxy.bean.ScanBean;
+import com.fxy.common.PictureSelectorUpload;
+import com.fxy.constant.BaseConfig;
+import com.fxy.constant.EventCode;
+import com.fxy.net.MyDialogCallback;
+import com.fxy.net.Urls;
+import com.fxy.view.FloatingImageView;
+import com.google.gson.Gson;
+import com.google.zxing.Result;
+import com.luck.picture.lib.config.PictureConfig;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.model.Response;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
+import sto.android.app.StoJNI;
+import sto.android.app.StoPdaKeyEvent;
+import sto.android.app.StoTongJNI;
+
+public class CheckUnpackingMainActivity extends  BaseActivity implements StoJNI.ScanCallBack{
+
+    /**
+     * 列表适配器
+     */
+    Context mContext = this;
+
+    @BindView(R.id.ll_take_picture)
+    LinearLayout llTakePicture;
+
+
+    private ArrayList photoList =new ArrayList<>();
+
+    private PictureSelectorUpload pictureSelectorUpload;
+    //
+    //扫码扫码动作
+    private ScanBean scanBean;
+
+
+    //浮动按钮
+    @BindView(R.id.iv_drag)
+    FloatingImageView iv_drag;
+
+
+
+    protected String action;
+
+
+    private Unbinder unbinder;
+
+    private JSONObject postParam = new JSONObject();
+
+
+    @Override
+    public int getContentViewResId() {
+        return R.layout.activity_fxy_check_unpacking;
+    }
+
+    @Override
+    public boolean showToolBar() {
+        return true;
+    }
+
+    @Override
+    public boolean openEventBus() {
+        return true;
+    }
+
+    @Override
+    protected void getBundleExtras(Bundle bundle) {
+        //XLog.e("接收数据解析:",bundle);
+        action = bundle.getString("action","add");
+    }
+
+
+
+    //finish的返回监听
+    //这里的requestCode参数,就是上面设置的 1 ,当跳转的页面返回的时候,通过这个加以判断
+    //resultCode ,这个参数是在跳转的页面里面规定的,它也是一个int类型的标志
+    //第三个参数包含了返回的值
+    //如果不需要所跳转的页面返回值,也就不需要这个方法了
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (resultCode == RESULT_OK) {
+            if (requestCode == PictureConfig.CHOOSE_REQUEST) {// 图片选择结果回调
+                pictureSelectorUpload.getSelectImg(data);
+            }
+        }
+    }
+
+    /**
+     * EventBus接收信息的方法,开启后才会调用(非粘性事件)
+     *
+     * @param event
+     */
+    @Override
+    protected void EventBean(BaseEventBusBean event) {
+//        XLog.e("----------接收返回--------------");
+//        XLog.e("接收返回:"+event.getEventCode());
+        if (event != null && event.getEventCode() == EventCode.displacement_refresh){
+
+        }
+    }
+
+    @Override
+    public boolean isPlayMusic() {
+        return true;
+    }
+
+
+    @Override
+    protected void initView() {
+        unbinder = ButterKnife.bind(this);
+        setTitleName("开箱查验");
+
+        initEdit();
+        iniData();
+
+        RecyclerView rvShowImg = (RecyclerView)llTakePicture.findViewById(R.id.rv_show_img);
+        pictureSelectorUpload  = setItemPicture("check_unpacking",rvShowImg,9,PictureConfig.TYPE_IMAGE);
+
+
+        //监听浮动按钮
+        iv_drag.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(!iv_drag.isDrag()){
+                    ActivityScanerCode.setScanerListener(mScanerListener);
+                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
+                }
+            }
+        });
+    }
+
+
+
+    /**
+     * 设置多个上传文件
+     * @param actionType String
+     * @param showImg RecyclerView
+     */
+    private PictureSelectorUpload setItemPicture(String actionType,RecyclerView showImg,int maxNum,int pictureType){
+        PictureSelectorUpload pictureUpload = new PictureSelectorUpload(CheckUnpackingMainActivity.this,showImg,"work",maxNum,pictureType);
+        pictureUpload.setActionType(actionType);
+        pictureUpload.setCompress(true,100,500);
+        pictureUpload.setOnlyCamera(true);
+        pictureUpload.setProgressType(2);
+        //showImg.onTouchEvent()
+
+        pictureUpload.setOnChangeListener(new PictureSelectorUpload.UploadChangeListener() {
+            @Override
+            public void uploadResult(boolean State,String actionType) {
+                if (State) {
+
+                }
+            }
+
+            @Override
+            public void uploadActionType(String actionType) {
+
+                System.out.println("actionType:"+actionType);
+
+            }
+        });
+        return  pictureUpload;
+    }
+
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        //XLog.e("event:"+event.getKeyCode());
+        if ((event.getKeyCode()==KeyEvent.KEYCODE_DPAD_CENTER || event.getKeyCode()==KeyEvent.KEYCODE_ENTER )  && event.getAction() == KeyEvent.ACTION_DOWN){
+            //按确定键
+            if(this.validate()){
+               pictureSelectorUpload.authCamera();
+            }
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    //监听按键
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        XLog.e("监听按键:"+keyCode);XLog.e(event);
+        if (scanBean.getIsBroadcast()==0 && StoTongJNI.getIns(mContext).getEventFuction(keyCode)  == StoPdaKeyEvent.KEYCODE_SCAN
+                && event.getRepeatCount() == 0) {
+
+            if (StoTongJNI.getIns(mContext).GetScannerIsScanning()) {
+//
+            } else {
+                StoTongJNI.getIns(mContext).SetScannerStart();
+            }
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @SuppressLint("HandlerLeak")
+    Handler scanHandler = new Handler() {
+
+        @Override
+        public void handleMessage(Message msg) {
+            // TODO Auto-generated method stub
+            if (msg.obj != null) {
+
+                String scanResult = msg.obj.toString().trim();
+                if (!scanResult.isEmpty()){
+                    setScanResult(scanResult);
+                }
+            }
+
+        }
+
+    };
+    @Override
+    public void onScanResults(String str) {
+        Message msg = new Message();
+        msg.obj = str;
+        scanHandler.sendMessage(msg);
+
+
+    }
+
+
+    @Override
+    public void onScanResults(String str, int type) {
+
+    }
+    /**
+     * 定义广播接受
+     */
+    BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String scanResult = intent.getStringExtra(scanBean.getDataName());
+            if (scanResult==null){return; }
+            String scanStatus = "";
+            if (!scanBean.getStatusName().isEmpty()){
+                scanStatus = intent.getStringExtra(scanBean.getStatusName());
+            }else{
+                scanStatus = scanResult.isEmpty()? "" : "ok"; //有值 默认是扫码成功;
+            }
+
+            //新大陆(MT65,MT90) 需要手动关闭
+            if (!scanBean.getActionStop().isEmpty()){
+                Intent stopIntent = new Intent(scanBean.getActionStop());
+                mContext.sendBroadcast(stopIntent);
+            }
+
+            if ("ok".equals(scanStatus)){
+                setScanResult(scanResult);
+            }else{
+                showErrorToast(getString(R.string.scan_failed));
+            }
+        }
+    };
+
+    /**
+     * 注册广播
+     */
+    private void initReceiver(){
+
+        try {
+
+            String scanStr = getScanSetting();
+            scanBean = JsonUtil.getObject(scanStr, ScanBean.class);
+            Integer is_broadcast = scanBean.getIsBroadcast();//是否广播
+
+            if (is_broadcast ==1){
+                IntentFilter mFilter = new IntentFilter(scanBean.getAction());
+                this.registerReceiver(mReceiver, mFilter);
+            }else{
+                //不广播进行处理 jni模式
+                String pdaBrand = StoTongJNI.getmPdaBrand();
+                if (!pdaBrand.isEmpty()){
+                    StoTongJNI.getIns(this).setmScanCB(this);
+                    StoTongJNI.getIns(this).SetScannerOn();
+                }
+            }
+
+
+        }catch (Exception e) {
+            showErrorToast("获取扫码配置失败"+e.getMessage());
+            XLog.e("获取扫码配置失败:" + e.getMessage());
+        }
+    }
+
+    private void initEdit() {
+
+    }
+
+
+    private void iniData(){
+
+    }
+
+
+
+    private OnRxScanerListener mScanerListener = new OnRxScanerListener() {
+        @Override
+        public void onSuccess(String type, Result result) {
+            String scanResult = result.getText();
+            switch (type){
+                case BaseConfig.COMMON_SCANNER_ONLY:
+                    setScanResult(scanResult);
+
+                    break;
+            }
+        }
+        @Override
+        public void onFail(String type, String message) {
+
+        }
+    };
+
+    //把扫描结果赋值
+    private void setScanResult(String scanResult){
+        //获取焦点的view对象
+        View view=getWindow().getDecorView().findFocus();
+        //如果是EditText
+        if(view instanceof EditText)
+        {
+            ((EditText) view).setText(scanResult);
+
+            switch (view.getId()) {
+
+                default:
+            }
+
+
+        }
+    }
+
+
+    private void pictureInbound(){
+        if (!validate()){
+            return;
+        }
+
+
+        if (!checkRepeat(Urls.FXY_PICTURE_CHECK+(postParam.toString()))){
+            Toast.makeText(this, getString(R.string.error_data_processed), Toast.LENGTH_LONG).show();
+            return;
+        }
+
+
+
+        OkGo.<String>post(Urls.getServiceAddress(this) + Urls.FXY_PICTURE_CHECK).upJson(postParam)
+                .execute(new MyDialogCallback(this, true, true) {
+                    @Override
+                    public void onSuccess(Response<String> response) {
+                        super.onSuccess(response);
+                        try {
+                            ActionBean bean = JsonUtil.getObject(response.body(), ActionBean.class);
+                            if(bean.code == 1){
+                                showSuccessToast(bean.msg);
+                                pictureSelectorUpload.emptyRemake();//清空图片
+                                photoList.clear();
+                            }else{
+                                showWarningToast(bean.msg);
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            XLog.e("添加开箱拆柜数据结果返回错误",e.getMessage());
+                        }
+                    }
+                });
+    }
+
+
+    /*
+     * 校验必录
+     */
+    private boolean validate(){
+        photoList = pictureSelectorUpload.getPhotoList();
+        try {
+            postParam = new JSONObject();
+            //检查是否拍照  工单处理时拍照拍照非必传
+            if (photoList.size()==0){
+                showWarningToast("请拍照上传");
+                return false;
+            }
+            Gson gson = new Gson();
+            postParam.put("photo",gson.toJson(photoList));
+
+        } catch (JSONException e) {
+            showWarningToast("系统异常"+e.getMessage());
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    //sIsGoodinfoMatch,sIsBattery,sIsMagnetic,sIsWood,sIsExtra,sIsOther
+    @OnClick({R.id.btn_confirm,R.id.btn_photos})
+    public void onViewClicked(View view) {
+        Bundle bundle = new Bundle();
+        switch (view.getId()) {
+            case R.id.btn_photos:
+                pictureSelectorUpload.authCamera();
+                break;
+           case R.id.btn_confirm:
+                pictureInbound();
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        unbinder.unbind();
+        pictureSelectorUpload.removeHandler();
+        super.onDestroy();
+    }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initReceiver();
+    }
+    @Override
+    protected void onPause() {
+        super.onPause();
+        //销毁在onResume()方法中的广播
+        try {
+            //停止扫描
+            Integer is_broadcast = scanBean.getIsBroadcast();//是否广播
+            if (is_broadcast==0){
+                StoTongJNI.getIns(mContext).SetScannerStop();
+                StoTongJNI.getIns(mContext).SetScannerOff();
+            }else{
+                unregisterReceiver(mReceiver);
+            }
+        }catch (Exception e){
+            XLog.e("销毁广播失败:",e.getMessage());
+        }
+    }
+
+}

+ 1 - 1
app/src/main/java/com/fxy/putIn/PutinPalletMainActivity.java

@@ -114,7 +114,7 @@ public class PutinPalletMainActivity extends  BaseActivity implements StoJNI.Sca
 
     @Override
     protected void getBundleExtras(Bundle bundle) {
-        XLog.e("接收数据解析:",bundle);
+        //XLog.e("接收数据解析:",bundle);
         action = bundle.getString("action","add");
     }
 

+ 1 - 1
app/src/main/java/com/fxy/putIn/PutinPhotosMainActivity.java

@@ -622,7 +622,7 @@ public class PutinPhotosMainActivity extends  BaseActivity implements StoJNI.Sca
                     case 3:
 
                         //XLog.e("上传进度"+msg.arg1);
-                        setUploadProgress(msg.arg1);
+                        setUploadProgress(msg.arg2);
                         //设置进度条
                         //progressDialog.show();
                         return;

+ 115 - 0
app/src/main/res/layout/activity_fxy_check_unpacking.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/md_grey_100"
+    android:orientation="vertical">
+    <ScrollView
+        android:id="@+id/ll_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+
+            <LinearLayout
+                android:id="@+id/ll_take_picture"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:background="@null"
+                    android:visibility="gone"
+                    android:padding="@dimen/dp_10"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+                    <TextView
+                        style="@style/fontSize"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textStyle="bold"
+                        android:text="拍照">
+                    </TextView>
+                </LinearLayout>
+                <include layout="@layout/fragment_show_img"/>
+            </LinearLayout>
+
+
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_4"
+                android:background="@drawable/bg_white_et"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:layout_gravity="bottom"
+                android:visibility="gone"
+                android:padding="10dp">
+                <TextView
+                    style="@style/fontSize"
+                    android:id="@+id/btn_photos"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:background="@drawable/bg_orange_item"
+                    android:gravity="center"
+                    android:text="快递入库"
+                    android:padding="10dp"
+                    android:textColor="@color/white"
+                    android:visibility="visible" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_4"
+                android:background="@drawable/bg_white_et"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:layout_gravity="bottom"
+                android:padding="10dp">
+                <TextView
+                    style="@style/fontSize"
+                    android:id="@+id/btn_confirm"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:background="@drawable/bg_orange_item"
+                    android:gravity="center"
+                    android:text="确认提交"
+                    android:padding="10dp"
+                    android:textColor="@color/white"
+                    android:visibility="visible" />
+            </LinearLayout>
+            <include layout="@layout/item_float_image" />
+        </LinearLayout>
+
+
+    </ScrollView>
+
+
+</LinearLayout>

+ 12 - 0
app/src/main/res/layout/item_filter_image.xml

@@ -17,6 +17,18 @@
             android:scaleType="centerCrop"
             android:src="@color/color_f6"/>
 
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:progress="80"
+            android:max="100"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentStart="true"
+            android:visibility="gone"
+            />
+
         <LinearLayout
             android:id="@+id/ll_del"
             android:layout_width="30dp"

+ 1 - 1
config.gradle

@@ -10,7 +10,7 @@ ext {
             versionCode      : 1,
             versionName      : "2.7.0",
             versionApi       : "2.7",
-            versionRealm     : 1,
+            versionRealm     : 2,
     ]
 
     dependencies = [