6.24 完成第一版prj

config.gradle

@@ -5,8 +5,8 @@ ext {
             buildToolsVersion: '28.0.3',
             buildToolsVersion: '28.0.3',
             minSdkVersion    : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19
             minSdkVersion    : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19
             targetSdkVersion : 28,
             targetSdkVersion : 28,
-            versionCode      : 6,
-            versionName      : "1.0.6"
+            versionCode      : 7,
+            versionName      : "1.0.7"
     ]
     ]
 
 
     version = [
     version = [

print-module/src/main/java/com/joe/print/mvp/model/bean/PrjBean.java

@@ -200,6 +200,30 @@ public class PrjBean {
             public void setPrinterTime(Long printerTime) {
             public void setPrinterTime(Long printerTime) {
                 this.printerTime = printerTime;
                 this.printerTime = printerTime;
             }
             }
+
+            public String getNumber() {
+                return number;
+            }
+
+            public void setNumber(String number) {
+                this.number = number;
+            }
+
+            public String getProductId() {
+                return productId;
+            }
+
+            public void setProductId(String productId) {
+                this.productId = productId;
+            }
+
+            public Long getCreateTime() {
+                return createTime;
+            }
+
+            public void setCreateTime(Long createTime) {
+                this.createTime = createTime;
+            }
         }
         }
 
 
         public Map<String, List<Bean>> getPrjMap() {
         public Map<String, List<Bean>> getPrjMap() {

print-module/src/main/java/com/joe/print/mvp/print/service/PrjService.java

@@ -79,7 +79,7 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
         if (wakeDisposable != null && !wakeDisposable.isDisposed()) {
         if (wakeDisposable != null && !wakeDisposable.isDisposed()) {
             wakeDisposable.dispose();
             wakeDisposable.dispose();
         }
         }
-        Observable.interval(5, 30, TimeUnit.SECONDS)
+        Observable.interval(10, 30, TimeUnit.SECONDS)
                 .subscribe(new Observer<Long>() {
                 .subscribe(new Observer<Long>() {
                     @Override
                     @Override
                     public void onSubscribe(Disposable d) {
                     public void onSubscribe(Disposable d) {
@@ -121,9 +121,6 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
                     @Override
                     @Override
                     public void onNext(String s) {
                     public void onNext(String s) {
                         Log.e("eee", "請求到PRJ數據：" + s);
                         Log.e("eee", "請求到PRJ數據：" + s);
-                        Log.e("eee", "請求到PRJ數據：" + s);
-                        Log.e("eee", "請求到PRJ數據：" + s);
-                        Log.e("eee", "請求到PRJ數據：" + s);
                         //請求到數據，停止輪詢，開始打印，在打印完之後再重新開始輪詢
                         //請求到數據，停止輪詢，開始打印，在打印完之後再重新開始輪詢
                         startPrint(s);
                         startPrint(s);
                         //開啟另一個定時，三十秒之後自動請求，避免上面的打印成功或失敗時沒有回調。
                         //開啟另一個定時，三十秒之後自動請求，避免上面的打印成功或失敗時沒有回調。

print-module/src/main/java/com/joe/print/mvp/ui/adapter/KitChenPrjPrintFoodAdapter.java

@@ -43,6 +43,6 @@ public class KitChenPrjPrintFoodAdapter extends BaseQuickAdapter<PrjBean.DataBea
         }
         }
         textView.setPadding(paddingLeft, textView.getPaddingTop(), textView.getPaddingRight(), textView.getPaddingBottom());
         textView.setPadding(paddingLeft, textView.getPaddingTop(), textView.getPaddingRight(), textView.getPaddingBottom());
         helper.setText(R.id.tv_food_name, item.getProductName());
         helper.setText(R.id.tv_food_name, item.getProductName());
-//        helper.setText(R.id.tv_food_number, String.valueOf(item.getNumber()));
+        helper.setText(R.id.tv_food_number, String.valueOf(item.getNumber()));
     }
     }
 }
 }

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java

@@ -180,6 +180,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
     @Override
     @Override
     public void initTopBar() {
     public void initTopBar() {
         mTopBar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color));
         mTopBar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color));
+        mTopBar.removeAllLeftViews();
         mTopBar.addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
         mTopBar.addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
 
 
             @Override
             @Override
@@ -362,6 +363,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
         tv_operat_content.setText("");
         tv_operat_content.setText("");
         mTopBar.setTitle("餐檯模式");
         mTopBar.setTitle("餐檯模式");
         //添加back鍵
         //添加back鍵
+        mTopBar.removeAllLeftViews();
         mTopBar.addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
         mTopBar.addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {