Browse Source

增加获取排位图功能

songw 5 months ago
parent
commit
fe74b47b73

+ 4 - 0
app/src/main/java/com/uas/baigang_workshop_workstation/activity/FunctionActivity.java

@@ -28,6 +28,7 @@ import com.uas.baigang_workshop_workstation.fragment.LabeLreprintingFragment;
 import com.uas.baigang_workshop_workstation.fragment.MSDManageFragment;
 import com.uas.baigang_workshop_workstation.fragment.ModifyBarcodeQuantityFragment;
 import com.uas.baigang_workshop_workstation.fragment.NewJltStorageInFilterListFragment;
+import com.uas.baigang_workshop_workstation.fragment.ObtainRankingChart;
 import com.uas.baigang_workshop_workstation.fragment.PostPunchFragment;
 import com.uas.baigang_workshop_workstation.fragment.PostStockFragment;
 import com.uas.baigang_workshop_workstation.fragment.PreProcessingReportFragment;
@@ -193,6 +194,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.FINISHED_PRODUCT_STORAGE://成品入库
                     fragment = new NewJltStorageInFilterListFragment();
                     break;
+                case GloableParams.OBTAIN_RANKING_CHART://获取排位图
+                    fragment = new ObtainRankingChart();
+                    break;
                 //设置
                 case GloableParams.GRIDNAME_SETTING:
                     fragment = new IndexSettingFragment();

+ 2 - 4
app/src/main/java/com/uas/baigang_workshop_workstation/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);
@@ -97,7 +96,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-
                     }
 
                     @Override
@@ -119,7 +117,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 new int[]{R.id.griditem_img, R.id.griditem_name});
         menuGridView.setAdapter(adapter);
 
-
         View view = View.inflate(this, R.layout.pop_exit_application, null);
         mCancelTextView = (TextView) view.findViewById(R.id.pop_exit_cancel_tv);
         mMinimizeTextView = (TextView) view.findViewById(R.id.pop_exit_minimize_tv);
@@ -210,6 +207,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             isPower = true;
         }else if (GloableParams.FINISHED_PRODUCT_STORAGE.equals(itemName)) {
             isPower = true;
+        }else if (GloableParams.OBTAIN_RANKING_CHART.equals(itemName)) {
+            isPower = true;
         } else if (powerList != null) {
             for (int i = 0; i < powerList.size(); i++) {
                 String power = powerList.get(i);
@@ -260,7 +259,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             if (grantResults.length != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
                 //没有获取到权限
             } else {
-
             }
         }
     }

+ 114 - 0
app/src/main/java/com/uas/baigang_workshop_workstation/fragment/ObtainRankingChart.java

