蓝牙部分修改

app/build.gradle

@@ -81,6 +81,7 @@ dependencies {
     implementation  'com.umeng.umsdk:common:9.4.0'// 必选
     implementation  'com.umeng.umsdk:asms:1.2.3'// 必选
     implementation 'com.umeng.umsdk:apm:1.4.0' // 错误分析升级为独立SDK，看crash数据请一定集成，可选
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
 }
 
 def getVersionName() {

app/src/main/AndroidManifest.xml

@@ -15,12 +15,14 @@
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
     <application
         android:name=".application.PdaApplication"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
-        android:label="@string/my_app_name_test"
+        android:label="@string/my_app_name"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="icon,label,theme">

app/src/main/java/com/uas/uaspda/activity/IndexActivity.java

@@ -63,7 +63,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         //请求储位
         VolleyUtil.requestGetUseLocationOrNot(getApplicationContext(), GloableParams.ADDRESS_GET_FIELD_DATA,
                 VolleyUtil.METHOD_POST, pageType);

app/src/main/java/com/uas/uaspda/fragment/BlueToothPrintFragment.java

@@ -24,7 +24,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.uas.bluetooth.ConnectHelper;
-import com.uas.bluetooth.PrintHelper;
 import com.uas.uaspda.R;
 import com.uas.uaspda.activity.FunctionActivity;
 import com.uas.uaspda.adapter.BluetoothAdapter;
@@ -43,7 +42,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import HPRTAndroidSDKA300.HPRTPrinterHelper;
 import vn.luongvo.widget.iosswitchview.SwitchView;
 
 import static android.app.Activity.RESULT_OK;
@@ -143,7 +141,6 @@ public class BlueToothPrintFragment extends BaseFragment {
                     };
 
                     mMenuRecyclerView.setAdapter(mMenuAdapter);
-
                     mMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
                         @Override
                         public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
@@ -402,7 +399,6 @@ public class BlueToothPrintFragment extends BaseFragment {
                 progressDialog.show();
                 connectHelper.toConnectDeviceHY(device);
             }
-
         }
 
         @Override
@@ -441,7 +437,6 @@ public class BlueToothPrintFragment extends BaseFragment {
                 CommonUtil.toastNoRepeat(mActivity, "蓝牙开启成功");
             } else {
                 mSwitchView.setChecked(false);
-
                 CommonUtil.toastNoRepeat(mActivity, "蓝牙开启失败");
             }
             mSwitchView.setOnCheckedChangeListener(mOnCheckedChangeListener);

app/src/main/java/com/uas/uaspda/fragment/IndexSettingFragment.java

@@ -49,8 +49,11 @@ import com.uas.uaspda.util.AndroidUtil;
 import com.uas.uaspda.util.CommonUtil;
 import com.uas.uaspda.util.Constants;
 import com.uas.uaspda.util.FileUtils;
+import com.uas.uaspda.util.HttpCallback;
+import com.uas.uaspda.util.HttpParams;
 import com.uas.uaspda.util.JsonTools;
 import com.uas.uaspda.util.LogUtil;
+import com.uas.uaspda.util.VolleyRequest;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -255,7 +258,7 @@ public class IndexSettingFragment extends BaseFragment implements View.OnClickLi
         mAccountBookTv.setText(mAccountName);
         mIpAddressTv.setText(mAccountName + "(" + mIp + ")");
         mVersionTextView.setText(AndroidUtil.getVersionName(mActivity));
-
+//        searchLocation();
 //        SharedPreUtil.saveString(getActivity(), SharedPreUtil.KEY_URI, cacheUri);
         /*String keyCache = SharedPreUtil.getString(getActivity(), SharedPreUtil.KEY_URI);
         try {
@@ -690,6 +693,29 @@ public class IndexSettingFragment extends BaseFragment implements View.OnClickLi
         mRequestQueue.add(mJsonRequest);
 
     }
+    private void searchLocation() {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_CHECK_LOCATIONCHECKS)
+                .method(Request.Method.POST)
+                .addParam("id","157023")
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+
 
     private void closeAccountBookPop() {
         if (mAccountBookPop != null) {

app/src/main/java/com/uas/uaspda/fragment/SCSMTCheckFragment.java

@@ -476,7 +476,7 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
 
 
     private void confirmEvent(final String collect) {
-        final String location = mLocationTextView.getText().toString().trim();
+        final String location = mLocationTextView.getText().toString().trim();//站位
 
         if (TextUtils.isEmpty(location)) {
             locationCheck(collect, location);

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

@@ -222,6 +222,7 @@ public class GloableParams {
     public static String ADDRESS_SPM_GETLINE;
     public static String ADDRESS_SMT_FORECASTDATACHECK;
     public static String ADDRESS_CHECK_LOCATIONCHECK;
+    public static String ADDRESS_CHECK_LOCATIONCHECKS;
 
 
     //连接服务器请求地址
@@ -433,6 +434,8 @@ public class GloableParams {
     // 货物查询：储位信息查询
     private static final String ADDRESSTAIL_CHECK_LOCATIONCHECK = "/api/pda/check/locationCheck.action";
 
+    private static final String ADDRESSTAIL_CHECK_LOCATIONCHECKS = "/common/downloadbyId.action";
+
 
     // 仓库管理:拆批合批，页面二：分拆批次页面
     private static final String ADDRESSTAIL_BARCODEENTEREVENT = "/api/pda/batch/getBarcodeData.action";
@@ -993,5 +996,7 @@ public class GloableParams {
         GloableParams.ADDRESS_SPM_GETLINE = uriHead + GloableParams.ADDRESSTAIL_SPM_GETLINE;
         GloableParams.ADDRESS_SMT_FORECASTDATACHECK = uriHead + GloableParams.ADDRESSTAIL_SMT_FORECASTDATACHECK;
         GloableParams.ADDRESS_CHECK_LOCATIONCHECK = uriHead + GloableParams.ADDRESSTAIL_CHECK_LOCATIONCHECK;
+        GloableParams.ADDRESS_CHECK_LOCATIONCHECKS = uriHead + GloableParams.ADDRESSTAIL_CHECK_LOCATIONCHECKS;
+
     }
 }

app/src/main/java/com/uas/uaspda/tools/VolleyUtil.java

@@ -1930,6 +1930,7 @@ public class VolleyUtil {
         }
         if (username != null && password != null && currentMaster != null) {
             cookieHeader.append("j_username=" + username + ";j_password=" + password + ";master=" + currentMaster);
+
             paramHead.put("j_username", username);
             paramHead.put("j_password", password);
             paramHead.put("master", currentMaster);

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

@@ -69,6 +69,14 @@ public class PrintUtils {
                                             .setTextFont(textFont)
                                             .build();
                                     break;
+                                case "qrcode"://打印二维码
+                                    printHelper = printHelper.printQr(printText)
+                                            .setX(printX)
+                                            .setY(printY)
+                                            .setTextSize(fontSize)
+                                            .setModel(2)
+                                            .build();
+                                    break;
                             }
                         }
                     }

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

@@ -57,9 +57,6 @@
                 style="@style/EditTextStyle"
                 android:layout_width="0dp"
                 android:layout_weight="1"
-                android:enabled="false"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
                 android:hint="请输入数量"
                 android:inputType="numberDecimal"
                 android:textColor="@color/black"/>