增加相同岗位的图展示,修复轮播图闪退问题

app/build.gradle

@@ -51,7 +51,7 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "ESOP_release_${releaseInfo}.apk"
+                    fileName = "亿道_ESOP_release_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
                     fileName = "UAS_esop_STORAGE_DEBUG_${debugInfo}.apk"

app/src/main/java/com/uas/standard_esop/activity/BannerActivity.java

@@ -184,7 +184,7 @@ public class BannerActivity extends BaseActivity {
             }
         });
         //关键岗位
-        if (!TextUtils.isEmpty(keystep) ||  (!TextUtils.isEmpty(keyStepSet))) {
+        if (!TextUtils.isEmpty(keystep)) {     //自动选择
             if (keystep.equals("-1")) {
                 tv_key_positions.setVisibility(View.VISIBLE);
                 s_control.setChecked(true);
@@ -192,6 +192,14 @@ public class BannerActivity extends BaseActivity {
                 s_control.setChecked(false);
                 tv_key_positions.setVisibility(View.INVISIBLE);
             }
+        }else if (!TextUtils.isEmpty(keyStepSet)) {  //手动选择
+            if (keyStepSet.equals("-1")) {
+                tv_key_positions.setVisibility(View.VISIBLE);
+                s_control.setChecked(true);
+            }else {
+                s_control.setChecked(false);
+                tv_key_positions.setVisibility(View.INVISIBLE);
+            }
         }else {
             boolean aBoolean = SharedPreUtil.getBoolean(BannerActivity.this, Constants.FLAG.KEY_POSITION_SWITCH, false);
             s_control.setChecked(aBoolean);

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

@@ -333,6 +333,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                     Intent intent = new Intent(IndexActivity.this, BannerActivity.class);
                     intent.putStringArrayListExtra("lists", selectedItemList);
                     intent.putExtra("keyStepSet", keyStepSet);      //手动获取接口的关键岗位
+                    intent.putExtra("keystep", keyStepSet);      //关键岗位
                     startActivity(intent);
                 } else if (filenametcp.contains(".MP4") || filenametcp.contains(".mp4")) {
                     Intent intent = new Intent(IndexActivity.this, VideoActivity.class);
@@ -617,17 +618,33 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private void handleFeededData(JSONArray dataArray) {
         ResourcefileBean.DataBean.UrlBean bean;
         urlBeanList.clear();
-        for (Object index : dataArray) {
-            JSONObject data = (JSONObject) index;
-            if (data.getString("filename").equals(at_gvtext.getText().toString().trim() + ".jpg")) {
-                bean = new ResourcefileBean.DataBean.UrlBean(
-                        data.getString("path"),
-                        data.getString("filename"), data.getString("keystep"));
-                urlBeanList.add(bean);
-            }
+        try {
+            for (Object index : dataArray) {
+                JSONObject data = (JSONObject) index;
+                String filename = data.getString("filename");
+                String strJpg = filename.replace(".jpg", "");
+                String strJpgB = filename.replace(".JPG", "");
+                String strPng = filename.replace(".png", "");
+                String strPngB = filename.replace(".PNG", "");
+                if (filename.equals(at_gvtext.getText().toString().trim() + ".jpg")
+                        || filename.equals(at_gvtext.getText().toString().trim() + ".png")
+                        || strJpg.contains(at_gvtext.getText().toString().trim() + "-")
+                        || strJpgB.contains(at_gvtext.getText().toString().trim() + "-")
+                        || strPng.contains(at_gvtext.getText().toString().trim() + "-")
+                        || strPngB.contains(at_gvtext.getText().toString().trim() + "-")
+                )
+                {
+                    bean = new ResourcefileBean.DataBean.UrlBean(
+                            data.getString("path"),
+                            data.getString("filename"), data.getString("keystep"));
+                    urlBeanList.add(bean);
+                }
 
+            }
+            setAdapter(urlBeanList);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        setAdapter(urlBeanList);
     }
 
     private void setAdapter(ArrayList<ResourcefileBean.DataBean.UrlBean> mList) {
@@ -926,6 +943,9 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         String json = o.toString();
                         JSONArray dataArray = FastjsonUtil.getJSONArray(json, "data");
                         LogUtil.edayin("stringtextsss=======", o.toString() + "");
+                        if (dataArray.size() <= 0) {
+                            return;
+                        }
                         urlBeantwoList.clear();
                         for (Object index : dataArray) {
                             JSONObject data = (JSONObject) index;
@@ -941,7 +961,10 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         keystep = "";
                         for (int i = 0; i < urlBeantwoList.size(); i++) {
                             BeanSop urlBean = urlBeantwoList.get(i);
-                            String filename = urlBean.getFilename().replace(".jpg", "");
+                            String filenameJpg = urlBean.getFilename().replace(".jpg", "");
+                            String filenameJpgB = urlBean.getFilename().replace(".JPG", "");
+                            String filenamePng = urlBean.getFilename().replace(".png", "");
+                            String filenamePngB = urlBean.getFilename().replace(".PNG", "");
                             if (StringUtil.isEmpty(urlBean.getPath())) {
                                 CommonUtil.toastNoRepeat(IndexActivity.this, "数据为空");
                                 return;

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">UAS-ESOP</string>
-    <string name="app_name_mes">ESOP标准版</string>
+    <string name="app_name_mes">亿道ESOP标准版</string>
     <string name="app_name_test">康特客</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>

build.gradle

@@ -59,8 +59,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 13,
-            versionName      : "v1.0.3"
+            versionCode      : 9,
+            versionName      : "v1.0.9"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/.gitignore

@@ -0,0 +1 @@
+/build