@@ -0,0 +1,114 @@
+package com.uas.baigang_workshop_workstation.fragment;
+
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.baigang_workshop_workstation.R;
+import com.uas.baigang_workshop_workstation.activity.FunctionActivity;
+import com.uas.baigang_workshop_workstation.global.GloableParams;
+import com.uas.baigang_workshop_workstation.util.CommonUtil;
+import com.uas.baigang_workshop_workstation.util.FastjsonUtil;
+import com.uas.baigang_workshop_workstation.util.HttpCallback;
+import com.uas.baigang_workshop_workstation.util.HttpParams;
+import com.uas.baigang_workshop_workstation.util.VolleyRequest;
+import com.uas.baigang_workshop_workstation.view.MySpinnerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public
+        /**
+         * Created by sw on 2025-06-30
+         */
+class ObtainRankingChart extends BaseFragment {
+
+    private MySpinnerView s_data;
+    private Button bt_get;
+    private TextView tv_result;
+    private String de_name = "";
+    private StringRequest mStringRequest;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fra_obtain_ranking_chart;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle("获取排位图");
+        s_data = root.findViewById(R.id.s_data);
+        bt_get = root.findViewById(R.id.bt_get);
+        tv_result = root.findViewById(R.id.tv_result);
+    }
+
+    @Override
+    protected void initEvents() {
+        bt_get.setOnClickListener(v -> {
+            getData();
+        });
+    }
+
+    private void getData() {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_OBTAIN_RANKING_CHART)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getMaCode")
+                        .flag(0)
+                        .addParam("de_name", de_name)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            CommonUtil.toastNoRepeat(mActivity, "获取成功");
+                        }
+                        progressDialog.dismiss();
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+
+                });
+    }
+
+    @Override
+    protected void initDatas() {
+        List<String> spList = new ArrayList<>();
+        spList.add("RS-1");
+        spList.add("RS-1R");
+        ArrayAdapter adapterspr = new ArrayAdapter(mActivity, R.layout.item_spinner_put, R.id.text_spinner, spList);
+        s_data.setAdapter(adapterspr);
+        s_data.setItemClick(new MySpinnerView.ItemClick() {
+            @Override
+            public void onClick(View view, int i) {
+                for (int i1 = 0; i1 < spList.size(); i1++) {
+                    if (i1 == i) {
+                        de_name = spList.get(i);
+                    }
+                }
+            }
+        });
+        s_data.setSelection(0);
+        de_name = spList.get(0);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

+ 11 - 0
app/src/main/java/com/uas/baigang_workshop_workstation/global/GloableParams.java

@@ -370,6 +370,9 @@ public class GloableParams {
     //新增入库
     public static String ADDRESS_PDAIO_IN_NEWPRODINOUT;
 
+    //获取排位图
+    public static String ADDRESS_OBTAIN_RANKING_CHART;
+
 
 
     //连接服务器请求地址
@@ -966,6 +969,9 @@ public class GloableParams {
     //新增入库单据
     private static final String ADDRESSTAIL_PDAIO_IN_NEWPRODINOUT = "/api/pdaio/pdaioIn/newProdinout.action";
 
+    //获取排位图
+    private static final String ADDRESSTAIL_OBTAIN_RANKING_CHART = "/api/pda/smt/getDeviceData.action";
+
 
 
 
@@ -995,6 +1001,7 @@ public class GloableParams {
     public static final String POSTPUNCH = "岗位打卡";
     public static final String HOME_DISPATCH_MANAGE = "工序管理";
     public static final String FINISHED_PRODUCT_STORAGE = "成品入库";
+    public static final String OBTAIN_RANKING_CHART = "获取排位图";
 
     public static String[] indexMainGridNames = {
 //            GRIDNAME_INOUT_STORAGE,
@@ -1008,6 +1015,7 @@ public class GloableParams {
             POSTPUNCH,
             HOME_DISPATCH_MANAGE,
             FINISHED_PRODUCT_STORAGE,
+            OBTAIN_RANKING_CHART,
             GRIDNAME_SETTING
     };
     public static int[] indexMainGridImgs = {
@@ -1021,6 +1029,7 @@ public class GloableParams {
             R.drawable.iv_postpunch,
             R.drawable.ic_dispatch_manage,
             R.drawable.ic_finished_product_storage,
+            R.drawable.paiweitu,
             R.drawable.mainmenu_usersetting
     };
 
@@ -1569,6 +1578,8 @@ public class GloableParams {
 
         GloableParams.ADDRESS_PDAIO_IN_NEWPRODINOUT = uriHead + GloableParams.ADDRESSTAIL_PDAIO_IN_NEWPRODINOUT;
 
+        GloableParams.ADDRESS_OBTAIN_RANKING_CHART = uriHead + GloableParams.ADDRESSTAIL_OBTAIN_RANKING_CHART;
+
 
 
 

BIN
app/src/main/res/drawable-xhdpi/paiweitu.png


+ 52 - 0
app/src/main/res/layout/fra_obtain_ranking_chart.xml

@@ -0,0 +1,52 @@
+<?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"
+    android:orientation="vertical"
+    android:padding="@dimen/root_layout_padding">
+
+    <LinearLayout
+        android:layout_marginTop="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:text="机台编号: "
+            android:textColor="@color/body_text_1"
+            android:textSize="16sp"/>
+
+        <com.uas.baigang_workshop_workstation.view.MySpinnerView
+            android:id="@+id/s_data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            />
+
+
+    </LinearLayout>
+
+    <Button
+        android:layout_marginTop="20dp"
+        android:id="@+id/bt_get"
+        style="@style/ButtonStyle"
+        android:text="获取"/>
+
+
+    <TextView
+        android:id="@+id/tv_result"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_big"
+        android:background="@drawable/shape_msg_block"
+        android:padding="10dp"
+        android:visibility="gone"
+        tools:text=""/>
+
+</LinearLayout>

+ 2 - 2
build.gradle

@@ -64,8 +64,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 5,
-            versionName      : "v1.0.4"
+            versionCode      : 7,
+            versionName      : "v1.0.6"
     ]
 
     depsVersion = [