Merge branch 'dev' of lvjian/ich-android into dev

修改快递柜轮播图为动态配置

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.emato.ich" android:sharedUserId="android.uid.system"
+    package="com.emato.ich"
     >
 <!--   -->
 <!--    android:sharedUserId="android.uid.system"-->

app/src/main/java/com/emato/ich/MainActivity.java

@@ -97,6 +97,8 @@ public class MainActivity extends AppCompatActivity  {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // 初始化图片插件
+        Banner.init(new ImageFactory());
         super.onCreate(savedInstanceState);
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         // 强制关闭输入法
@@ -133,9 +135,9 @@ public class MainActivity extends AppCompatActivity  {
 
         // TODO 监听shell命令脚本
         MessageHandler.executeShell(ichSubscribeClient, ichPublishClient);
-        List<String> list = new ArrayList<>();
-        Banner.init(new ImageFactory());
-        list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MhKNWAK-YRAAFsNNDnV10939.jpg");// cw大药房
+//        List<String> list = new ArrayList<>();
+        //Banner.init(new ImageFactory());
+//        list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MhKNWAK-YRAAFsNNDnV10939.jpg");// cw大药房
         // list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MhKNaAdwpfAAqanlvlafA376.jpg");// 津梁生活
        // list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MYfDaAKEKAAANp3QGoGwQ251.jpg");
         //list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MYfDaAIyukAATXUZaFRD4817.jpg");
@@ -160,7 +162,7 @@ public class MainActivity extends AppCompatActivity  {
                 // Toast.makeText(MainActivity.this, url, Toast.LENGTH_LONG).show();
             }
         });
-        banner.initBanner(list);
+        //banner.initBanner(list);
 
     }
 
@@ -191,6 +193,13 @@ public class MainActivity extends AppCompatActivity  {
                         if (!StringUtils.isNullOrEmpty(time)) {
                             LocalStorage.getInstance().getSession().setTime(Long.parseLong(time));
                         }
+                        // 获取轮播图数组字符串
+                        String cabImgListStr = configMap.get(SystemConfigConstant.CAB_IMG_LIST);
+                        // 转为 List
+                        List<String> cabImgList = objectMapper.readValue(cabImgListStr, new TypeReference<List<String>>() {});
+                        banner = findViewById(R.id.banner);
+                        // 加入 banner
+                        banner.initBanner(cabImgList);
 
                         Log.i(TAG, "onResponse: =====================>获取系统配置成功! ");
                     } else {

app/src/main/java/com/emato/ich/contant/SystemConfigConstant.java

@@ -15,4 +15,7 @@ public class SystemConfigConstant {
 
     public static final String contact_us_tip_info = "contact_us_tip_info";
 
+    // 快递柜轮播图
+    public static final String CAB_IMG_LIST = "cabImgList";
+
 }