PrintDemoV5.7.1/src/main/java/com/printer/demo/BluetoothDeviceList.java

@@ -152,7 +152,7 @@ public class BluetoothDeviceList extends Activity {
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-
+            XLog.d(TAG, "----------action."+action);
             if (BluetoothAdapter.ACTION_DISCOVERY_STARTED.equals(action)) {
             }
             if (BluetoothDevice.ACTION_FOUND.equals(action)) {

PrintDemoV5.7.1/src/main/java/com/printer/demo/SettingActivity.java

@@ -532,7 +532,9 @@ public class SettingActivity extends BaseActivity
 
                 }).start();
             } else {
+
                 Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_SHORT).show();
+
             }
         }
         if (v == btn_selfCheckingPage_print) {
@@ -547,14 +549,17 @@ public class SettingActivity extends BaseActivity
                         runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                Toast.makeText(mContext, getString(R.string.reconnect), Toast.LENGTH_SHORT).show();
+                                Toast.makeText(mContext, getString(R.string.reconnect),  Toast.LENGTH_LONG).show();
+
                             }
                         });
                     }
 
                 }).start();
             } else {
-                Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_LONG).show();
+
+                Toast.makeText(mContext, getString(R.string.no_connected),  Toast.LENGTH_LONG).show();
+
             }
         }
         if (v == btn_status_test) {
@@ -581,12 +586,13 @@ public class SettingActivity extends BaseActivity
                                 XLog.i(TAG, "zl at SettingActivity.java onClick()------> btn_status_test");
                             }
                         });
-
                     }
 
                 }).start();
             } else {
-                Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_SHORT).show();
+
+                Toast.makeText(mContext, getString(R.string.no_connected),  Toast.LENGTH_LONG).show();
+
             }
         }
     }
@@ -595,7 +601,6 @@ public class SettingActivity extends BaseActivity
      * 使设备震动
      */
     public void vibrators() {
-
         Vibrator vib = (Vibrator) SettingActivity.this.getSystemService(Service.VIBRATOR_SERVICE);
         vib.vibrate(1000);
         try {
@@ -693,7 +698,9 @@ public class SettingActivity extends BaseActivity
                 connect2BlueToothdevice();
             } else {
                 Log.e("yxz", devicesAddress);
-                Toast.makeText(mContext, "蓝牙mac:" + devicesAddress + "不合法", Toast.LENGTH_SHORT).show();
+
+                Toast.makeText(mContext, "蓝牙mac:" + devicesAddress + "不合法",  Toast.LENGTH_LONG).show();
+
             }
         }
         if (requestCode == ENABLE_BT) {
@@ -726,7 +733,7 @@ public class SettingActivity extends BaseActivity
                     }
                 }
             } else {
-                Toast.makeText(SettingActivity.this, R.string.bt_not_enabled, Toast.LENGTH_SHORT).show();
+                Toast.makeText(SettingActivity.this, R.string.bt_not_enabled,  Toast.LENGTH_LONG).show();
             }
         }
     }
@@ -979,7 +986,7 @@ public class SettingActivity extends BaseActivity
 
         doDiscovery(manager);
         if (deviceList.isEmpty()) {
-            Toast.makeText(mContext, R.string.no_connected, Toast.LENGTH_SHORT).show();
+            Toast.makeText(mContext, R.string.no_connected,  Toast.LENGTH_LONG).show();
             return;
         }
         mUSBDevice = deviceList.get(0);
@@ -1059,7 +1066,7 @@ public class SettingActivity extends BaseActivity
             // num=0;
 
         } else {
-            Toast.makeText(mContext, mContext.getString(R.string.no_connected), Toast.LENGTH_SHORT).show();
+            Toast.makeText(mContext, mContext.getString(R.string.no_connected),  Toast.LENGTH_LONG).show();
         }
     }
 
@@ -1093,7 +1100,7 @@ public class SettingActivity extends BaseActivity
 //                }
 //            }).start();
         } else {
-            Toast.makeText(mContext, mContext.getString(R.string.no_connected), Toast.LENGTH_SHORT).show();
+            Toast.makeText(mContext, mContext.getString(R.string.no_connected),  Toast.LENGTH_LONG).show();
         }
     }
 

PrintDemoV5.7.1/src/main/java/com/printer/demo/utils/XTUtils.java

@@ -381,6 +381,7 @@ public class XTUtils {
 	}
 
 	// 2
+	@SuppressLint("LongLogTag")
 	public String getLocalIpAddress() {
 		try {
 			for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {

PrintDemoV5.7.1/src/main/res/layout/activity_setting.xml

@@ -149,8 +149,7 @@
                 android:layout_below="@+id/rg_printer_type"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="20dp"
-                android:text="@string/settingactivity_print_test" >
-            </Button>
+                android:text="@string/settingactivity_print_test"></Button>
             <Button
                 android:id="@+id/btn_selfchekingpage_print"
                 android:layout_width="match_parent"

PrintDemoV5.7.1/src/main/res/layout/device_list.xml

@@ -17,7 +17,12 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/button_bace"
-        android:layout_margin="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
         android:text="@string/button_scan" />
 
     <Button