Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/release/com/handmark/pulltorefresh/library/BuildConfig.java
#	pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
#	pda_libs/pulltoreflashlibrary/build/intermediates/incremental/mergeReleaseShaders/merger.xml
#	pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
#	pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseAssets/merger.xml
#	pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
#	pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values/values.xml
#	pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merger.xml
#	pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values/values.xml
#	pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-release-report.txt

app/build.gradle

@@ -45,10 +45,10 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_MES_STORAGE_RELEASE_${releaseInfo}.apk"
+                    fileName = "RUIZI_UAS_MES${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
-                    fileName = "UAS_MES_STORAGE_DEBUG_${debugInfo}.apk"
+                    fileName = "RUIZI_UAS_MES_DEBUG_${debugInfo}.apk"
                 }
                 outputFileName = fileName
             }

app/src/main/java/com/uas/rxusames/activity/FunctionActivity.java

@@ -112,7 +112,6 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
         }catch (Exception e){
 
         }
-
         //加载对应的Fragment
         //防止系统内存不足将activity回收时产生Fragment重叠的问题
         if (savedInstanceState == null) {

app/src/main/java/com/uas/rxusames/activity/MainActivity.java

@@ -37,6 +37,7 @@ public class MainActivity extends BaseActivity implements BackHandlerInterface {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 //        smoothSwitchScreen();
+
         CommonUtil.initStatusBar(this, android.R.color.darker_gray);
         setContentView(R.layout.activity_main);
 

app/src/main/java/com/uas/rxusames/fragment/PreProcessingReportFragment.java

@@ -2,20 +2,27 @@ package com.uas.rxusames.fragment;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.util.SparseBooleanArray;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -25,19 +32,28 @@ import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.uas.rxusames.R;
 import com.uas.rxusames.activity.FunctionActivity;
+import com.uas.rxusames.bean.CaiPiBlueBean;
 import com.uas.rxusames.bean.MaintainitemBean;
 import com.uas.rxusames.global.GloableParams;
 import com.uas.rxusames.tools.SharedPreUtil;
 import com.uas.rxusames.util.CommonUtil;
+import com.uas.rxusames.util.Constants;
 import com.uas.rxusames.util.FastjsonUtil;
+import com.uas.rxusames.util.FragmentUtils;
 import com.uas.rxusames.util.HttpCallback;
 import com.uas.rxusames.util.HttpParams;
 import com.uas.rxusames.util.LogUtil;
+import com.uas.rxusames.util.PrintUtils;
+import com.uas.rxusames.util.StringUtil;
+import com.uas.rxusames.util.VolleyRequest;
 import com.uas.rxusames.util.VollyRequest;
+import com.uas.rxusames.view.ClearableEditText;
+import com.vincent.filepicker.ToastUtil;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by RaoMeng on 2024/05/27
@@ -53,6 +69,15 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
     private String ma_code;
     private String sc_code;
     private TextView tv_ma_code;
+    private ClearableEditText ct_qty;
+    private ClearableEditText ct_sum;
+    private List<CaiPiBlueBean.DataBean> messages = new ArrayList<>();
+    private PopupWindow splitPop;
+    private boolean isConnected = false;
+    private boolean isPrinting = false;
+    private int mPrintDpi = 203;
+    private JSONArray dataArray;
+    private Button btn_oneprint;
 
     @Override
     protected int getLayout() {
@@ -65,16 +90,46 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
         mRecyclerView = root.findViewById(R.id.feeded_rv);
         tv_ma_code = root.findViewById(R.id.tv_ma_code);
+        ct_qty = root.findViewById(R.id.ct_qty);
+        ct_sum = root.findViewById(R.id.ct_sum);
+        btn_oneprint = root.findViewById(R.id.btn_oneprint);
         jlt_storage_in_barcode_save_btn = root.findViewById(R.id.jlt_storage_in_barcode_save_btn);
     }
 
 
-
+    public static String removeBrackets(String input) {
+        // 去除前后的中括号
+        if (input.startsWith("[") && input.endsWith("]")) {
+            input = input.substring(1, input.length() - 1);
+        }
+        return input;
+    }
     @Override
     protected void initEvents() {
+        getPrintTemplate();
+        btn_oneprint.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+
+                if (dataArray != null && dataArray.size() > 0) {
+                    printEvent(dataArray);
+                }else {
+                    CommonUtil.toastNoRepeat(mActivity, "数据为空");
+                }
+            }
+        });
+
+
+
+
         jlt_storage_in_barcode_save_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (StringUtil.isEmpty(ct_sum.getText().toString().trim())){
+                    CommonUtil.toastNoRepeat(mActivity, "请输入报工数");
+                    return;
+                }
                 ArrayList<MaintainitemBean> selectedItem = myAdapter.getSelectedItem();
                 if (selectedItem==null||selectedItem.size()==0){
                     CommonUtil.toastNoRepeat(mActivity, "请选择料号");
@@ -172,13 +227,18 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
                         .addParam("ma_code",ma_code)
                         .addParam("sc_code",sc_code)
                         .addParam("prods",prods)
+                        .addParam("decode",ct_qty.getText().toString().trim())
+                        .addParam("reportqty",ct_sum.getText().toString().trim())
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         progressDialog.dismiss();
-                        String data = FastjsonUtil.getText(o.toString(), "data");
-                        CommonUtil.toastNoRepeat(mActivity, data.toString()+"");
 
+                        dataArray = FastjsonUtil.getJSONArray(o.toString(), "data");
+
+                        ToastUtil.getInstance(mActivity).showToast("报工成功");
+//                        initBreakPopupWindow(dataArray);
+                        printEvent(dataArray);
                     }
 
                     @Override
@@ -194,6 +254,206 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
 
 
 
+    }
+    //org.json.
+    protected void initBreakPopupWindow(com.alibaba.fastjson.JSONArray listArray) {
+        messages.clear();
+        for (int i = 1; i < listArray.size(); i++) {
+            try {
+                com.alibaba.fastjson.JSONObject barcodeObject = listArray.getJSONObject(i);
+
+                if (barcodeObject != null) {
+                    CaiPiBlueBean.DataBean dataBean=new CaiPiBlueBean.DataBean();
+//                    dataBean.setLotno(JsonUtils.optStringNotNull(barcodeObject, "LOTNO"));
+//                    dataBean.setQty(JsonUtils.optStringNotNull(barcodeObject, "QTY"));
+                    dataBean.setLotno(barcodeObject.getString("LOTNO"));
+                    dataBean.setQty(barcodeObject.getString("QTY"));
+                    messages.add(dataBean);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+
+        View popView = LayoutInflater.from(getActivity()).inflate(R.layout.popupwindow_whbreaking_batch, null);
+        ListView listView = (ListView) popView.findViewById(R.id.list_view);
+        Button btnPrintf = (Button) popView.findViewById(R.id.btn_print);
+        Button btnPrintfSet = (Button) popView.findViewById(R.id.btn_print_setting);
+        Button btnClose = (Button) popView.findViewById(R.id.btn_close);
+        Button btnBack = (Button) popView.findViewById(R.id.btn_back);
+
+        btnBack.setVisibility(View.GONE);
+        btnClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeSplitPopupWindow();
+//                }
+            }
+        });
+        btnPrintf.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (isConnected) {
+                    progressDialog.show();
+                    listArray.remove(0);
+                    printEvent(listArray);
+                } else {
+                    closeSplitPopupWindow();
+                    BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                    Bundle bundle = new Bundle();
+                    bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, listArray.toString());
+                    Log.e("listArrayone",listArray.toString());
+                    blueToothPrintFragment.setArguments(bundle);
+                    FragmentUtils.switchFragment(PreProcessingReportFragment.this, blueToothPrintFragment);
+                }
+            }
+        });
+
+        btnPrintfSet.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeSplitPopupWindow();
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, listArray.toString());
+                Log.e("listArraytwo",listArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(PreProcessingReportFragment.this, blueToothPrintFragment);
+            }
+        });
+        MyAdapter adapter = new MyAdapter(getActivity(), R.layout.item_list_whbreakingbatchfragment, messages);
+        listView.setAdapter(adapter);
+        //当只有一条数据的时候可以加上
+        /*
+        if (messages.size()>1){
+            btnBack.setVisibility(View.GONE);
+        }*/
+        // PopupWindow实例化，参数的意思是 view,长（不包括状态栏），高（不包括状态栏），是否聚焦
+        splitPop = new PopupWindow(popView, LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        splitPop.setAnimationStyle(R.style.MenuAnimationFade);
+        splitPop.setBackgroundDrawable(new BitmapDrawable());
+        // 弹出窗口显示内容视图,默认以锚定视图的左下角为起点，这里为点击按钮
+        splitPop.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+        splitPop.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeSplitPopupWindow();
+//                specialOut();
+            }
+        });
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+
+    }
+    private void closeSplitPopupWindow() {
+        if (splitPop != null) {
+            splitPop.dismiss();
+            splitPop = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+    private void getPrintTemplate() {
+        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_BARINFO_PRINTMODEL)
+                        .method(Request.Method.GET)
+                        .flag(0)
+                        .tag("barinfoPrint")
+                        .addParam("caller", "PreBarcode")//Barcode!PDAPrint仓库
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        try {
+                            String result = o.toString();
+                            Log.e("prints", result);
+                            if (FastjsonUtil.validate(result)) {
+                                JSONObject resultObject = JSON.parseObject(result);
+                                JSONArray dataArray = resultObject.getJSONArray("data");
+                                if (dataArray != null && dataArray.size() > 0) {
+                                    SharedPreUtil.saveString(mActivity, Constants.FLAG.PRINT_TEMPLATE_CACHE, dataArray.toJSONString());
+                                }
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        Log.e("printf", failStr);
+                    }
+                });
+    }
+
+    private void printEvent(com.alibaba.fastjson.JSONArray printArray) {
+        if (isPrinting) {
+            CommonUtil.toastNoRepeat(mActivity, "正在打印中，请勿重复操作");
+            return;
+        }
+        isPrinting = true;
+        if (printArray != null && printArray.size() > 0) {
+            boolean isFail = false;
+            for (int i = 0; i < printArray.size(); i++) {
+                try {
+                    JSONObject printObject = printArray.getJSONObject(i);
+                    int printResult = PrintUtils.printBar(mActivity, printObject.toString(), mPrintDpi, null);
+                    if (printResult <= 0) {
+                        isFail = true;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            closeSplitPopupWindow();
+            progressDialog.dismiss();
+            if (isFail) {
+                isConnected = false;
+                SharedPreUtil.saveInt(mActivity, "printConnect", 0);
+                CommonUtil.toastNoRepeat(mActivity, "打印失败，请重新连接打印机");
+
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, printArray.toString());
+                Log.e("listArraythree",printArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(PreProcessingReportFragment.this, blueToothPrintFragment);
+            } else {
+                CommonUtil.toastNoRepeat(mActivity, "打印成功");
+            }
+        } else {
+            CommonUtil.toastNoRepeat(mActivity, "打印失败，条码数据为空");
+        }
+        isPrinting = false;
+    }
+
+
+
+
+
+    private class MyAdapter extends ArrayAdapter<CaiPiBlueBean.DataBean> {
+        private int resourceId;
+
+        public MyAdapter(Context context, int resource, List<CaiPiBlueBean.DataBean> objects) {
+            super(context, resource, objects);
+            resourceId = resource;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            CaiPiBlueBean.DataBean person = getItem(position);
+            convertView = LayoutInflater.from(getContext()).inflate(resourceId,
+                    null);
+            TextView tv_bar_code = (TextView) convertView.findViewById(R.id.tv_bar_code);
+            TextView tv_bar_remain = (TextView) convertView.findViewById(R.id.tv_bar_remain);
+            tv_bar_code.setText(person.getLotno());
+            tv_bar_remain.setText(person.getQty());
+            return convertView;
+        }
     }
     @Override
     public void onHiddenChanged(boolean hidden) {

app/src/main/java/com/uas/rxusames/global/GloableParams.java

@@ -1091,7 +1091,8 @@ public class GloableParams {
 //           GRIDNAME_CHAI_PI,
            GRIDNAME_TIAO_ZHAN,
            GRIDNAME_BAD_EXCHANGE,
-           GRIDNAME_BAD_PRE_PROCESSING_REPORT
+           GRIDNAME_BAD_PRE_PROCESSING_REPORT,
+           GRIDNAME_TIME_REPORT
    };
 
     public static int[] indexMainGridImgs = {
@@ -1104,7 +1105,8 @@ public class GloableParams {
 //            R.drawable.storage_bach_operation,
             R.drawable.index_smt_up,
             R.mipmap.badchange,
-            R.mipmap.iv_processing
+            R.mipmap.iv_processing,
+            R.drawable.bgong
 
     };
 

app/src/main/java/com/uas/rxusames/util/PrintUtils.java

@@ -25,7 +25,7 @@ public class PrintUtils {
             int offset = 6,
                     h = 400,
                     v = 800,
-                    height = 400,
+                    height = 310,//400
                     qty = 1;
 
             JSONArray templateArray = JSON.parseArray(printTemplate);

app/src/main/res/layout/fragment_pre_processing_report.xml

@@ -5,6 +5,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+    <Button
+        android:id="@+id/btn_oneprint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="打印">
+    </Button>
     <LinearLayout
         android:layout_weight="1"
         android:orientation="vertical"
@@ -63,7 +69,32 @@
                 android:textColor="@color/black"
                 />
         </LinearLayout>
-
+        <LinearLayout
+            android:padding="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:text="报工数"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="right">
+            </TextView>
+            <com.uas.rxusames.view.ClearableEditText
+                android:id="@+id/ct_sum"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请输入报工数量"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black"
+                />
+        </LinearLayout>
         <android.support.v7.widget.RecyclerView
             android:layout_marginLeft="@dimen/dp_10"
             android:layout_marginRight="@dimen/dp_10"
@@ -78,6 +109,6 @@
         android:layout_width="match_parent"
         android:layout_margin="12dp"
         android:layout_alignParentBottom="true"
-        android:text="保存" />
+        android:text="报工" />
 
 </LinearLayout>

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/release/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -5,6 +5,9 @@ package com.handmark.pulltorefresh.library;
 
 public final class BuildConfig {
   public static final boolean DEBUG = false;
-  public static final String LIBRARY_PACKAGE_NAME = "com.handmark.pulltorefresh.library";
+  public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "release";
+  public static final String FLAVOR = "";
+  public static final int VERSION_CODE = 11;
+  public static final String VERSION_NAME = "v1.0.1";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-ar/values-ar.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">اسحب للتحديث…</string>
-    <string name="pull_to_refresh_refreshing_label">تحميل…</string>
-    <string name="pull_to_refresh_release_label">اترك للتحديث…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-cs/values-cs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Tažením aktualizujete…</string>
-    <string name="pull_to_refresh_refreshing_label">Načítání…</string>
-    <string name="pull_to_refresh_release_label">Uvolněním aktualizujete…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-de/values-de.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Ziehen zum Aktualisieren…</string>
-    <string name="pull_to_refresh_refreshing_label">Laden…</string>
-    <string name="pull_to_refresh_release_label">Loslassen zum Aktualisieren…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-es/values-es.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Tirar para actualizar…</string>
-    <string name="pull_to_refresh_refreshing_label">Cargando…</string>
-    <string name="pull_to_refresh_release_label">Soltar para actualizar…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-fi/values-fi.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_from_bottom_pull_label">Päivitä vetämällä ylös…</string>
-    <string name="pull_to_refresh_from_bottom_refreshing_label">@string/pull_to_refresh_refreshing_label</string>
-    <string name="pull_to_refresh_from_bottom_release_label">@string/pull_to_refresh_release_label</string>
-    <string name="pull_to_refresh_pull_label">Päivitä vetämällä alas…</string>
-    <string name="pull_to_refresh_refreshing_label">Päivitetään…</string>
-    <string name="pull_to_refresh_release_label">Päivitä vapauttamalla…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-fr/values-fr.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Tirez pour rafraîchir…</string>
-    <string name="pull_to_refresh_refreshing_label">Chargement…</string>
-    <string name="pull_to_refresh_release_label">Relâcher pour rafraîchir…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-he/values-he.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">משוך לרענון…</string>
-    <string name="pull_to_refresh_refreshing_label">טוען…</string>
-    <string name="pull_to_refresh_release_label">שחרר לרענון…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-it/values-it.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Tira per aggiornare…</string>
-    <string name="pull_to_refresh_refreshing_label">Caricamento…</string>
-    <string name="pull_to_refresh_release_label">Rilascia per aggionare…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-iw/values-iw.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">משוך לרענון…</string>
-    <string name="pull_to_refresh_refreshing_label">טוען…</string>
-    <string name="pull_to_refresh_release_label">שחרר לרענון…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-ja/values-ja.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">画面を引っ張って…</string>
-    <string name="pull_to_refresh_refreshing_label">読み込み中…</string>
-    <string name="pull_to_refresh_release_label">指を離して更新…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-ko/values-ko.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">당겨서 새로 고침…</string>
-    <string name="pull_to_refresh_refreshing_label">로드 중…</string>
-    <string name="pull_to_refresh_release_label">놓아서 새로 고침…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-nl/values-nl.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Sleep om te vernieuwen…</string>
-    <string name="pull_to_refresh_refreshing_label">Laden…</string>
-    <string name="pull_to_refresh_release_label">Loslaten om te vernieuwen…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-pl/values-pl.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Pociągnij, aby odświeżyć…</string>
-    <string name="pull_to_refresh_refreshing_label">Wczytywanie…</string>
-    <string name="pull_to_refresh_release_label">Puść, aby odświeżyć…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-pt-rBR/values-pt-rBR.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Puxe para atualizar…</string>
-    <string name="pull_to_refresh_refreshing_label">Carregando…</string>
-    <string name="pull_to_refresh_release_label">Libere para atualizar…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-pt/values-pt.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Puxe para atualizar…</string>
-    <string name="pull_to_refresh_refreshing_label">A carregar…</string>
-    <string name="pull_to_refresh_release_label">Liberação para atualizar…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-ro/values-ro.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Trage pentru a reîmprospăta…</string>
-    <string name="pull_to_refresh_refreshing_label">Încărcare…</string>
-    <string name="pull_to_refresh_release_label">Eliberează pentru a reîmprospăta…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-ru/values-ru.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Потяните для обновления…</string>
-    <string name="pull_to_refresh_refreshing_label">Загрузка…</string>
-    <string name="pull_to_refresh_release_label">Отпустите для обновления…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/merged.dir/values-zh/values-zh.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">下拉刷新…</string>
-    <string name="pull_to_refresh_refreshing_label">正在载入…</string>
-    <string name="pull_to_refresh_release_label">放开以刷新…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/anim/slide_in_from_bottom.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_longAnimTime"
-    android:fromYDelta="100%p"
-    android:toYDelta="0" />

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/anim/slide_in_from_top.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_longAnimTime"
-    android:fromYDelta="-100%p"
-    android:toYDelta="0" />

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/anim/slide_out_to_bottom.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_longAnimTime"
-    android:fromYDelta="0"
-    android:toYDelta="100%p" />

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/anim/slide_out_to_top.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_longAnimTime"
-    android:fromYDelta="0"
-    android:toYDelta="-100%p" />

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/drawable/indicator_bg_bottom.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <solid android:color="#40000000" />
-
-    <!--
-    I know the android:radius is useless here but it's needed to fix an old bug:
-    http://code.google.com/p/android/issues/detail?id=939
-    -->
-    <corners
-        android:bottomLeftRadius="0dp"
-        android:bottomRightRadius="0dp"
-        android:radius="1dp"
-        android:topLeftRadius="@dimen/indicator_corner_radius"
-        android:topRightRadius="@dimen/indicator_corner_radius" />
-
-</shape>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/drawable/indicator_bg_top.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <solid android:color="#40000000" />
-
-    <!--
-    I know the android:radius is useless here but it's needed to fix an old bug:
-    http://code.google.com/p/android/issues/detail?id=939
-    -->
-    <corners
-        android:bottomLeftRadius="@dimen/indicator_corner_radius"
-        android:bottomRightRadius="@dimen/indicator_corner_radius"
-        android:radius="1dp"
-        android:topLeftRadius="0dp"
-        android:topRightRadius="0dp" />
-
-</shape>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/layout/pull_to_refresh_header_horizontal.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <FrameLayout
-        android:id="@+id/fl_inner"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:paddingBottom="@dimen/header_footer_top_bottom_padding"
-        android:paddingLeft="@dimen/header_footer_left_right_padding"
-        android:paddingRight="@dimen/header_footer_left_right_padding"
-        android:paddingTop="@dimen/header_footer_top_bottom_padding" >
-
-        <ImageView
-            android:id="@+id/pull_to_refresh_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
-
-        <ProgressBar
-            android:id="@+id/pull_to_refresh_progress"
-            style="?android:attr/progressBarStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:indeterminate="true"
-            android:visibility="gone" />
-    </FrameLayout>
-
-</merge>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/layout/pull_to_refresh_header_vertical.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <FrameLayout
-        android:id="@+id/fl_inner"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/header_footer_top_bottom_padding"
-        android:paddingLeft="@dimen/header_footer_left_right_padding"
-        android:paddingRight="@dimen/header_footer_left_right_padding"
-        android:paddingTop="@dimen/header_footer_top_bottom_padding" >
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left|center_vertical" >
-
-            <ImageView
-                android:id="@+id/pull_to_refresh_image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center" />
-
-            <ProgressBar
-                android:id="@+id/pull_to_refresh_progress"
-                style="?android:attr/progressBarStyleSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:indeterminate="true"
-                android:visibility="gone" />
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center_horizontal"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/pull_to_refresh_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearance"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/pull_to_refresh_sub_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:visibility="gone" />
-        </LinearLayout>
-    </FrameLayout>
-
-</merge>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-ar/values-ar.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">اسحب للتحديث…</string>
-    <string name="pull_to_refresh_refreshing_label">تحميل…</string>
-    <string name="pull_to_refresh_release_label">اترك للتحديث…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-cs/values-cs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Tažením aktualizujete…</string>
-    <string name="pull_to_refresh_refreshing_label">Načítání…</string>
-    <string name="pull_to_refresh_release_label">Uvolněním aktualizujete…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-de/values-de.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Ziehen zum Aktualisieren…</string>
-    <string name="pull_to_refresh_refreshing_label">Laden…</string>
-    <string name="pull_to_refresh_release_label">Loslassen zum Aktualisieren…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-es/values-es.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Tirar para actualizar…</string>
-    <string name="pull_to_refresh_refreshing_label">Cargando…</string>
-    <string name="pull_to_refresh_release_label">Soltar para actualizar…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-fi/values-fi.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_from_bottom_pull_label">Päivitä vetämällä ylös…</string>
-    <string name="pull_to_refresh_from_bottom_refreshing_label">@string/pull_to_refresh_refreshing_label</string>
-    <string name="pull_to_refresh_from_bottom_release_label">@string/pull_to_refresh_release_label</string>
-    <string name="pull_to_refresh_pull_label">Päivitä vetämällä alas…</string>
-    <string name="pull_to_refresh_refreshing_label">Päivitetään…</string>
-    <string name="pull_to_refresh_release_label">Päivitä vapauttamalla…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-fr/values-fr.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Tirez pour rafraîchir…</string>
-    <string name="pull_to_refresh_refreshing_label">Chargement…</string>
-    <string name="pull_to_refresh_release_label">Relâcher pour rafraîchir…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-he/values-he.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">משוך לרענון…</string>
-    <string name="pull_to_refresh_refreshing_label">טוען…</string>
-    <string name="pull_to_refresh_release_label">שחרר לרענון…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-it/values-it.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Tira per aggiornare…</string>
-    <string name="pull_to_refresh_refreshing_label">Caricamento…</string>
-    <string name="pull_to_refresh_release_label">Rilascia per aggionare…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-iw/values-iw.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">משוך לרענון…</string>
-    <string name="pull_to_refresh_refreshing_label">טוען…</string>
-    <string name="pull_to_refresh_release_label">שחרר לרענון…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-ja/values-ja.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">画面を引っ張って…</string>
-    <string name="pull_to_refresh_refreshing_label">読み込み中…</string>
-    <string name="pull_to_refresh_release_label">指を離して更新…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-ko/values-ko.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">당겨서 새로 고침…</string>
-    <string name="pull_to_refresh_refreshing_label">로드 중…</string>
-    <string name="pull_to_refresh_release_label">놓아서 새로 고침…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-nl/values-nl.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Sleep om te vernieuwen…</string>
-    <string name="pull_to_refresh_refreshing_label">Laden…</string>
-    <string name="pull_to_refresh_release_label">Loslaten om te vernieuwen…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-pl/values-pl.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Pociągnij, aby odświeżyć…</string>
-    <string name="pull_to_refresh_refreshing_label">Wczytywanie…</string>
-    <string name="pull_to_refresh_release_label">Puść, aby odświeżyć…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-pt-rBR/values-pt-rBR.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Puxe para atualizar…</string>
-    <string name="pull_to_refresh_refreshing_label">Carregando…</string>
-    <string name="pull_to_refresh_release_label">Libere para atualizar…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-pt/values-pt.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Puxe para atualizar…</string>
-    <string name="pull_to_refresh_refreshing_label">A carregar…</string>
-    <string name="pull_to_refresh_release_label">Liberação para atualizar…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-ro/values-ro.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Trage pentru a reîmprospăta…</string>
-    <string name="pull_to_refresh_refreshing_label">Încărcare…</string>
-    <string name="pull_to_refresh_release_label">Eliberează pentru a reîmprospăta…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-ru/values-ru.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">Потяните для обновления…</string>
-    <string name="pull_to_refresh_refreshing_label">Загрузка…</string>
-    <string name="pull_to_refresh_release_label">Отпустите для обновления…</string>
-</resources>

pda_libs/pulltoreflashlibrary/build/intermediates/packaged_res/release/values-zh/values-zh.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="pull_to_refresh_pull_label">下拉刷新…</string>
-    <string name="pull_to_refresh_refreshing_label">正在载入…</string>
-    <string name="pull_to_refresh_release_label">放开以刷新…</string>
-</resources>