فهرست منبع

SOP页面添加关键岗位功能, 修复5秒查询接口未关闭问题.

songw 1 سال پیش
والد
کامیت
8e4701d40e

+ 13 - 0
app/src/main/java/com/uas/standard_esop/activity/BannerActivity.java

@@ -49,6 +49,8 @@ public class BannerActivity extends BaseActivity {
     private ImageView iv_jixiao;
     private ClearableEditText at_peoplecode;
     private TextView get_data;
+    private TextView tv_key_positions;
+    private String keystep;
     //    private BasePopupView show;
 
     @Override
@@ -58,6 +60,7 @@ public class BannerActivity extends BaseActivity {
         setContentView(R.layout.activity_banner);
         Intent intent = getIntent();
         ArrayList<String> lists = intent.getStringArrayListExtra("lists");
+        keystep = intent.getStringExtra("keystep");
         List<Object> objects = (List)lists;
         x_banner = findViewById(R.id.x_banner);
         iv_pepole = findViewById(R.id.iv_pepole);
@@ -67,6 +70,7 @@ public class BannerActivity extends BaseActivity {
         iv_jixiao = findViewById(R.id.iv_jixiao);
         at_peoplecode = findViewById(R.id.at_peoplecode);
         get_data = findViewById(R.id.get_data);
+        tv_key_positions = findViewById(R.id.tv_key_positions);
         PhotoView photoView = findViewById(R.id.photo_view);
 //        String imageUrl = "https://example.com/image.jpg"; // 替换为你的图片URL
 
@@ -84,6 +88,7 @@ public class BannerActivity extends BaseActivity {
             sinmagedata = lists.get(i);
             Log.e("smd5", sinmagedata);
         }
+
         x_banner.setData(lists,null);
 
         x_banner.setmAdapter(new XBanner.XBannerAdapter() {
@@ -159,6 +164,14 @@ public class BannerActivity extends BaseActivity {
             public void onClick(View v) {
                 at_peoplecode.clearFocus();
                 getSourcePunchInfo(at_peoplecode.getText().toString().trim());
+                //关键岗位
+                if (!TextUtils.isEmpty(keystep)) {
+                    if (keystep.equals("-1")) {
+                        tv_key_positions.setVisibility(View.VISIBLE);
+                    }else {
+                        tv_key_positions.setVisibility(View.INVISIBLE);
+                    }
+                }
             }
         });
 

+ 10 - 1
app/src/main/java/com/uas/standard_esop/activity/IndexActivity.java

@@ -12,6 +12,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.telephony.TelephonyManager;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Base64;
 import android.util.Log;
@@ -208,6 +209,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private String tvSS_brdport;
     private BeanSop urlBean;
 
+    private String keystep ;
+
     @Override
     protected void onDestroy() {
 //        SharedPreUtil.removeAll(getApplicationContext());
@@ -920,9 +923,13 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                             JSONObject data = (JSONObject) index;
                             urlBean = new BeanSop(data.getString("PATH")
                                     ,data.getString("FILENAME"));
+                            if (!TextUtils.isEmpty(data.getString("keystep"))) {
+                                urlBean.setKeystep(data.getString("keystep"));
+                            }
                             urlBeantwoList.add(urlBean);
                         }
                         list = new ArrayList<>();
+                        keystep = "";
                         for (int i=0;i<urlBeantwoList.size();i++){
                             BeanSop urlBean = urlBeantwoList.get(i);
                             String filename = urlBean.getFilename().replace(".jpg","");
@@ -935,6 +942,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                                 String str2 = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
                                 Log.e("str2==",str2);
                                 list.add(str2);
+                                keystep = urlBean.getKeystep();
                             }
 
                         }
@@ -959,6 +967,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                                     || filenametcp.contains(".png") || filenametcp.contains(".jpg") || filenametcp.contains(".WEBP") || filenametcp.contains(".JPEG")) {
                                 Intent intent = new Intent(IndexActivity.this, BannerActivity.class);
                                 intent.putStringArrayListExtra("lists", list);
+                                intent.putExtra("keystep", keystep);
                                 startActivity(intent);
                             } else if (filenametcp.contains(".MP4") || filenametcp.contains(".mp4")){
                                 Intent intent = new Intent(IndexActivity.this, VideoActivity.class);
@@ -967,7 +976,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                             }else {
                                 CommonUtil.toastNoRepeat(IndexActivity.this, "此文件无法打开");
                             }
-
+                            handlernew.removeCallbacks(runnableCountdown);
                         }
 //                        setdataDisplay(o.toString());
                     }

+ 10 - 0
app/src/main/java/com/uas/standard_esop/bean/BeanSop.java

@@ -11,6 +11,16 @@ public class BeanSop implements Serializable {
     private String path;
     private String filename;
 
+    private String keystep;
+
+    public String getKeystep() {
+        return keystep;
+    }
+
+    public void setKeystep(String keystep) {
+        this.keystep = keystep;
+    }
+
     public BeanSop(String path, String filename) {
         this.path = path;
         this.filename = filename;

+ 18 - 1
app/src/main/res/layout-large/activity_banner.xml

@@ -68,8 +68,25 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white">
+
+        <TextView
+            android:visibility="invisible"
+            android:id="@+id/tv_key_positions"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:layout_gravity="center"
+            android:background="@color/yellow_light"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textSize="31sp"
+            android:text="@string/key_positions"
+            android:src="@drawable/search_48"
+            android:layout_marginTop="20dp"/>
+
         <LinearLayout
-            android:layout_marginTop="70dp"
+            android:layout_marginTop="10dp"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -437,4 +437,6 @@
     <!--hi-->
 
 
+    <string name="key_positions">关键岗位</string>
+
 </resources>

+ 0 - 2
build.gradle

@@ -19,8 +19,6 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 
 
-
-
 //        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong