Skip to content

S
supplier
Commit 5e0ba6b0 by 王宇航
Options

廚房單打印切紙,首頁標題欄不滑動

parent d77dea18
Showing with 97 additions and 75 deletions
cc-register/build.gradle
......@@ -2,15 +2,15 @@ apply plugin: 'groovy'
dependencies {
implementation gradleApi()
implementation localGroovy()
compile gradleApi()
compile localGroovy()
}
repositories {
mavenCentral()
}
dependencies {
implementation 'com.android.tools.build:gradle:3.5.3'
compile 'com.android.tools.build:gradle:3.5.3'
}
ext {
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
......@@ -6,6 +6,7 @@ import android.os.Bundle;
import android.view.KeyEvent;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
......@@ -65,6 +66,10 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
LinearLayout orderingMeals;
@BindView(R2.id.layout_management)
LinearLayout layoutManagement;
@BindView(R2.id.tv_restaurant_name)
TextView tvRestaurantName;
@BindView(R2.id.tv_username)
TextView tvUserName;
@Override
public void setupActivityComponent(@NonNull AppComponent appComponent) {
......@@ -83,12 +88,21 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
@Override
public void initData(@Nullable Bundle savedInstanceState) {
initDrawerLayout();
initShadow();
initFuncationData();
// tvRestaurantName.setText(GsaCloudApplication.get);
tvUserName.setText(GsaCloudApplication.getMemberName(mContext));
}
private void initShadow() {
ShadowDrawable.setShadowDrawable(orderingMeals, Color.parseColor("#FFFFFF"), dpToPx(5),
Color.parseColor("#73888888"), dpToPx(5), 0, 2);
ShadowDrawable.setShadowDrawable(layoutManagement, Color.parseColor("#FFFFFF"), dpToPx(5),
Color.parseColor("#00000000"), dpToPx(5), 0, 2);
}
private void initFuncationData() {
List<SectionItem> data = new ArrayList<>();
data.add(new SectionItem(R.drawable.ic_dining_table_mode, "餐檯模式"));
data.add(new SectionItem(R.drawable.ic_delivery_mode, "外送模式"));
......@@ -151,9 +165,6 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
rvStaffManagement.setAdapter(staffAdapter);
}
private void initDrawerLayout() {
}
@Override
public void initIntent() {
......@@ -214,12 +225,14 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
}
};
@OnClick({R2.id.layout_login_out})
@OnClick({R2.id.layout_login_out, R2.id.iv_personal_center})
@Override
public void onClick(View v) {
if (v.getId() == R.id.layout_login_out) {
//登出
mPresenter.loginOut();
} else if(v.getId() == R.id.iv_personal_center){
slideMenu.toggle();
}
}
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
......@@ -31,7 +31,6 @@ import com.gingersoft.gsa.cloud.main.di.component.DaggerMainTopComponent;
import com.gingersoft.gsa.cloud.main.mvp.contract.MainTopContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.HomeTurnoverBean;
import com.gingersoft.gsa.cloud.main.mvp.presenter.MainTopPresenter;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.NewMainActivity;
import com.jess.arms.base.BaseFragment;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils;
......@@ -41,13 +40,11 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import static com.jess.arms.utils.Preconditions.checkNotNull;
import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dpToPx;
......@@ -99,8 +96,6 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
ImageView ivBillTrend;//賬單數量趨勢
@BindView(R2.id.tv_bill_trend)
TextView tvBillTrend;//賬單數量較昨日上漲或下跌數量
@BindView(R2.id.iv_personal_center)
ImageView iv_personal_center;
public static MainTopFragment newInstance() {
MainTopFragment fragment = new MainTopFragment();
return fragment;
......@@ -133,7 +128,6 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
mPresenter.getRestaurantReport(GsaCloudApplication.getRestaurantId(mContext) + "");//GsaCloudApplication.getRestaurantId(mContext) 獲取餐廳營業信息
time.setText(TimeUtils.getCurrentTimeInString(new SimpleDateFormat("yyyy-MM-dd E")));
loadReport();//加載報表線形圖
iv_personal_center.setOnClickListener(((NewMainActivity) Objects.requireNonNull(getActivity())).mSlidingMenuOnclick);
}
private void loadReport() {
......@@ -373,12 +367,7 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
}
}
@OnClick({R2.id.iv_personal_center})
@Override
public void onClick(View v) {
if(v.getId() == R.id.iv_personal_center){
//個人中心
}
}
}
main/src/main/res/drawable/shape_main_title_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:endColor="#0097f0"
android:startColor="#00C0FA" />
</shape>
\ No newline at end of file
main/src/main/res/drawable/shape_main_top_bg.xml
......@@ -3,5 +3,5 @@
<gradient
android:angle="270"
android:endColor="#015EEA"
android:startColor="#00C0FA" />
android:startColor="#0097f0" />
</shape>
\ No newline at end of file
main/src/main/res/layout/activity_new_main.xml
<?xml version="1.0" encoding="utf-8"?>
<com.gingersoft.gsa.cloud.main.mvp.ui.view.SlidingMenu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/slideMenu"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -32,6 +33,7 @@
android:src="@drawable/ic_header" />
<TextView
android:id="@+id/tv_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
......@@ -166,6 +168,53 @@
</LinearLayout>
<!-- 主頁內容-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_title_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_main_title_bg"
android:paddingLeft="@dimen/dp_20"
android:paddingTop="@dimen/dp_7"
android:paddingRight="@dimen/dp_12"
android:paddingBottom="@dimen/dp_7"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_personal_center"
android:layout_width="@dimen/dp_37"
android:layout_height="@dimen/dp_37"
android:src="@drawable/ic_my"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_restaurant_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="店鋪名稱"
android:textColor="@color/white"
android:textSize="@dimen/sp_18"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_26"
android:src="@drawable/ic_msg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.core.widget.NestedScrollView
android:id="@+id/content_scroll"
android:layout_width="match_parent"
......@@ -177,6 +226,8 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<fragment
android:id="@+id/main_top_fragment"
android:name="com.gingersoft.gsa.cloud.main.mvp.ui.fragment.MainTopFragment"
......@@ -274,4 +325,6 @@
</androidx.core.widget.NestedScrollView>
</LinearLayout>
</LinearLayout>
</com.gingersoft.gsa.cloud.main.mvp.ui.view.SlidingMenu>
main/src/main/res/layout/fragment_main_top.xml
......@@ -17,46 +17,6 @@
app:layout_constraintBottom_toBottomOf="@id/tv_today_time"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_title_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_20"
android:paddingTop="@dimen/dp_7"
android:paddingRight="@dimen/dp_12"
android:paddingBottom="@dimen/dp_7"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_personal_center"
android:layout_width="@dimen/dp_37"
android:layout_height="@dimen/dp_37"
android:src="@drawable/ic_my"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="店鋪名稱"
android:textColor="@color/white"
android:textSize="@dimen/sp_18"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_26"
android:src="@drawable/ic_msg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_today_amount_text"
android:layout_width="wrap_content"
......
print-module/src/main/java/com/joe/print/mvp/print/PrintStatus.java
......@@ -2,6 +2,7 @@ package com.joe.print.mvp.print;
import android.content.Context;
import android.os.RemoteException;
import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
import com.hyweb.n5.lib.util.PrinterUtil;
import com.jess.arms.utils.ArmsUtils;
......
public-base/build.gradle
......@@ -78,7 +78,4 @@ dependencies {
implementation 'org.greenrobot:greendao:3.2.2'
implementation 'org.greenrobot:greendao-generator:3.2.2'
implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"]
implementation files('libs/ecracalib.jar')
implementation files('libs/nexgon5lib.jar')
}
public-base/src/main/java/com/gingersoft/gsa/cloud/base/adapter/BaseFragmentAdapter.java
package com.gingersoft.gsa.cloud.base.adapter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.utils.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/adapter/print/KitChenPrintFoodAdapter.java
......@@ -22,6 +22,6 @@ public class KitChenPrintFoodAdapter extends BaseQuickAdapter<OrderDetail, BaseV
@Override
protected void convert(BaseViewHolder helper, OrderDetail item) {
helper.setText(R.id.tv_food_number, item.getNumber() +"");
helper.setText(R.id.tv_food_name, item.getName());
helper.setText(R.id.tv_food_name, item.getProductName());
}
}
public-base/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
......@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
* Master of DAO (schema version 1): knows all DAOs.
* Master of DAO (schema version 13): knows all DAOs.
*/
public class DaoMaster extends AbstractDaoMaster {
public static final int SCHEMA_VERSION = 1;
public static final int SCHEMA_VERSION = 13;
/** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) {
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/callback/CommandImpl.java
......@@ -8,11 +8,11 @@ import com.elvishew.xlog.XLog;
import com.etps.aca.lib.action.ICommand;
import com.etps.aca.lib.constant.Constant;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.table.app.payment.N5CallbackManage;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.integration.AppManager;
import com.jess.arms.utils.ArmsUtils;
import org.json.JSONException;
import org.json.JSONObject;
......@@ -79,7 +79,7 @@ public class CommandImpl implements ICommand {
OrderPayActivity.startOrderPayActivityFormSale(context, response);
break;
case Constant.EVENT.NAME.VOID_RESP:
N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.VOID_RESP);
// N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.VOID_RESP);
break;
case Constant.EVENT.NAME.REFUND_RESP:
// N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.REFUND_RESP);
......@@ -91,16 +91,16 @@ public class CommandImpl implements ICommand {
// }
break;
case Constant.EVENT.NAME.PRINT_RESP:
N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.PRINT_RESP);
// N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.PRINT_RESP);
break;
case Constant.EVENT.NAME.ADJUST_RESP:
N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.ADJUST_RESP);
// N5CallbackManage.getInstance().post(currentActivity, response, Constant.EVENT.NAME.ADJUST_RESP);
break;
case "RETRIEVAL_RESP":
N5CallbackManage.getInstance().post(currentActivity, response, "RETRIEVAL_RESP");
// N5CallbackManage.getInstance().post(currentActivity, response, "RETRIEVAL_RESP");
break;
case "SETTLE_RESP":
N5CallbackManage.getInstance().post(currentActivity, response, "SETTLE_RESP");
// N5CallbackManage.getInstance().post(currentActivity, response, "SETTLE_RESP");
break;
}
} catch (JSONException e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment