diff --git a/scanner/src/main/java/cn/guanmai/scanner/SupporterManager.java b/scanner/src/main/java/cn/guanmai/scanner/SupporterManager.java index 7f15700..197e341 100644 --- a/scanner/src/main/java/cn/guanmai/scanner/SupporterManager.java +++ b/scanner/src/main/java/cn/guanmai/scanner/SupporterManager.java @@ -17,9 +17,9 @@ public class SupporterManager { * UBX: 优博讯 */ public enum ScannerSupporter { - SUNMI("SUNMI", 1), ALPS("ALPS", 2), QCOM("QCOM", 3), SEUIC("SEUIC", 4), UBX("UBX", 5), OTHER("OTHER", -1); + SUNMI("SUNMI"), alps("alps"), SEUIC("SEUIC"), UBX("UBX"), OTHER("OTHER"); - ScannerSupporter(String name, int id) { + ScannerSupporter(String name) { } } @@ -29,18 +29,20 @@ public SupporterManager(Context context) { try { scannerSupporter = ScannerSupporter.valueOf(manufacturer); } catch (Exception e) { - scannerSupporter = ScannerSupporter.OTHER; + String deviceBrand = Build.BRAND; + try { + scannerSupporter = ScannerSupporter.valueOf(deviceBrand); + } catch (Exception e1) { + scannerSupporter = ScannerSupporter.OTHER; + } } switch (scannerSupporter) { case SUNMI: scannerManager = (T) SunmiScannerManager.getInstance(context); break; - case ALPS: + case alps: scannerManager = (T) AlpsScannerManager.getInstance(context); break; - case QCOM: - scannerManager = (T) SEUICScannerManager.getInstance(context); - break; case SEUIC: scannerManager = (T) SEUICScannerManager.getInstance(context); break; @@ -51,10 +53,6 @@ public SupporterManager(Context context) { scannerManager = (T) new OtherScannerManager(context); break; } - init(); - } - - private void init() { scannerManager.init(); }