Merge pull request #31 from kensoon/dev-fix-final

Dev fix final

AndroidProject/gasService/app/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'android-apt'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
 
     defaultConfig {
         applicationId "com.fat246.gasservice"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -23,7 +23,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.1.1'
     //扫描二维码
     compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:1.0.0'
     //bmob-sdk：Bmob的android sdk包，包含了Bmob的数据存储、文件等服务，以下是最新的bmob-sdk:

AndroidProject/gasService/app/src/main/java/com/fat246/gasservice/Order.java

@@ -16,13 +16,14 @@ public class Order extends BmobObject {
     private String Order_GasClass;
     private Float Order_GasPrice;
     private Float Order_GasNum;
+    private String Car_Num;
 
     //支付流水号
     public String Pay_Serial_Number;
 
     public Order(String User_Tel, String Order_ID, String Order_Station,
                  Integer Order_Status, BmobDate Order_Time, String Order_GasClass,
-                 Float Order_GasPrice, Float Order_GasNum) {
+                 Float Order_GasPrice, Float Order_GasNum, String Car_Num) {
 
         this.User_Tel = User_Tel;
         this.Order_ID = Order_ID;
@@ -32,6 +33,7 @@ public Order(String User_Tel, String Order_ID, String Order_Station,
         this.Order_GasClass = Order_GasClass;
         this.Order_GasPrice = Order_GasPrice;
         this.Order_GasNum = Order_GasNum;
+        this.Car_Num=Car_Num;
     }
 
     //get
@@ -70,4 +72,6 @@ public Float getOrder_GasNum() {
     public String getPay_Serial_Number() {
         return this.Pay_Serial_Number;
     }
+
+    public String getCar_Num(){return this.Car_Num;}
 }

AndroidProject/gasService/app/src/main/java/com/fat246/gasservice/activities/DecodeActivity.java

@@ -35,7 +35,7 @@ public class DecodeActivity extends AppCompatActivity implements QRCodeReaderVie
     private RelativeLayout layout;
     private ProgressBar progressBar;
 
-    public static boolean flag = true;
+    public boolean flag = true;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -146,6 +146,7 @@ public void onSuccess(List<Order> list) {
                                     bundle.putString(MainActivity.ORDER_TIME, or.getOrder_Time().getDate());
                                     bundle.putString(MainActivity.ORDER_STATUS, getStatus(or.getOrder_Status()));
                                     bundle.putString(MainActivity.ORDER_WATER, or.getPay_Serial_Number());
+                                    bundle.putString(MainActivity.CAR_NUM,or.getCar_Num());
 
                                     intent.putExtras(bundle);
 
@@ -233,16 +234,16 @@ protected void onPause() {
     //showbar
     private void showBar() {
 
-        layout.setVisibility(View.INVISIBLE);
-
-        progressBar.setVisibility(View.VISIBLE);
+//        layout.setVisibility(View.INVISIBLE);
+//
+//        progressBar.setVisibility(View.VISIBLE);
     }
 
     //hideBar
     private void hideBar() {
 
-        layout.setVisibility(View.VISIBLE);
-
-        progressBar.setVisibility(View.INVISIBLE);
+//        layout.setVisibility(View.VISIBLE);
+//
+//        progressBar.setVisibility(View.INVISIBLE);
     }
 }

AndroidProject/gasService/app/src/main/java/com/fat246/gasservice/activities/MainActivity.java

@@ -35,6 +35,7 @@ public class MainActivity extends AppCompatActivity {
     public static final String ORDER_TIME = "order_time";
     public static final String ORDER_STATUS = "order_status";
     public static final String ORDER_WATER = "order_water";
+    public static final String CAR_NUM="car_num";
 
 
     //View
@@ -51,6 +52,7 @@ public class MainActivity extends AppCompatActivity {
     private TextView order_time;
     private TextView order_status;
     private TextView order_water;
+    private TextView car_num;
 
     private Button startCarmer;
 
@@ -85,6 +87,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     order_time.setText((String) bundle.getString(ORDER_TIME));
                     order_status.setText((String) bundle.getString(ORDER_STATUS));
                     order_water.setText((String) bundle.getString(ORDER_WATER));
+                    car_num.setText((String)bundle.getString(CAR_NUM));
 
                     AlertDialog.Builder builder = new AlertDialog.Builder(this);
                     builder.setTitle("提示")
@@ -118,6 +121,7 @@ private void initView() {
         order_time = (TextView) findViewById(R.id.order_time);
         order_status = (TextView) findViewById(R.id.order_status);
         order_water = (TextView) findViewById(R.id.order_water);
+        car_num=(TextView)findViewById(R.id.car_num);
 
 
         startCarmer.setOnClickListener(new View.OnClickListener() {
@@ -135,6 +139,8 @@ public void onClick(View v) {
                 order_time.setText("");
                 order_status.setText("");
                 order_status.setText("");
+                order_water.setText("");
+                car_num.setText("");
 
 
                 MainActivityPermissionsDispatcher.startCarmerWithCheck(MainActivity.this);

AndroidProject/gasService/app/src/main/res/layout/activity_main.xml

@@ -44,6 +44,22 @@
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="车牌号：" />
+
+                <TextView
+                    android:id="@+id/car_num"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -159,6 +175,7 @@
 
                 <TextView
                     android:id="@+id/order_status"
+                    android:textColor="@color/colorAccent"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
             </LinearLayout>

AndroidProject/servicecar/app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 24
     buildToolsVersion "24.0.1"
 
     defaultConfig {
         applicationId "com.fat246.servicecar"
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -22,7 +22,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.1.1'
 
     //bmob-sdk：Bmob的android sdk包，包含了Bmob的数据存储、文件等服务，以下是最新的bmob-sdk:
     compile 'cn.bmob.android:bmob-sdk:3.4.6'