#RELEASE 发布2.1版本，增加点阵屏查询功能

app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 1
-        versionName "2.0"
+        versionName "2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/com/wdkl/callingmainnurse/service/led/LedC2MManager.java

@@ -125,6 +125,10 @@ public class LedC2MManager extends LedManager {
                 });
     }
 
+    @Override
+    public List<LedItem> getLedList() {
+        return ledList;
+    }
 
     private final ExecutorService updateThreadPool = Executors.newSingleThreadExecutor();
     private SendProgramThread programThread;

app/src/main/java/com/wdkl/callingmainnurse/service/led/LedManager.java

@@ -6,6 +6,7 @@ import android.app.Application;
 import com.wdkl.callingmainnurse.common.Constants;
 
 import java.io.File;
+import java.util.List;
 
 public abstract class LedManager {
 
@@ -15,6 +16,9 @@ public abstract class LedManager {
     //获取所有LED屏ip地址
     public abstract void initIpList();
 
+    //获取点阵屏列表
+    public abstract List<LedItem> getLedList();
+
     //更新节目: text -- 节目内容，action -- 方式: 1-发送节目，2-删除节目，3-发送默认节目
     public abstract void updateProgram(String text, int action);
 

app/src/main/java/com/wdkl/callingmainnurse/service/led/LedManagerUtils.java

@@ -4,6 +4,8 @@ import android.app.Application;
 
 import com.wdkl.callingmainnurse.util.ToastUtil;
 
+import java.util.List;
+
 
 public class LedManagerUtils {
     private static LedManagerUtils instance = null;
@@ -44,6 +46,13 @@ public class LedManagerUtils {
         }
     }
 
+    public List<LedItem> getLedList() {
+        if (ledManager != null) {
+            return ledManager.getLedList();
+        }
+        return null;
+    }
+
     public void removeAllProgram() {
         if (ledManager != null) {
             ledManager.removeAllProgram();

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/LedSettingsActivity.java

@@ -16,9 +16,11 @@ import com.wdkl.callingmainnurse.R;
 import com.wdkl.callingmainnurse.base.BaseActivity;
 import com.wdkl.callingmainnurse.common.Constants;
 import com.wdkl.callingmainnurse.entity.MessageEvent;
+import com.wdkl.callingmainnurse.service.led.LedItem;
 import com.wdkl.callingmainnurse.service.led.LedManagerUtils;
 import com.wdkl.callingmainnurse.util.LogUtil;
 import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
+import com.wdkl.callingmainnurse.util.ToastUtil;
 
 import org.adw.library.widgets.discreteseekbar.DiscreteSeekBar;
 import org.greenrobot.eventbus.Subscribe;
@@ -44,6 +46,8 @@ public class LedSettingsActivity extends BaseActivity {
     Button ledCheckFont;
     @Bind(R.id.btn_refresh_led_device)
     Button ledRefresh;
+    @Bind(R.id.btn_show_led_device)
+    Button ledShow;
 
     @Bind(R.id.group_led_info_type)
     RadioGroup groupLedType;
@@ -187,6 +191,24 @@ public class LedSettingsActivity extends BaseActivity {
             }
         });
 
+        ledShow.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                List<LedItem> list = LedManagerUtils.getInstance().getLedList();
+                if (list != null && list.size() > 0) {
+                    StringBuilder builder = new StringBuilder();
+                    builder.append("查询到点阵屏: ");
+                    for (int i = 0; i < list.size(); i++) {
+                        builder.append(list.get(i).getIp());
+                        builder.append(";");
+                    }
+                    ToastUtil.showToast(builder.toString());
+                } else {
+                    ToastUtil.showToast("没有查询到点阵屏设备");
+                }
+            }
+        });
+
         if (Constants.LedVoiceOn == 1) {
             rbVoiceOn.setChecked(true);
         } else {

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

@@ -70,6 +70,15 @@
             android:text="更新点阵屏设备列表"
             android:textSize="24sp"
             android:background="@drawable/selector_setting_button"/>
+        <Button
+            android:id="@+id/btn_show_led_device"
+            android:layout_width="0dp"
+            android:layout_height="60dp"
+            android:layout_weight="1"
+            android:layout_margin="4dp"
+            android:text="查询点阵屏"
+            android:textSize="24sp"
+            android:background="@drawable/selector_setting_button"/>
     </LinearLayout>
 
     <LinearLayout