daxu0403 7 роки тому
батько
коміт
e7dc544f0b

BIN
android/.idea/caches/build_file_checksums.ser


+ 88 - 35
android/.idea/workspace.xml

@@ -27,16 +27,17 @@
     </system>
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/logisticsclient/MainActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="309">
-              <caret line="164" column="9" lean-forward="true" selection-start-line="164" selection-start-column="9" selection-end-line="164" selection-end-column="9" />
+            <state relative-caret-position="105">
+              <caret line="7" column="41" lean-forward="true" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1612#3527#0" expanded="true" />
-                <element signature="e#3526#3527#0" expanded="true" />
+                <element signature="e#1885#5797#0" expanded="true" />
+                <element signature="e#5796#5797#0" expanded="true" />
+                <element signature="e#16555#17059#0" expanded="true" />
+                <element signature="e#17058#17059#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -64,8 +65,8 @@
       <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="243">
-              <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
+            <state relative-caret-position="540">
+              <caret line="36" column="24" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -8349,6 +8350,7 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/logisticsclient/MainActivity.java" />
       </list>
     </option>
   </component>
@@ -8363,9 +8365,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane" />
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView">
         <subPane>
           <expand>
@@ -8373,10 +8372,30 @@
               <item name="android" type="1abcf292:AndroidViewProjectNode" />
               <item name="app" type="feadf853:AndroidModuleNode" />
             </path>
+            <path>
+              <item name="android" type="1abcf292:AndroidViewProjectNode" />
+              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
+            </path>
+            <path>
+              <item name="android" type="1abcf292:AndroidViewProjectNode" />
+              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
+              <item name="logisticsclient" type="cbb59c9e:AndroidPsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="android" type="1abcf292:AndroidViewProjectNode" />
+              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
+              <item name="plugins" type="cbb59c9e:AndroidPsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -8514,42 +8533,63 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="20" y="43" width="1400" height="837" extended-state="0" />
+    <editor active="true" />
     <layout>
+      <window_info anchor="bottom" id="Android Profiler" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Android Profiler" show_stripe_button="false" />
-      <window_info anchor="right" id="Palette&#9;" />
-      <window_info id="Image Layers" />
-      <window_info id="Build Variants" side_tool="true" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="right" id="Palette&#9;" order="3" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Build Variants" order="2" side_tool="true" />
+      <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Logcat" />
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info anchor="bottom" id="Logcat" order="7" />
       <window_info id="Captures" order="2" weight="0.25" />
-      <window_info id="Capture Tool" />
-      <window_info id="Designer" />
+      <window_info id="Capture Tool" order="2" />
+      <window_info id="Designer" order="2" />
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2496318" />
-      <window_info anchor="bottom" id="Build" visible="true" weight="0.2" />
-      <window_info anchor="right" id="Gradle" />
+      <window_info anchor="bottom" id="Build" order="7" visible="true" weight="0.2" />
+      <window_info anchor="right" id="Gradle" order="3" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info anchor="right" id="Device File Explorer" side_tool="true" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/logisticsclient/MainActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2460">
+          <caret line="164" column="9" lean-forward="true" selection-start-line="164" selection-start-column="9" selection-end-line="164" selection-end-column="9" />
+          <folding>
+            <element signature="e#1885#5797#0" expanded="true" />
+            <element signature="e#5796#5797#0" expanded="true" />
+            <element signature="e#16555#17059#0" expanded="true" />
+            <element signature="e#17058#17059#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="57" selection-start-line="13" selection-start-column="57" selection-end-line="13" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
         <state />
@@ -8557,11 +8597,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
+        <state relative-caret-position="540">
           <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="36" column="24" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
@@ -8574,12 +8626,13 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/logisticsclient/MainActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="164" column="9" lean-forward="true" selection-start-line="164" selection-start-column="9" selection-end-line="164" selection-end-column="9" />
+        <state relative-caret-position="105">
+          <caret line="7" column="41" lean-forward="true" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1612#3527#0" expanded="true" />
-            <element signature="e#3526#3527#0" expanded="true" />
+            <element signature="e#1885#5797#0" expanded="true" />
+            <element signature="e#5796#5797#0" expanded="true" />
+            <element signature="e#16555#17059#0" expanded="true" />
+            <element signature="e#17058#17059#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 0 - 1
android/app/app.iml

@@ -98,7 +98,6 @@
       <excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/instant_run_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/prebuild" />

Різницю між файлами не показано, бо вона завелика
+ 607 - 420
android/app/src/main/java/com/example/logisticsclient/MainActivity.java


+ 5 - 1
lib/pages/my_page.dart

@@ -32,6 +32,7 @@ class _MyPageState extends State < MyPage > with AutomaticKeepAliveClientMixin {
   BluetoothUtils bluetooth = BluetoothUtils();
   List < BtInfoObj > btList = [];
   Set btSet = Set();
+  int publicIndex;
   List printTypeList = ["全部", "配件商", "修理厂", "司机", "货物", "货物外", "不打印"];
   static
   var printTypeMap = {
@@ -554,9 +555,12 @@ class _MyPageState extends State < MyPage > with AutomaticKeepAliveClientMixin {
       ),
       onTap: () {
         //bluetooth.connnectBT(btAddress);
-        setState(() {
+        bluetooth.connectBT(btAddress);
+         setState(() {
           btList[index].showLoadStauts = true;
+          // publicIndex =
         });
+       
       },
     );
   }

+ 50 - 20
lib/util/bluetooth_utils.dart

@@ -4,7 +4,10 @@ class BluetoothUtils {
   static const mChannel = const MethodChannel('io.fivefire/method_channel');
   static const eChannel = const EventChannel("io.fivefire/event_channel");
 
-  Future<bool> isBTDevice() async {//检查本机是否有蓝牙设备
+  /**
+   * 判断设备是否支持蓝牙 
+   */
+  Future<bool> isBTDevice() async {
     try {
       return await mChannel.invokeMethod('isBTDevice');
     } on PlatformException catch (e) {
@@ -12,8 +15,10 @@ class BluetoothUtils {
       return false;
     }
   }
-
-  Future<bool> isEnableBluetooth() async {//打开蓝牙
+  /**
+   * 判断蓝牙是否打开
+   */
+  Future<bool> isEnableBluetooth() async {
     try {
       return await mChannel.invokeMethod('isEnableBluetooth');
     } on PlatformException catch (e) {
@@ -21,8 +26,22 @@ class BluetoothUtils {
       return false;
     }
   }
+  /**
+   * 打开蓝牙
+   */
+  Future<bool> enableBluetooth() async {
+    try {
+      return await mChannel.invokeMethod('enableBluetooth');
+    } on PlatformException catch (e) {
+      print("$e");
+      return false;
+    }
+  }
 
-  Future scanBT() async {//开始搜索蓝牙设备
+  /**
+   * 扫描蓝牙设备
+   */
+  Future scanBT() async {
     try {
       return await mChannel.invokeMethod('scanBT');
     } on PlatformException catch (e) {
@@ -30,26 +49,36 @@ class BluetoothUtils {
     }
   }
 
-  Future<Null> connnectBT(String address) async {
+  /**
+   * 传入mac 地址 
+   * 连接蓝牙
+   */
+  Future<bool> connectBT(String address) async {
     try {
       Map<String, String> map = {"address": address};
 
-      return await mChannel.invokeMethod('connnectBT', map);
+      return await mChannel.invokeMethod('connectBT', map);
     } on PlatformException catch (e) {
       print("$e");
     }
   }
 
+  /**
+   * 关闭蓝牙
+   */
   Future disConnnectBT() async {
     try {
-    
-
       return await mChannel.invokeMethod('disConnectBT');
     } on PlatformException catch (e) {
       print("$e");
     }
   }
 
+  
+
+  /**
+   * 停止蓝牙设备扫描
+   */
   Future cancelDiscoveryBT() async {
     try {
       return await mChannel.invokeMethod('cancelDiscoveryBT');
@@ -58,10 +87,12 @@ class BluetoothUtils {
     }
   }
 
+  /**
+   * 打印订单
+   */
   Future printOrder(Map<String,String> pum,int type)async{
      try {
       Map<String,Object> map = {"pum":pum,"type": type};
-
       return await mChannel.invokeMethod('printOrder', map);
     } on PlatformException catch (e) {
       print("$e");
@@ -69,22 +100,21 @@ class BluetoothUtils {
 
   }
 
+  Future isConnect(String address) async {
+    try {
+      Map<String, String> map = {"address": address};
 
-   EventChannel getEchannel(){
-     return eChannel;
-
+      return await mChannel.invokeMethod('connectBT', map);
+    } on PlatformException catch (e) {
+      print("$e");
+    }
   }
 
-//   void initState() {
-//     eChannel.receiveBroadcastStream().listen(onEvent, onError: onError);
-//   }
 
-//    onEvent(Object obj){
-//     print(obj);
-   
-//   }
+   EventChannel getEchannel(){
+     return eChannel;
 
-//    onError(Object obj) {}
+  }
 
    
 }