Skip to content

M
machine
Commit 52c48c55 by wjg
Options

add update

parent 6249ed85
Showing with 1554 additions and 492 deletions
app/src/main/AndroidManifest.xml
......@@ -34,7 +34,7 @@
tools:replace="android:allowBackup,android:icon">
<activity
android:name=".view.LauncherActivity"
android:name=".home.view.LauncherActivity"
android:exported="true"
android:label="@string/app_name"
android:screenOrientation="landscape"
......@@ -49,7 +49,7 @@
</intent-filter>
</activity>
<activity
android:name=".view.SettingsActivity"
android:name=".setting.view.SettingsActivity"
android:exported="true"
android:label="@string/app_name"
android:screenOrientation="landscape" />
......
app/src/main/java/com/ihaoin/hooloo/device/HLApplication.java
......@@ -3,13 +3,15 @@ package com.ihaoin.hooloo.device;
import android.app.Application;
import android.graphics.Typeface;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.base.AppConfig;
import com.ihaoin.hooloo.device.update.UpdateSocket;
import com.ihaoin.hooloo.device.data.MainData;
import com.ihaoin.hooloo.device.data.TrolleyGoods;
import com.ihaoin.hooloo.device.data.enums.PresentState;
import com.ihaoin.hooloo.device.data.vo.Category;
import com.ihaoin.hooloo.device.network.HttpUtil;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.Utils;
import com.umeng.commonsdk.UMConfigure;
import java.lang.reflect.Field;
......@@ -21,6 +23,8 @@ import cn.jpush.android.api.JPushInterface;
public class HLApplication extends Application {
public static HLApplication SELF = null;
public static String RECOGNIZE_PERSON = "";
private UpdateSocket updateSocket = null;
@Override
public void onCreate() {
......@@ -37,6 +41,28 @@ public class HLApplication extends Application {
AppConfig.REGISTRATION_ID = JPushInterface.getRegistrationID(this);
HttpUtil.postRegistrationId();
startUpdateSocket();
}
@Override
public void onTerminate() {
super.onTerminate();
Utils.i("Application onTerminate");
stopUpdateSocket();
}
private void startUpdateSocket() {
updateSocket = new UpdateSocket(this);
updateSocket.start();
}
private void stopUpdateSocket() {
if (updateSocket != null) {
updateSocket.close();
updateSocket = null;
}
}
private void setDefaultTypeface() {
......
app/src/main/java/com/ihaoin/hooloo/device/config/AppConfig.java → app/src/main/java/com/ihaoin/hooloo/device/base/AppConfig.java
package com.ihaoin.hooloo.device.config;
package com.ihaoin.hooloo.device.base;
import com.ihaoin.hooloo.device.data.enums.PresentState;
......
app/src/main/java/com/ihaoin/hooloo/device/config/Base.java → app/src/main/java/com/ihaoin/hooloo/device/base/Base.java
package com.ihaoin.hooloo.device.config;
package com.ihaoin.hooloo.device.base;
public class Base {
public static final Integer TRUE = 1;
public static final Integer FALSE = 0;
public static final Integer DELETE = 2;
private static final String SOCKET_HOST = "http://192.168.1.155:8000";
public static final String NSP_UPGRADE = SOCKET_HOST + "/upgrade";
public static final String NSP_KDS = SOCKET_HOST + "/kds";
public static final String NSP_INTERACTION = SOCKET_HOST + "/interaction";
public static final String NSP_MACHINE = SOCKET_HOST + "/getMachineInfo";
public static final String PUSH_DEFAULT_EXTRA = "PUSH_DEFAULT_EXTRA";
public static final String PUSH_ACTION_ORDER_STATE_CHANGED = "ORDER_STATE_CHANGED";
public static final String PUSH_ACTION_SKU_STATE_CHANGED = "SKU_STATE_CHANGED";
......
app/src/main/java/com/ihaoin/hooloo/device/network/BizException.java → app/src/main/java/com/ihaoin/hooloo/device/base/BizException.java
package com.ihaoin.hooloo.device.network;
package com.ihaoin.hooloo.device.base;
public class BizException extends RuntimeException {
public BizException(String msg) {
......
app/src/main/java/com/ihaoin/hooloo/device/component/MachineInfoSocket.java → app/src/main/java/com/ihaoin/hooloo/device/base/MachineInfoSocket.java
package com.ihaoin.hooloo.device.component;
package com.ihaoin.hooloo.device.base;
import android.content.Context;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.data.vo.MachineInfoMsg;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.JsonUtils;
......@@ -18,9 +17,6 @@ import io.socket.client.Socket;
public class MachineInfoSocket extends Thread {
private Context mContext;
private Socket mSocket;
private static final String mUrl = "localhost:8000";
private static final String mNamespace = "getMachineInfo";
private String tag = "[HL_CLIENT]";
public MachineInfoSocket(Context context) {
this.mContext = context;
......@@ -33,7 +29,8 @@ public class MachineInfoSocket extends Thread {
private void connectSocket() {
try {
mSocket = IO.socket(mUrl + "/" + mNamespace);
mSocket = IO.socket(Base.NSP_MACHINE);
mSocket.connect();
} catch (Exception e) {
Utils.i("连接server失败，错误原因：" + e.getMessage());
e.printStackTrace();
......
app/src/main/java/com/ihaoin/hooloo/device/component/PushMessageReceiver.java
......@@ -5,7 +5,7 @@ import android.content.Intent;
import com.fasterxml.jackson.databind.JsonNode;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.base.AppConfig;
import com.ihaoin.hooloo.device.network.HttpUtil;
import com.ihaoin.hooloo.device.util.JsonUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
......
app/src/main/java/com/ihaoin/hooloo/device/data/vo/InteractionMsg.java
package com.ihaoin.hooloo.device.data.vo;
import java.io.Serializable;
import java.util.List;
public class InteractionMsg implements Serializable {
/**
......@@ -15,20 +16,32 @@ public class InteractionMsg implements Serializable {
/** 交互屏状态描述 */
private String stateDesc;
/** 内容文案 */
private String sentence;
/** 生成的文字 */
private List<Sentence> sentences;
/** 生成的IP形象图片地址 */
private String picture;
/** 生成的背景图片地址 */
private String background;
/** 背景图片描述 */
/** 背景图片地址描述 */
private String backgroundDesc;
/** 生成的IP形象图片地址 */
private String picture;
/** 推荐的商品 */
private String recommendGoods;
/** 推荐的商品icon */
private String goodsIcon;
/** 推荐的商品的描述 */
private String recommendSentence;
/** 转场动画图片地址 */
private String cutToPicture;
/** 生成的头像地址 */
private String avatar;
/** 识别到的人脸特征标识 */
private String recognizePerson;
public Integer getState() {
return state;
......@@ -46,12 +59,20 @@ public class InteractionMsg implements Serializable {
this.stateDesc = stateDesc;
}
public String getSentence() {
return sentence;
public List<Sentence> getSentences() {
return sentences;
}
public void setSentence(String sentence) {
this.sentence = sentence;
public void setSentences(List<Sentence> sentences) {
this.sentences = sentences;
}
public String getPicture() {
return picture;
}
public void setPicture(String picture) {
this.picture = picture;
}
public String getBackground() {
......@@ -70,19 +91,43 @@ public class InteractionMsg implements Serializable {
this.backgroundDesc = backgroundDesc;
}
public String getPicture() {
return picture;
public String getRecommendGoods() {
return recommendGoods;
}
public void setPicture(String picture) {
this.picture = picture;
public void setRecommendGoods(String recommendGoods) {
this.recommendGoods = recommendGoods;
}
public String getGoodsIcon() {
return goodsIcon;
}
public void setGoodsIcon(String goodsIcon) {
this.goodsIcon = goodsIcon;
}
public String getRecommendSentence() {
return recommendSentence;
}
public void setRecommendSentence(String recommendSentence) {
this.recommendSentence = recommendSentence;
}
public String getCutToPicture() {
return cutToPicture;
}
public void setCutToPicture(String cutToPicture) {
this.cutToPicture = cutToPicture;
}
public String getAvatar() {
return avatar;
public String getRecognizePerson() {
return recognizePerson;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
public void setRecognizePerson(String recognizePerson) {
this.recognizePerson = recognizePerson;
}
}
app/src/main/java/com/ihaoin/hooloo/device/data/vo/KDSOrder.java
......@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
public class KDSOrder implements Serializable {
@JsonProperty("order_num")
@JsonProperty("orderNum")
private String orderNumber;
@JsonProperty("percent")
......
app/src/main/java/com/ihaoin/hooloo/device/data/vo/Sentence.java 0 → 100644
package com.ihaoin.hooloo.device.data.vo;
import java.io.Serializable;
public class Sentence implements Serializable {
/** 顺序 */
private Integer turn;
/** 字号 */
private Integer fontSize;
/** 文字 */
private String sentence;
public Integer getTurn() {
return turn;
}
public void setTurn(Integer turn) {
this.turn = turn;
}
public Integer getFontSize() {
return fontSize;
}
public void setFontSize(Integer fontSize) {
this.fontSize = fontSize;
}
public String getSentence() {
return sentence;
}
public void setSentence(String sentence) {
this.sentence = sentence;
}
}
app/src/main/java/com/ihaoin/hooloo/device/adapter/GoodsAdapter.java → app/src/main/java/com/ihaoin/hooloo/device/home/adapter/GoodsAdapter.java
package com.ihaoin.hooloo.device.adapter;
package com.ihaoin.hooloo.device.home.adapter;
import android.content.Context;
import android.graphics.Paint;
......@@ -13,7 +13,7 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseSectionQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.ScrollBean;
import com.ihaoin.hooloo.device.data.enums.SkuState;
import com.ihaoin.hooloo.device.data.vo.Goods;
......@@ -39,6 +39,7 @@ public class GoodsAdapter extends BaseSectionQuickAdapter<ScrollBean, BaseViewHo
protected void convert(BaseViewHolder helper, ScrollBean item) {
ScrollBean.ScrollItemBean t = item.t;
ViewGroup layoutItem = helper.getView(R.id.layout_item);
layoutItem.setForeground(null);
Goods goods = (Goods) t.getObject();
helper.setText(R.id.txt_name, goods.getName());
......
app/src/main/java/com/ihaoin/hooloo/device/adapter/OrderAdapter.java → app/src/main/java/com/ihaoin/hooloo/device/home/adapter/OrderAdapter.java
package com.ihaoin.hooloo.device.adapter;
package com.ihaoin.hooloo.device.home.adapter;
import android.content.Context;
import android.view.LayoutInflater;
......
app/src/main/java/com/ihaoin/hooloo/device/adapter/RecommendAdapter.java → app/src/main/java/com/ihaoin/hooloo/device/home/adapter/RecommendAdapter.java
package com.ihaoin.hooloo.device.adapter;
package com.ihaoin.hooloo.device.home.adapter;
import android.content.Context;
import android.view.View;
......
app/src/main/java/com/ihaoin/hooloo/device/view/ClearDialog.java → app/src/main/java/com/ihaoin/hooloo/device/home/dialog/ClearDialog.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.home.dialog;
import android.app.Dialog;
import android.content.Context;
......@@ -12,7 +12,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.home.view.LauncherActivity;
import com.ihaoin.hooloo.device.util.Utils;
public class ClearDialog extends Dialog {
......
app/src/main/java/com/ihaoin/hooloo/device/view/ConfirmOrderDialog.java → app/src/main/java/com/ihaoin/hooloo/device/home/dialog/ConfirmOrderDialog.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.home.dialog;
import android.app.Dialog;
import android.content.BroadcastReceiver;
......@@ -23,20 +23,23 @@ import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.component.NetworkHandler;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.network.NetworkHandler;
import com.ihaoin.hooloo.device.base.AppConfig;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.TrolleyGoods;
import com.ihaoin.hooloo.device.data.po.ConfirmGoods;
import com.ihaoin.hooloo.device.data.po.ConfirmOrder;
import com.ihaoin.hooloo.device.data.vo.Goods;
import com.ihaoin.hooloo.device.data.vo.Sku;
import com.ihaoin.hooloo.device.home.view.LauncherActivity;
import com.ihaoin.hooloo.device.network.HttpUtil;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.JsonUtils;
import com.ihaoin.hooloo.device.util.RandomUtils;
import com.ihaoin.hooloo.device.util.SharedPreferencesUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
import com.ihaoin.hooloo.device.util.Utils;
import java.util.ArrayList;
......@@ -285,6 +288,9 @@ public class ConfirmOrderDialog extends Dialog {
private Bitmap genQRCode(String saveCode) throws WriterException {
String url = String.format(AppConfig.WX_URL, saveCode);
if (!StringUtils.isEmpty(HLApplication.RECOGNIZE_PERSON)) {
url += "recognizePerson=" + HLApplication.RECOGNIZE_PERSON;
}
int width = Utils.dpToPx(getContext(), 800); // 图像宽度
int height = Utils.dpToPx(getContext(), 800); // 图像高度
Map<EncodeHintType, Object> hints = new HashMap();
......
app/src/main/java/com/ihaoin/hooloo/device/view/GoodsDetailDialog.java → app/src/main/java/com/ihaoin/hooloo/device/home/dialog/GoodsDetailDialog.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.home.dialog;
import android.app.Dialog;
import android.content.BroadcastReceiver;
......@@ -29,15 +29,16 @@ import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.component.AutoWrapLayout;
import com.ihaoin.hooloo.device.component.IntroViewPager;
import com.ihaoin.hooloo.device.component.NetworkHandler;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.network.NetworkHandler;
import com.ihaoin.hooloo.device.base.AppConfig;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.enums.SkuState;
import com.ihaoin.hooloo.device.data.vo.Goods;
import com.ihaoin.hooloo.device.data.vo.GoodsRule;
import com.ihaoin.hooloo.device.data.vo.Sku;
import com.ihaoin.hooloo.device.data.vo.SkuRule;
import com.ihaoin.hooloo.device.data.vo.SkuStateChangedVo;
import com.ihaoin.hooloo.device.home.view.LauncherActivity;
import com.ihaoin.hooloo.device.network.HttpUtil;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.JsonUtils;
......@@ -73,22 +74,13 @@ public class GoodsDetailDialog extends Dialog {
private Button butnAdd;
private Button butnBuy;
private Button butnTrolley;
private View layoutOperate;
private View layoutButns;
private List<View> introViews;
private List<Integer> availableRuleId;
public GoodsDetailDialog(@NonNull Context context, Goods goods) {
super(context);
this.mGoods = goods;
// this.mGoods.getSkus().forEach(sku -> sku.getRules().forEach(rule -> {
// if (rule.getRuleName().equals("热")) {
// sku.setIsDelete(2);
// }
// }));
// 处理售罄的SKU和规格选项
processSelloutRules();
......@@ -112,8 +104,6 @@ public class GoodsDetailDialog extends Dialog {
}
private void initViews() {
layoutButns = findViewById(R.id.layout_butns);
layoutOperate = findViewById(R.id.layout_operate);
butnClose = findViewById(R.id.butn_close);
introPager = findViewById(R.id.intro_pager);
introIndicator = findViewById(R.id.intro_indicator);
......@@ -203,6 +193,8 @@ public class GoodsDetailDialog extends Dialog {
txtName.setText(mGoods.getName());
butnSubtract.setOnClickListener(v -> subtractCount());
butnAdd.setOnClickListener(v -> addCount());
butnSubtract.setForeground(null);
butnAdd.setForeground(null);
icoPrice.setPaintFlags(icoPrice.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
txtPrice.setPaintFlags(txtPrice.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
......@@ -219,6 +211,8 @@ public class GoodsDetailDialog extends Dialog {
// Utils.setTouchDelegate(findViewById(R.id.layout_root), Arrays.asList(butnClose));
setOnDismissListener(dismissListener);
// Utils.showToast(getContext(), "time: " + (System.currentTimeMillis() - Utils.times));
}
OnDismissListener dismissListener = new OnDismissListener() {
......
app/src/main/java/com/ihaoin/hooloo/device/view/TipsDialog.java → app/src/main/java/com/ihaoin/hooloo/device/home/dialog/TipsDialog.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.home.dialog;
import android.app.Dialog;
import android.content.BroadcastReceiver;
......@@ -16,7 +16,8 @@ import androidx.annotation.NonNull;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.home.view.LauncherActivity;
import com.ihaoin.hooloo.device.util.StringUtils;
import com.ihaoin.hooloo.device.util.Utils;
......
app/src/main/java/com/ihaoin/hooloo/device/view/LauncherActivity.java → app/src/main/java/com/ihaoin/hooloo/device/home/view/LauncherActivity.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.home.view;
import android.Manifest;
import android.annotation.SuppressLint;
......@@ -7,7 +7,6 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.hardware.display.DisplayManager;
......@@ -34,16 +33,14 @@ import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.adapter.GoodsAdapter;
import com.ihaoin.hooloo.device.adapter.RecommendAdapter;
import com.ihaoin.hooloo.device.component.InteractionSocket;
import com.ihaoin.hooloo.device.component.KDSSocket;
import com.ihaoin.hooloo.device.component.MachineInfoSocket;
import com.ihaoin.hooloo.device.component.NetworkHandler;
import com.ihaoin.hooloo.device.component.SettingsQueue;
import com.ihaoin.hooloo.device.component.UpdateService;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.base.MachineInfoSocket;
import com.ihaoin.hooloo.device.home.adapter.GoodsAdapter;
import com.ihaoin.hooloo.device.home.adapter.RecommendAdapter;
import com.ihaoin.hooloo.device.network.NetworkHandler;
import com.ihaoin.hooloo.device.setting.SettingsQueue;
import com.ihaoin.hooloo.device.update.UpdateService;
import com.ihaoin.hooloo.device.base.AppConfig;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.MainData;
import com.ihaoin.hooloo.device.data.ScrollBean;
import com.ihaoin.hooloo.device.data.enums.PresentState;
......@@ -59,6 +56,9 @@ import com.ihaoin.hooloo.device.util.JsonUtils;
import com.ihaoin.hooloo.device.util.SharedPreferencesUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
import com.ihaoin.hooloo.device.util.Utils;
import com.ihaoin.hooloo.device.interaction.view.InteractionPresentation;
import com.ihaoin.hooloo.device.kds.view.MenuPresentation;
import com.ihaoin.hooloo.device.trolley.view.TrolleyView;
import java.util.ArrayList;
import java.util.List;
......@@ -112,6 +112,7 @@ public class LauncherActivity extends Activity {
registSkuChangeReceiver();
registGoodsChangeReceiver();
registTouchReceiver();
registHdmiReceiver();
initSettingsQueue();
......@@ -324,6 +325,11 @@ public class LauncherActivity extends Activity {
drawable.setBounds(rect);
butnRadio.setCompoundDrawablePadding(drawablePadding);
butnRadio.setCompoundDrawables(null, drawable, null, null);
Integer left = Utils.getDimens(LauncherActivity.this, R.dimen.category_padding_hor);
Integer top = Utils.getDimens(LauncherActivity.this, R.dimen.category_padding_top);
Integer right = left;
Integer bottom = Utils.getDimens(LauncherActivity.this, R.dimen.category_padding_bottom);
butnRadio.setPadding(left, top, right, bottom);
}
@Override
......@@ -333,6 +339,7 @@ public class LauncherActivity extends Activity {
});
groupCategory.addView(butnRadio, layoutParams);
butnRadio.setForeground(null);
butnRadio.setOnClickListener(v -> {
Integer checkedId = v.getId();
Category tagCategory = (Category) groupCategory.findViewById(checkedId).getTag();
......@@ -417,7 +424,7 @@ public class LauncherActivity extends Activity {
Object obj = msg.obj;
if (msg.what == 0 || obj == null) {
Utils.showToast(LauncherActivity.this, R.string.error_load_main_data);
postDelayed(() -> loadData(), 1000 * 5);
postDelayed(() -> loadData(), 1000 * 30);
return;
}
MainData mainData = JsonUtils.getMapper().readValue(obj.toString(), MainData.class);
......@@ -451,9 +458,8 @@ public class LauncherActivity extends Activity {
this.unregistSkuChangeReceiver();
this.unregistGoodsChangeReceiver();
this.unregistTouchReceiver();
this.unregistHdmiReceiver();
stopMachineClient();
stopKdsClient();
stopIAClient();
System.exit(0);
}
......@@ -463,6 +469,7 @@ public class LauncherActivity extends Activity {
exit();
}
private HdmiReceiver hdmiReceiver;
private TrolleyGoodsChangedReceiver trolleyGoodsChangedReceiver = null;
private TrolleyStateChangedReceiver trolleyStateChangedReceiver = null;
private SettingChangedReceiver settingChangedReceiver;
......@@ -554,42 +561,46 @@ public class LauncherActivity extends Activity {
}
/** 显示副屏内容 */
private void preparePresentView() {
private boolean preparePresentView() {
PresentState present = PresentState.get(SharedPreferencesUtils.getPresentation(LauncherActivity.this));
switch (present) {
case MENU:
showMenuView();
hideInteractionView();
return;
return showMenuView();
case INTERACTION:
hideMenuView();
showInteractionView();
return;
return showInteractionView();
default:
hideMenuView();
hideInteractionView();
return;
return false;
}
// return true;
}
/** 隐藏副屏内容 */
private void hidePresentView() {
hideInteractionView();
hideMenuView();
}
/** 显示交互屏 */
private void showInteractionView() {
private boolean showInteractionView() {
if (AppConfig.DEBUG) {
Utils.showToast(this, "展示交互屏");
}
if (presentView != null) {
return;
return true;
}
DisplayManager displayManager = (DisplayManager) getSystemService(Context.DISPLAY_SERVICE);
Display[] displays = displayManager.getDisplays();
if (CollectionUtils.isEmpty(displays) || displays.length < 2) {
Utils.showToast(this, "未获取到菜单屏硬件");
return;
return false;
}
presentView = new InteractionPresentation(this, displays[1]);
presentView.show();
startIAClient();
return true;
}
/** 隐藏交互屏 */
......@@ -602,31 +613,26 @@ public class LauncherActivity extends Activity {
}
presentView.dismiss();
presentView = null;
stopIAClient();
}
/** 显示菜单屏KDS */
private void showMenuView() {
private boolean showMenuView() {
if (AppConfig.DEBUG) {
Utils.showToast(this, "展示菜单屏");
}
if (menuView != null) {
return;
return true;
}
DisplayManager displayManager = (DisplayManager) getSystemService(Context.DISPLAY_SERVICE);
Display[] displays = displayManager.getDisplays();
if (CollectionUtils.isEmpty(displays) || displays.length < 2) {
Utils.showToast(this, "未获取到菜单屏硬件");
return;
return false;
}
Point point = new Point();
displays[1].getRealSize(point);
Utils.i("point: " + point.toString());
menuView = new MenuPresentation(this, displays[1]);
menuView.show();
startKdsClient();
return true;
}
private void hideMenuView() {
......@@ -638,13 +644,9 @@ public class LauncherActivity extends Activity {
}
menuView.dismiss();
menuView = null;
stopKdsClient();
}
private KDSSocket kdsSocket = null;
private MachineInfoSocket machineSocket = null;
private InteractionSocket interactionSocket = null;
private void startMachineClient() {
machineSocket = new MachineInfoSocket(this);
......@@ -658,33 +660,23 @@ public class LauncherActivity extends Activity {
}
}
private void startKdsClient() {
kdsSocket = new KDSSocket(this);
kdsSocket.start();
}
private void stopKdsClient() {
if (kdsSocket != null) {
kdsSocket.close();
kdsSocket = null;
private void requestPermissions() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
requestPermissions(new String[]{Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 100);
}
}
private void startIAClient() {
interactionSocket = new InteractionSocket(this);
interactionSocket.start();
}
private void stopIAClient() {
if (interactionSocket != null) {
interactionSocket.close();
interactionSocket = null;
}
private void registHdmiReceiver() {
hdmiReceiver = new HdmiReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction("android.intent.action.HDMI_PLUGGED");
this.registerReceiver(hdmiReceiver, filter);
}
private void requestPermissions() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
requestPermissions(new String[]{Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 100);
private void unregistHdmiReceiver() {
if (hdmiReceiver != null) {
this.unregisterReceiver(hdmiReceiver);
hdmiReceiver = null;
}
}
......@@ -826,6 +818,20 @@ public class LauncherActivity extends Activity {
}
}
class HdmiReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
boolean state = intent.getBooleanExtra("state", false);
Utils.showToast(LauncherActivity.this, "hdmi state: " + state);
// TODO test
// if (state) {
// new Handler().postDelayed(() -> preparePresentView(), 1000 * 5);
// } else {
// hidePresentView();
// }
}
}
public static Long TIMESTAMP = System.currentTimeMillis();
public static Boolean TIMEOUT_TOGGLE = true;
public static Boolean IN_MAIN = true;
......
app/src/main/java/com/ihaoin/hooloo/device/interaction/InteractionSocket.java 0 → 100644
package com.ihaoin.hooloo.device.interaction;
import android.content.Context;
import com.ihaoin.hooloo.device.util.Utils;
import io.socket.client.Ack;
import io.socket.client.Socket;
import test.IAGen;
/** Linux通信 交互屏 */
public class InteractionSocket extends Thread {
private Context mContext;
private Socket mSocket;
public InteractionSocket(Context context) {
this.mContext = context;
}
@Override
public void run() {
connectSocket();
}
private void connectSocket() {
try {
// TODO test
Utils.sendInteractionMsgBroadcast(mContext, IAGen.getMsg1());
Thread.sleep(30 * 1000);
Utils.sendInteractionMsgBroadcast(mContext, IAGen.getMsg3());
Thread.sleep(30 * 1000);
Utils.sendInteractionMsgBroadcast(mContext, IAGen.getMsg2());
while (true) {
Thread.sleep(30 * 1000);
}
// mSocket = IO.socket(Base.NSP_INTERACTION);
// mSocket.connect();
// mSocket.on("reply", args -> {
// if (CollectionUtils.isEmpty(args)) {
// Utils.i("reply args empty");
// return;
// }
// String content = args[0].toString();
// if (StringUtils.isEmpty(content)) {
// Utils.i("reply content empty");
// return;
// }
// InteractionMsg msg = JsonUtils.readValue(content, InteractionMsg.class);
// if (msg == null) {
// Utils.i("reply msg empty");
// return;
// }
// Utils.sendInteractionMsgBroadcast(mContext, msg);
// });
} catch (Exception e) {
Utils.i("连接server失败，错误原因：" + e.getMessage());
e.printStackTrace();
}
}
public void close() {
try {
if (mSocket != null) {
mSocket.disconnect();
mSocket.close();
mSocket = null;
}
} catch (Exception e) {
Utils.i("close失败，错误原因：" + e.getMessage());
e.printStackTrace();
}
}
public void sendMessage(String content) {
if (mSocket == null) {
Utils.i("socket未连接");
return;
}
try {
mSocket.emit("notice", content, (Ack) args -> {
});
} catch (Exception e) {
Utils.i("发送消息失败，错误原因：" + e.getMessage());
e.printStackTrace();
}
}
}
app/src/main/java/com/ihaoin/hooloo/device/interaction/view/AnimView.java 0 → 100644
package com.ihaoin.hooloo.device.interaction.view;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.data.vo.InteractionMsg;
import com.ihaoin.hooloo.device.data.vo.Sentence;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
import java.util.Optional;
public class AnimView extends RelativeLayout {
private TextView line1;
private TextView line2;
private TextView line3;
private TextView recommend;
private ImageView goodsIcon;
private InteractionMsg mMsg = null;
public AnimView(Context context) {
this(context, null);
}
public AnimView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
public AnimView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
protected void onAttachedToWindow() {
super.onAttachedToWindow();
initView();
}
private void initView() {
line1 = findViewById(R.id.txt_line_1);
line2 = findViewById(R.id.txt_line_2);
line3 = findViewById(R.id.txt_line_3);
recommend = findViewById(R.id.txt_recommend);
goodsIcon = findViewById(R.id.img_goods_icon);
}
public void setMsg(InteractionMsg msg) {
mMsg = msg;
if (mMsg == null) {
return;
}
Sentence s1 = getSentence(1);
Sentence s2 = getSentence(2);
Sentence s3 = getSentence(3);
if (s1 == null) {
line1.setText("");
} else {
line1.setText(s1.getSentence());
line1.setTextSize(s1.getFontSize());
}
if (s2 == null) {
line2.setText("");
} else {
line2.setText(s2.getSentence());
line2.setTextSize(s2.getFontSize());
}
if (s3 == null) {
line3.setText("");
} else {
line3.setText(s3.getSentence());
line3.setTextSize(s3.getFontSize());
}
if (StringUtils.isEmpty(mMsg.getRecommendGoods())) {
recommend.setText("");
goodsIcon.setImageDrawable(null);
} else {
recommend.setText(mMsg.getRecommendSentence());
Glide.with(this).load(mMsg.getGoodsIcon()).into(goodsIcon);
}
}
private Sentence getSentence(Integer num) {
if (mMsg == null) {
return null;
}
if (CollectionUtils.isEmpty(mMsg.getSentences())) {
return null;
}
Optional<Sentence> optional = mMsg.getSentences().stream().filter(x -> x.getTurn().equals(num)).findFirst();
return optional.orElse(null);
}
}
app/src/main/java/com/ihaoin/hooloo/device/interaction/view/InteractionPresentation.java 0 → 100644
package com.ihaoin.hooloo.device.interaction.view;
import android.annotation.SuppressLint;
import android.app.Presentation;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.Display;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.gif.GifDrawable;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.vo.InteractionMsg;
import com.ihaoin.hooloo.device.interaction.InteractionSocket;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
import com.ihaoin.hooloo.device.util.Utils;
import java.util.LinkedList;
import java.util.Queue;
public class InteractionPresentation extends Presentation {
private Queue<InteractionMsg> mMsgQueue = new LinkedList<>();
private Queue<String> mImageQueue = new LinkedList<>();
private InteractionSocket interactionSocket = null;
private ImageView background1;
private ImageView background2;
private ImageView foreground;
private AnimView view1;
private AnimView view2;
public InteractionPresentation(Context outerContext, Display display) {
super(outerContext, display);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.present_interaction);
initViews();
setOnDismissListener(dismissListener);
registInteractionReceiver();
startSocket();
new MsgProcessor().start();
}
private void initViews() {
background1 = findViewById(R.id.img_background1);
background2 = findViewById(R.id.img_background2);
foreground = findViewById(R.id.img_foreground);
view1 = findViewById(R.id.view1);
view2 = findViewById(R.id.view2);
background1.setVisibility(View.VISIBLE);
background2.setVisibility(View.INVISIBLE);
view1.setVisibility(View.VISIBLE);
view2.setVisibility(View.INVISIBLE);
startPlay();
}
private void setInteractionMsg(InteractionMsg msg) {
HLApplication.RECOGNIZE_PERSON = msg.getRecognizePerson();
mMsgQueue.add(msg);
}
private class MsgProcessor extends Thread {
@Override
public void run() {
while (true) {
InteractionMsg msg = mMsgQueue.poll();
if (msg == null) {
Utils.i("msg is null");
continue;
}
try {
Thread.sleep(200);
} catch (InterruptedException e) {
e.printStackTrace();
}
Message message = mMsgHandler.obtainMessage();
message.obj = msg;
mMsgHandler.sendMessage(message);
}
}
}
@SuppressLint("HandlerLeak")
private Handler mMsgHandler = new Handler() {
@Override
public void handleMessage(@NonNull Message message) {
InteractionMsg msg = (InteractionMsg) message.obj;
if (msg == null) {
return;
}
ImageView backgroundOutView = getOutBackground();
if (backgroundOutView != null) {
startAlphaOutAnim(backgroundOutView);
}
ImageView backgroundInView = getInBackground();
backgroundInView.setVisibility(View.VISIBLE);
showBackground(backgroundInView, msg.getBackground());
startAlphaInAnim(backgroundInView);
if (!StringUtils.isEmpty(msg.getCutToPicture())) {
mImageQueue.add(msg.getCutToPicture());
}
if (!StringUtils.isEmpty(msg.getPicture())) {
mImageQueue.add(msg.getPicture());
}
AnimView outAnimView = getOutAnimView();
if (outAnimView != null) {
startTranslateOutAnim(outAnimView);
}
AnimView inAnimView = getInAnimView();
inAnimView.setVisibility(View.VISIBLE);
inAnimView.setMsg(msg);
startTranslateInAnim(inAnimView);
}
};
private void startPlay() {
if (CollectionUtils.isEmpty(mImageQueue)) {
new Handler().postDelayed(() -> startPlay(), 100);
return;
}
play(mImageQueue.peek());
}
private void playNext() {
if (mImageQueue.size() > 1) {
mImageQueue.poll();
}
play(mImageQueue.peek());
}
private void play(String url) {
Glide.with(getContext()).asGif().load(url).into(new CustomTarget<GifDrawable>() {
@Override
public void onResourceReady(@NonNull GifDrawable resource, @Nullable Transition transition) {
resource.registerAnimationCallback(new Animatable2Compat.AnimationCallback() {
@Override
public void onAnimationStart(Drawable drawable) {
super.onAnimationStart(drawable);
}
@Override
public void onAnimationEnd(Drawable drawable) {
super.onAnimationEnd(drawable);
Utils.i("gif end");
playNext();
}
});
resource.setLoopCount(1);
foreground.setImageDrawable(resource);
resource.start();
}
@Override
public void onLoadCleared(@Nullable Drawable placeholder) {
}
});
}
private void startAlphaInAnim(View view) {
Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.interaction_background_in);
view.startAnimation(animation);
}
private void startAlphaOutAnim(View view) {
Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.interaction_background_out);
view.startAnimation(animation);
animation.setAnimationListener(new Animation.AnimationListener() {
@Override
public void onAnimationStart(Animation animation) {
}
@Override
public void onAnimationEnd(Animation animation) {
view.setVisibility(View.INVISIBLE);
}
@Override
public void onAnimationRepeat(Animation animation) {
}
});
}
private void startTranslateInAnim(View view) {
Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.interaction_text_in);
view.startAnimation(animation);
}
private void startTranslateOutAnim(View view) {
Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.interaction_text_out);
view.startAnimation(animation);
animation.setAnimationListener(new Animation.AnimationListener() {
@Override
public void onAnimationStart(Animation animation) {
}
@Override
public void onAnimationEnd(Animation animation) {
view.setVisibility(View.INVISIBLE);
}
@Override
public void onAnimationRepeat(Animation animation) {
}
});
}
private void showBackground(ImageView backgroundInView, String url) {
if (url.endsWith(".gif")) {
Glide.with(getContext()).asGif().load(url).into(backgroundInView);
} else {
Glide.with(getContext()).load(url).into(backgroundInView);
}
}
private OnDismissListener dismissListener = dialog -> {
Utils.i("interaction present dismiss");
unregistInteractionReceiver();
stopSocket();
};
private void startSocket() {
interactionSocket = new InteractionSocket(this.getContext());
interactionSocket.start();
}
private void stopSocket() {
if (interactionSocket != null) {
interactionSocket.close();
interactionSocket = null;
}
}
InteractionReceiver interactionReceiver = null;
private void registInteractionReceiver() {
interactionReceiver = new InteractionReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction(Base.BROADCAST_ACTION_INTERACTION_INFO);
getContext().registerReceiver(interactionReceiver, filter);
}
private void unregistInteractionReceiver() {
if (interactionReceiver != null) {
getContext().unregisterReceiver(interactionReceiver);
interactionReceiver = null;
}
}
private class InteractionReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
InteractionMsg msg = (InteractionMsg) intent.getSerializableExtra("msg");
if (msg == null) {
Utils.i("interaction msg is null");
return;
}
setInteractionMsg(msg);
}
}
private ImageView getInBackground() {
return getBackground(View.INVISIBLE);
}
private ImageView getOutBackground() {
return getBackground(View.VISIBLE);
}
private ImageView getBackground(Integer visibility) {
if (background1.getVisibility() == visibility) {
return background1;
}
if (background2.getVisibility() == visibility) {
return background2;
}
return null;
}
private AnimView getInAnimView() {
return getAnimView(View.INVISIBLE);
}
private AnimView getOutAnimView() {
return getAnimView(View.VISIBLE);
}
private AnimView getAnimView(Integer visibility) {
if (view1.getVisibility() == visibility) {
return view1;
}
if (view2.getVisibility() == visibility) {
return view2;
}
return null;
}
}
app/src/main/java/com/ihaoin/hooloo/device/component/KDSSocket.java → app/src/main/java/com/ihaoin/hooloo/device/kds/KDSSocket.java
package com.ihaoin.hooloo.device.component;
package com.ihaoin.hooloo.device.kds;
import android.content.Context;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.vo.KDSMsg;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.JsonUtils;
......@@ -16,9 +17,6 @@ import io.socket.client.Socket;
public class KDSSocket extends Thread {
private Context mContext;
private Socket mSocket;
private static final String mUrl = "localhost:8000";
private static final String mNamespace = "kds";
private String tag = "[HL_CLIENT]";
public KDSSocket(Context context) {
this.mContext = context;
......@@ -31,9 +29,15 @@ public class KDSSocket extends Thread {
private void connectSocket() {
try {
// IO.Options opts = new IO.Options();
// opts.query = "notice";
mSocket = IO.socket(mUrl + "/" + mNamespace);
mSocket = IO.socket(Base.NSP_KDS);
mSocket.connect();
mSocket.emit("notice", "test", (Ack) args -> {
if (CollectionUtils.isEmpty(args)) {
Utils.i("notice args empty");
return;
}
Utils.i("notice: " + args[0].toString());
});
mSocket.on("reply", args -> {
if (CollectionUtils.isEmpty(args)) {
Utils.i("reply args empty");
......
app/src/main/java/com/ihaoin/hooloo/device/adapter/MachineStateAdapter.java → app/src/main/java/com/ihaoin/hooloo/device/kds/adapter/MachineStateAdapter.java
package com.ihaoin.hooloo.device.adapter;
package com.ihaoin.hooloo.device.kds.adapter;
import android.annotation.SuppressLint;
import android.content.Context;
......@@ -18,7 +18,6 @@ public class MachineStateAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
private KDSMsg msg;
private LayoutInflater inflater;
public MachineStateAdapter(Context context, KDSMsg msg) {
this.context = context;
this.msg = msg;
......
app/src/main/java/com/ihaoin/hooloo/device/view/MenuPresentation.java → app/src/main/java/com/ihaoin/hooloo/device/kds/view/MenuPresentation.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.kds.view;
import android.animation.ValueAnimator;
import android.annotation.SuppressLint;
import android.app.Presentation;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.drawable.AnimationDrawable;
......@@ -27,13 +26,13 @@ import androidx.recyclerview.widget.RecyclerView;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.adapter.MachineStateAdapter;
import com.ihaoin.hooloo.device.component.IntroViewPager;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.MainData;
import com.ihaoin.hooloo.device.data.vo.KDSMsg;
import com.ihaoin.hooloo.device.data.vo.KDSOrder;
import com.ihaoin.hooloo.device.test.KDSGen;
import com.ihaoin.hooloo.device.kds.KDSSocket;
import com.ihaoin.hooloo.device.kds.adapter.MachineStateAdapter;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
import com.ihaoin.hooloo.device.util.Utils;
......@@ -54,6 +53,7 @@ public class MenuPresentation extends Presentation {
private List<View> progressViews = new ArrayList<>();
private List<TextView> waitingViews = new ArrayList<>();
private List<TextView> completedViews = new ArrayList<>();
private KDSSocket kdsSocket = null;
public MenuPresentation(Context outerContext, Display display) {
super(outerContext, display);
......@@ -70,6 +70,7 @@ public class MenuPresentation extends Presentation {
setOnDismissListener(dismissListener);
startImagePagerThread();
startSocket();
}
private void initViews() {
......@@ -118,7 +119,7 @@ public class MenuPresentation extends Presentation {
completedViews.add(findViewById(R.id.completed9));
AnimationDrawable anim = (AnimationDrawable) getContext().getDrawable(R.drawable.menu_avatar);
imgAvatar.setImageDrawable(anim);
imgAvatar.setBackground(anim);
anim.start();
}
......@@ -146,6 +147,18 @@ public class MenuPresentation extends Presentation {
return image;
}
private void startSocket() {
kdsSocket = new KDSSocket(this.getContext());
kdsSocket.start();
}
private void stopSocket() {
if (kdsSocket != null) {
kdsSocket.close();
kdsSocket = null;
}
}
private ImagePagerThread imagePagerThread;
private ImagePagerHandler imagePagerHandler;
......@@ -158,10 +171,11 @@ public class MenuPresentation extends Presentation {
private class ImagePagerThread extends Thread {
@Override
public void run() {
KDSMsg msg = KDSGen.getKdsMsg();
Utils.sendKdsMsgBroadcast(getContext(), msg);
try {
while (true) {
// KDSMsg msg = KDSGen.getKdsMsg();
// Utils.sendKdsMsgBroadcast(getContext(), msg);
Thread.sleep(1000 * 5);
imagePagerHandler.sendEmptyMessage(1);
}
......@@ -249,12 +263,17 @@ public class MenuPresentation extends Presentation {
KDSOrder order = cookings.get(i);
View v = progressViews.get(i);
TextView orderNum = v.findViewById(R.id.txt_order_number);
ImageView bgProgress = v.findViewById(R.id.bg_progress);
View imgTmp = v.findViewById(R.id.img_tmp);
ImageView imgMask = v.findViewById(R.id.img_mask);
TextView txtProgress = v.findViewById(R.id.txt_progress);
orderNum.setText(order.getOrderNumber());
txtProgress.setText(order.getProgress() + "%");
AnimationDrawable anim = (AnimationDrawable) getContext().getDrawable(R.drawable.anim_progress);
bgProgress.setBackground(anim);
anim.start();
LinearLayout.LayoutParams lpMask = (LinearLayout.LayoutParams) imgMask.getLayoutParams();
LinearLayout.LayoutParams lpTemp = (LinearLayout.LayoutParams) imgTmp.getLayoutParams();
......@@ -277,21 +296,20 @@ public class MenuPresentation extends Presentation {
}
}
OnDismissListener dismissListener = new OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
Utils.i("menu present dismiss");
unregistKDSMessageReceiver();
OnDismissListener dismissListener = dialog -> {
Utils.i("menu present dismiss");
unregistKDSMessageReceiver();
if (imagePagerHandler != null) {
imagePagerHandler.removeCallbacksAndMessages(null);
imagePagerHandler = null;
}
if (imagePagerThread != null) {
imagePagerThread.interrupt();
imagePagerThread = null;
}
if (imagePagerHandler != null) {
imagePagerHandler.removeCallbacksAndMessages(null);
imagePagerHandler = null;
}
if (imagePagerThread != null) {
imagePagerThread.interrupt();
imagePagerThread = null;
}
stopSocket();
};
private KDSMessageReceiver mKDSMessageReceiver = null;
......
app/src/main/java/com/ihaoin/hooloo/device/network/HttpParams.java
package com.ihaoin.hooloo.device.network;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.base.AppConfig;
public class HttpParams {
/** 首页获取数据 */
......
app/src/main/java/com/ihaoin/hooloo/device/network/HttpUtil.java
......@@ -6,8 +6,9 @@ import android.os.Handler;
import android.os.Message;
import com.fasterxml.jackson.databind.JsonNode;
import com.ihaoin.hooloo.device.base.BizException;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.base.AppConfig;
import com.ihaoin.hooloo.device.data.po.CheckUpdate;
import com.ihaoin.hooloo.device.util.JsonUtils;
import com.ihaoin.hooloo.device.util.SharedPreferencesUtils;
......
app/src/main/java/com/ihaoin/hooloo/device/component/NetworkHandler.java → app/src/main/java/com/ihaoin/hooloo/device/network/NetworkHandler.java
package com.ihaoin.hooloo.device.component;
package com.ihaoin.hooloo.device.network;
import android.os.Handler;
import android.os.Message;
import androidx.annotation.NonNull;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.base.AppConfig;
import com.ihaoin.hooloo.device.util.Utils;
/**
......
app/src/main/java/com/ihaoin/hooloo/device/component/SettingsQueue.java → app/src/main/java/com/ihaoin/hooloo/device/setting/SettingsQueue.java
package com.ihaoin.hooloo.device.component;
package com.ihaoin.hooloo.device.setting;
import android.content.Context;
import android.view.View;
......
app/src/main/java/com/ihaoin/hooloo/device/view/PwdDialog.java → app/src/main/java/com/ihaoin/hooloo/device/setting/dialog/PwdDialog.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.setting.dialog;
import android.app.Dialog;
import android.content.Context;
......
app/src/main/java/com/ihaoin/hooloo/device/view/TestDialog.java → app/src/main/java/com/ihaoin/hooloo/device/setting/dialog/TestDialog.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.setting.dialog;
import android.app.Dialog;
import android.content.Context;
......
app/src/main/java/com/ihaoin/hooloo/device/view/SettingsActivity.java → app/src/main/java/com/ihaoin/hooloo/device/setting/view/SettingsActivity.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.setting.view;
import android.app.Activity;
import android.app.AlertDialog;
......@@ -11,8 +11,9 @@ import android.widget.TextView;
import android.widget.ToggleButton;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.enums.PresentState;
import com.ihaoin.hooloo.device.home.view.LauncherActivity;
import com.ihaoin.hooloo.device.util.SharedPreferencesUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
import com.ihaoin.hooloo.device.util.Utils;
......
app/src/main/java/com/ihaoin/hooloo/device/adapter/TrolleyAdapter.java → app/src/main/java/com/ihaoin/hooloo/device/trolley/adapter/TrolleyAdapter.java
package com.ihaoin.hooloo.device.adapter;
package com.ihaoin.hooloo.device.trolley.adapter;
import android.content.Context;
import android.graphics.Paint;
......@@ -16,10 +16,10 @@ import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.data.TrolleyGoods;
import com.ihaoin.hooloo.device.data.vo.Goods;
import com.ihaoin.hooloo.device.data.vo.Sku;
import com.ihaoin.hooloo.device.trolley.view.TrolleyView;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.StringAppend;
import com.ihaoin.hooloo.device.util.Utils;
import com.ihaoin.hooloo.device.view.TrolleyView;
import java.util.Arrays;
import java.util.List;
......
app/src/main/java/com/ihaoin/hooloo/device/view/TrolleyView.java → app/src/main/java/com/ihaoin/hooloo/device/trolley/view/TrolleyView.java
package com.ihaoin.hooloo.device.view;
package com.ihaoin.hooloo.device.trolley.view;
import android.content.Context;
import android.graphics.Typeface;
......@@ -19,15 +19,15 @@ import androidx.annotation.NonNull;
import com.fasterxml.jackson.databind.JsonNode;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.adapter.TrolleyAdapter;
import com.ihaoin.hooloo.device.component.NetworkHandler;
import com.ihaoin.hooloo.device.network.NetworkHandler;
import com.ihaoin.hooloo.device.component.Rotate3dAnimation;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.TrolleyGoods;
import com.ihaoin.hooloo.device.data.enums.SkuState;
import com.ihaoin.hooloo.device.data.vo.Goods;
import com.ihaoin.hooloo.device.data.vo.Sku;
import com.ihaoin.hooloo.device.network.HttpUtil;
import com.ihaoin.hooloo.device.trolley.adapter.TrolleyAdapter;
import com.ihaoin.hooloo.device.util.JsonUtils;
import com.ihaoin.hooloo.device.util.RandomUtils;
import com.ihaoin.hooloo.device.util.Utils;
......
app/src/main/java/com/ihaoin/hooloo/device/component/UpdateService.java → app/src/main/java/com/ihaoin/hooloo/device/update/UpdateService.java
package com.ihaoin.hooloo.device.component;
package com.ihaoin.hooloo.device.update;
import android.annotation.SuppressLint;
import android.content.pm.PackageInfo;
......@@ -9,10 +9,10 @@ import android.os.Message;
import androidx.annotation.NonNull;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.network.NetworkHandler;
import com.ihaoin.hooloo.device.data.vo.CheckUpdateVo;
import com.ihaoin.hooloo.device.network.HttpUtil;
import com.ihaoin.hooloo.device.util.ApkUtils;
import com.ihaoin.hooloo.device.util.JsonUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
import com.ihaoin.hooloo.device.util.Utils;
......@@ -55,16 +55,16 @@ public class UpdateService extends Thread {
@Override
public void handleMessage(@NonNull Message msg) {
try {
// CheckUpdateVo updateVo = new CheckUpdateVo();
// updateVo.setUrl("https://testapi.pecktoy.com/files/upload_test/signed-v10.apk");
// updateVo.setVersion("1.0.10");
// updateVo.setVersionCode(10);
Object obj = msg.obj;
if (msg.what == 0 || obj == null) {
Utils.i("check update error");
return;
}
CheckUpdateVo updateVo = JsonUtils.readValue(obj, CheckUpdateVo.class);
CheckUpdateVo updateVo = new CheckUpdateVo();
updateVo.setUrl("https://testapi.pecktoy.com/files/upload_test/signed-v10.apk");
updateVo.setVersion("1.0.10");
updateVo.setVersionCode(10);
// Object obj = msg.obj;
// if (msg.what == 0 || obj == null) {
// Utils.i("check update error");
// return;
// }
// CheckUpdateVo updateVo = JsonUtils.readValue(obj, CheckUpdateVo.class);
if (updateVo.getVersionCode() == null || updateVo.getVersionCode() <= 0) {
Utils.i("version code is null");
return;
......
app/src/main/java/com/ihaoin/hooloo/device/component/InteractionSocket.java → app/src/main/java/com/ihaoin/hooloo/device/update/UpdateSocket.java
package com.ihaoin.hooloo.device.component;
package com.ihaoin.hooloo.device.update;
import android.content.Context;
import com.ihaoin.hooloo.device.data.vo.InteractionMsg;
import com.fasterxml.jackson.databind.JsonNode;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.util.CollectionUtils;
import com.ihaoin.hooloo.device.util.JsonUtils;
import com.ihaoin.hooloo.device.util.StringUtils;
import com.ihaoin.hooloo.device.util.Utils;
import java.io.IOException;
import io.socket.client.Ack;
import io.socket.client.IO;
import io.socket.client.Socket;
/** Linux通信 交互屏 */
public class InteractionSocket extends Thread {
/** Linux通信 检查更新 */
public class UpdateSocket extends Thread {
private Context mContext;
private Socket mSocket;
private static final String mUrl = "localhost:8000";
private static final String mNamespace = "interaction";
private String tag = "[HL_CLIENT]";
public InteractionSocket(Context context) {
public UpdateSocket(Context context) {
this.mContext = context;
}
......@@ -31,26 +31,11 @@ public class InteractionSocket extends Thread {
private void connectSocket() {
try {
// IO.Options opts = new IO.Options();
// opts.query = "notice";
mSocket = IO.socket(mUrl + "/" + mNamespace);
mSocket.on("reply", args -> {
if (CollectionUtils.isEmpty(args)) {
Utils.i("reply args empty");
return;
}
String content = args[0].toString();
if (StringUtils.isEmpty(content)) {
Utils.i("reply content empty");
return;
}
InteractionMsg msg = JsonUtils.readValue(content, InteractionMsg.class);
if (msg == null) {
Utils.i("reply msg empty");
return;
}
Utils.sendInteractionMsgBroadcast(mContext, msg);
});
mSocket = IO.socket(Base.NSP_UPGRADE);
mSocket.connect();
mSocket.on("upgrade", args -> process("upgrade", args));
checkUpdate();
} catch (Exception e) {
Utils.i("连接server失败，错误原因：" + e.getMessage());
e.printStackTrace();
......@@ -70,18 +55,40 @@ public class InteractionSocket extends Thread {
}
}
public void sendMessage(String content) {
public void checkUpdate() {
if (mSocket == null) {
Utils.i("socket未连接");
return;
}
try {
mSocket.emit("notice", content, (Ack) args -> {
});
mSocket.emit("state", "", (Ack) args -> process("state", args));
} catch (Exception e) {
Utils.i("发送消息失败，错误原因：" + e.getMessage());
e.printStackTrace();
}
}
private void process(String func, Object[] args) {
if (CollectionUtils.isEmpty(args)) {
Utils.i(func + " args empty");
return;
}
String content = args[0].toString();
if (StringUtils.isEmpty(content)) {
Utils.i(func + " content empty");
return;
}
try {
JsonNode node = JsonUtils.getMapper().readValue(content, JsonNode.class);
if (node == null) {
Utils.i(func + " msg empty");
return;
}
if (node.get("upgrade") != null && node.get("upgrade").asBoolean()) {
new UpdateService().start();
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
app/src/main/java/com/ihaoin/hooloo/device/util/SharedPreferencesUtils.java
......@@ -3,7 +3,7 @@ package com.ihaoin.hooloo.device.util;
import android.content.Context;
import android.content.SharedPreferences;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.base.AppConfig;
public class SharedPreferencesUtils {
private final static String KEY_SEETINGS = "settings";
......
app/src/main/java/com/ihaoin/hooloo/device/util/Utils.java
package com.ihaoin.hooloo.device.util;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
......@@ -16,8 +14,6 @@ import android.view.LayoutInflater;
import android.view.TouchDelegate;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.Toast;
......@@ -30,21 +26,21 @@ import com.bumptech.glide.request.RequestOptions;
import com.ihaoin.hooloo.device.HLApplication;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.component.TouchDelegateComposite;
import com.ihaoin.hooloo.device.config.AppConfig;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.base.AppConfig;
import com.ihaoin.hooloo.device.base.Base;
import com.ihaoin.hooloo.device.data.TrolleyGoods;
import com.ihaoin.hooloo.device.data.enums.SkuState;
import com.ihaoin.hooloo.device.data.vo.Goods;
import com.ihaoin.hooloo.device.data.vo.InteractionMsg;
import com.ihaoin.hooloo.device.data.vo.KDSMsg;
import com.ihaoin.hooloo.device.data.vo.Sku;
import com.ihaoin.hooloo.device.view.ClearDialog;
import com.ihaoin.hooloo.device.view.ConfirmOrderDialog;
import com.ihaoin.hooloo.device.view.GoodsDetailDialog;
import com.ihaoin.hooloo.device.view.PwdDialog;
import com.ihaoin.hooloo.device.view.SettingsActivity;
import com.ihaoin.hooloo.device.view.TestDialog;
import com.ihaoin.hooloo.device.view.TipsDialog;
import com.ihaoin.hooloo.device.home.dialog.ClearDialog;
import com.ihaoin.hooloo.device.home.dialog.ConfirmOrderDialog;
import com.ihaoin.hooloo.device.home.dialog.GoodsDetailDialog;
import com.ihaoin.hooloo.device.setting.dialog.PwdDialog;
import com.ihaoin.hooloo.device.setting.view.SettingsActivity;
import com.ihaoin.hooloo.device.setting.dialog.TestDialog;
import com.ihaoin.hooloo.device.home.dialog.TipsDialog;
import java.math.BigDecimal;
import java.text.DecimalFormat;
......@@ -113,9 +109,11 @@ public class Utils {
}
public static void showGoodsDetail(Context context, Goods goods) {
// times = System.currentTimeMillis();
GoodsDetailDialog dialog = new GoodsDetailDialog(context, goods);
dialog.show();
}
// public static Long times;
public static void showTips(Context context) {
TipsDialog dialog = new TipsDialog(context);
......
app/src/main/java/com/ihaoin/hooloo/device/view/InteractionPresentation.java deleted 100644 → 0
package com.ihaoin.hooloo.device.view;
import android.app.Presentation;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.view.Display;
import com.ihaoin.hooloo.device.R;
import com.ihaoin.hooloo.device.config.Base;
import com.ihaoin.hooloo.device.util.Utils;
public class InteractionPresentation extends Presentation {
public InteractionPresentation(Context outerContext, Display display) {
super(outerContext, display);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.present_interaction);
initViews();
setOnDismissListener(dismissListener);
registInteractionReceiver();
}
private void initViews() {
}
OnDismissListener dismissListener = new OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
Utils.i("interaction present dismiss");
unregistInteractionReceiver();
}
};
InteractionReceiver interactionReceiver = null;
private void registInteractionReceiver() {
interactionReceiver = new InteractionReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction(Base.BROADCAST_ACTION_INTERACTION_INFO);
getContext().registerReceiver(interactionReceiver, filter);
}
private void unregistInteractionReceiver() {
if (interactionReceiver != null) {
getContext().unregisterReceiver(interactionReceiver);
interactionReceiver = null;
}
}
class InteractionReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
}
}
}
app/src/main/java/test/IAGen.java 0 → 100644
package test;
import com.ihaoin.hooloo.device.data.vo.InteractionMsg;
import com.ihaoin.hooloo.device.data.vo.Sentence;
import java.util.Arrays;
import java.util.Random;
public class IAGen {
public static InteractionMsg getMsg() {
Integer num = getRandom(1, 4);
if (num == 1) {
return getMsg1();
} else if (num == 2) {
return getMsg2();
} else {
return getMsg3();
}
}
public static InteractionMsg getMsg1() {
InteractionMsg msg = new InteractionMsg();
msg.setBackground("https://img.zcool.cn/community/013f8b57bad91f0000018c1bc90051.gif"); // 背景图
msg.setPicture("https://testapi.pecktoy.com/files/upload_test/1.gif"); // 显示图
Sentence s1 = new Sentence();
s1.setTurn(1);
s1.setFontSize(80);
s1.setSentence("小哥哥你好");
Sentence s2 = new Sentence();
s2.setTurn(2);
s2.setFontSize(40);
s2.setSentence("HELLO");
Sentence s3 = new Sentence();
s3.setTurn(3);
s3.setFontSize(40);
s3.setSentence("不常来看我真可恶但你永远可爱\n手表好有个性");
msg.setSentences(Arrays.asList(s1, s2, s3));
msg.setRecommendGoods("经典美式");
msg.setRecommendSentence("来杯经典美式，补充原动力吧希望给你带来好心情");
msg.setGoodsIcon("https://hooloo-saas-test.oss-cn-beijing.aliyuncs.com/hooloo/2022/07/08/%E5%B0%8F%E7%A8%8B%E5%BA%8F%E7%BC%A9%E7%95%A5%E5%9B%BE-%E7%BE%8E%E5%BC%8F.png");
return msg;
}
public static InteractionMsg getMsg2() {
InteractionMsg msg = new InteractionMsg();
msg.setBackground("https://img.zcool.cn/community/01ca285a71ac1da801213466b41ec4.jpg"); //背景图
msg.setCutToPicture("https://testapi.pecktoy.com/files/upload_test/2.gif"); // 过渡图
msg.setPicture("https://testapi.pecktoy.com/files/upload_test/1.gif"); // 显示图
Sentence s1 = new Sentence();
s1.setTurn(1);
s1.setFontSize(80);
s1.setSentence("小姑娘你好");
Sentence s2 = new Sentence();
s2.setTurn(2);
s2.setFontSize(40);
s2.setSentence("HELLO");
Sentence s3 = new Sentence();
s3.setTurn(3);
s3.setFontSize(40);
s3.setSentence("不常来看我真可恶但你永远可爱\n手表好有个性");
msg.setSentences(Arrays.asList(s1, s2, s3));
msg.setRecommendGoods("经典美式");
msg.setRecommendSentence("来杯经典美式，补充原动力吧希望给你带来好心情");
msg.setGoodsIcon("https://hooloo-saas-test.oss-cn-beijing.aliyuncs.com/hooloo/2022/07/04/%E7%82%B9%E5%8D%95%E5%B1%8F%E5%86%85%E5%AE%B9%E5%9B%BE3.png");
return msg;
}
public static InteractionMsg getMsg3() {
InteractionMsg msg = new InteractionMsg();
msg.setBackground("https://img.zcool.cn/community/01b7265a07a15aa80121985c4408c0.gif"); //背景图
msg.setCutToPicture("https://testapi.pecktoy.com/files/upload_test/2.gif"); // 过渡图
msg.setPicture("https://testapi.pecktoy.com/files/upload_test/3.gif"); // 显示图
Sentence s1 = new Sentence();
s1.setTurn(1);
s1.setFontSize(40);
s1.setSentence("小姐姐你好");
Sentence s2 = new Sentence();
s2.setTurn(2);
s2.setFontSize(40);
s2.setSentence("HELLO");
Sentence s3 = new Sentence();
s3.setTurn(3);
s3.setFontSize(40);
s3.setSentence("不常来看我真可恶但你永远可爱\n手表好有个性");
msg.setSentences(Arrays.asList(s1, s2, s3));
// msg.setRecommendGoods("拿铁");
// msg.setRecommendSentence("来杯拿铁，补充原动力吧\n漂亮每一天");
// msg.setGoodsIcon("https://hooloo-saas-test.oss-cn-beijing.aliyuncs.com/hooloo/2022/07/08/%E5%B0%8F%E7%A8%8B%E5%BA%8F%E7%BC%A9%E7%95%A5%E5%9B%BE-%E9%9D%92%E6%8F%90%E8%8C%89%E8%8E%89.png");
return msg;
}
public static Integer getRandom(int min, int max) {
int r = new Random().nextInt(max);
if (r < min) {
r += min;
}
return r;
}
public static Integer getRandom(int max) {
return getRandom(0, max);
}
}
app/src/main/java/com/ihaoin/hooloo/device/test/KDSGen.java → app/src/main/java/test/KDSGen.java
package com.ihaoin.hooloo.device.test;
package test;
import com.ihaoin.hooloo.device.data.vo.KDSMsg;
import com.ihaoin.hooloo.device.data.vo.KDSOrder;
......
app/src/main/res/anim/interaction_background_in.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="3000"
android:fromAlpha="0"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:toAlpha="1" />
app/src/main/res/anim/interaction_background_out.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="3000"
android:fromAlpha="1"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:toAlpha="0" />
app/src/main/res/anim/interaction_text_in.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="3000"
android:fromXDelta="100%p"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:toXDelta="0%p" />
app/src/main/res/anim/interaction_text_out.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="3000"
android:fromXDelta="0%"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:toXDelta="-100%" />
app/src/main/res/dimens-def.xml 0 → 100644
<resources>
<dimen name="padding20">20dp</dimen>
<dimen name="padding15">15dp</dimen>
<dimen name="padding10">10dp</dimen>
<dimen name="padding7">7dp</dimen>
<dimen name="padding5">5dp</dimen>
<dimen name="padding3">3dp</dimen>
<dimen name="toast_width">376px</dimen>
<dimen name="toast_padding_hor">32px</dimen>
<dimen name="toast_padding_ver">55px</dimen>
<dimen name="recommend_padding">5dp</dimen>
<dimen name="recommend_image_height_0">794px</dimen>
<dimen name="recommend_image_height_other">392px</dimen>
<dimen name="recommend_name_margin_top">82px</dimen>
<dimen name="recommend_name_margin_left">68px</dimen>
<dimen name="recommend_desc_margin_top">30px</dimen>
<dimen name="recommend_desc_margin_left">68px</dimen>
<dimen name="goods_padding_top">60px</dimen>
<dimen name="goods_padding_ver">30px</dimen>
<dimen name="goods_padding_right">38px</dimen>
<dimen name="goods_last_padding_bottom">400px</dimen>
<dimen name="goods_thum_size">80dp</dimen>
<dimen name="goods_thum_margin_right">10dp</dimen>
<dimen name="goods_recommend_margin">5dp</dimen>
<dimen name="goods_category_margin_top">10dp</dimen>
<dimen name="goods_tag_margin_top">3dp</dimen>
<dimen name="goods_tag_padding_ver">2px</dimen>
<dimen name="goods_tag_padding_hor">10px</dimen>
<dimen name="goods_tag_margin_right">16px</dimen>
<dimen name="goods_desc_margin_top">26px</dimen>
<dimen name="goods_butns_margin_top">25px</dimen>
<dimen name="goods_price_margin">5px</dimen>
<dimen name="category_padding_top">17px</dimen>
<dimen name="category_padding_bottom">32px</dimen>
<dimen name="category_padding_hor">35px</dimen>
<dimen name="category_drawable_padding">10px</dimen>
<dimen name="category_drawable_width">100px</dimen>
<dimen name="category_drawable_height">75px</dimen>
<dimen name="category_margin">50dp</dimen>
<dimen name="category_divider_padding">0px</dimen>
<dimen name="tip_margin_top">40px</dimen>
<dimen name="tip_padding_top">33px</dimen>
<dimen name="tip_padding_bottom">33px</dimen>
<dimen name="menu_left">1420px</dimen>
<dimen name="menu_right">500px</dimen>
<dimen name="menu_right_top">758px</dimen>
<dimen name="menu_right_bottom">322px</dimen>
<dimen name="menu_divider_padding_hor">10px</dimen>
<dimen name="menu_divider_padding_top">20px</dimen>
<dimen name="menu_divider_padding_bottom">20px</dimen>
<dimen name="menu_content_padding_hor">40px</dimen>
<dimen name="menu_content_padding_top">40px</dimen>
<dimen name="menu_content_padding_bottom">20px</dimen>
<dimen name="menu_spacing_hor">10px</dimen>
<dimen name="menu_spacing_ver">100px</dimen>
<dimen name="menu_logo_bar">80px</dimen>
<dimen name="menu_progress_start">33px</dimen>
<dimen name="menu_progress_end">33px</dimen>
<dimen name="menu_progress_width">280px</dimen>
<dimen name="menu_progress_height">26px</dimen>
<dimen name="menu_title_margin_top">20px</dimen>
<dimen name="menu_title_margin_bottom">10px</dimen>
<dimen name="menu_state_padding_hor">40px</dimen>
<dimen name="menu_state_padding_ver">20px</dimen>
<dimen name="menu_state_padding_bottom">15px</dimen>
<dimen name="menu_state_padding_line">30px</dimen>
<dimen name="menu_state_icon_margin">22px</dimen>
<dimen name="goods_detail_padding_ver">55px</dimen>
<dimen name="goods_detail_padding_hor">40px</dimen>
<dimen name="goods_detail_content_margin_left">40px</dimen>
<dimen name="goods_detail_image_margin_top">50px</dimen>
<dimen name="goods_detail_spec_margin_top">25px</dimen>
<dimen name="goods_detail_rule_width">80dp</dimen>
<dimen name="goods_detail_rule_margin_top">28px</dimen>
<dimen name="goods_detail_rule_margin_right">16px</dimen>
<dimen name="goods_detail_rule_padding_hor">60px</dimen>
<dimen name="goods_detail_rule_padding_ver">10px</dimen>
<dimen name="goods_detail_layout_rule_margin_top">17dp</dimen>
<dimen name="goods_detail_rec_padding_hor">12px</dimen>
<dimen name="goods_detail_rec_padding_ver">5px</dimen>
<dimen name="goods_detail_oper_margin_top">24px</dimen>
<dimen name="goods_detail_oper_margin_left">55px</dimen>
<dimen name="goods_detail_oper_margin_bottom">28px</dimen>
<dimen name="goods_detail_oper_margin_right">35px</dimen>
<dimen name="goods_detail_price_margin_right">3px</dimen>
<dimen name="goods_detail_butn_margin_top">28px</dimen>
<dimen name="goods_detail_butn_padding">23px</dimen>
<dimen name="goods_detail_count_margin_left">36px</dimen>
<dimen name="goods_detail_count_margin_right">40px</dimen>
<dimen name="goods_detail_indicator_margin">20px</dimen>
<dimen name="dialog_detail_width">600dp</dimen>
<dimen name="dialog_tip_width">600dp</dimen>
<dimen name="dialog_clear_width">350dp</dimen>
<dimen name="dialog_clear_height">385px</dimen>
<dimen name="dialog_close_margin">35px</dimen>
<dimen name="clear_butn_height">100px</dimen>
<dimen name="clear_butn_text">40px</dimen>
<dimen name="pwd_input_size">40dp</dimen>
<dimen name="trolley_width">400dp</dimen>
<dimen name="trolley_item_height">100dp</dimen>
<dimen name="trolley_bar_height">60dp</dimen>
<dimen name="trolley_pay_width">150dp</dimen>
<dimen name="trolley_ic_margin_left">80px</dimen>
<dimen name="trolley_ic_parent_width">110px</dimen>
<dimen name="trolley_ic_parent_height">120px</dimen>
<dimen name="trolley_ic_width">92dp</dimen>
<dimen name="trolley_ic_height">110dp</dimen>
<dimen name="trolley_ic_border_size">50dp</dimen>
<dimen name="trolley_count_size">20dp</dimen>
<dimen name="trolley_title_margin_ver">30px</dimen>
<dimen name="trolley_title_margin_hor">38px</dimen>
<dimen name="trolley_clear_text_margin_left">8px</dimen>
<dimen name="trolley_clear_text_margin_right">30px</dimen>
<dimen name="trolley_line_margin">40px</dimen>
<dimen name="trolley_thum_size">142px</dimen>
<dimen name="trolley_thum_margin">40px</dimen>
<dimen name="trolley_item_padding_top">40px</dimen>
<dimen name="trolley_item_padding_left">40px</dimen>
<dimen name="trolley_item_padding_bottom">20px</dimen>
<dimen name="trolley_item_padding_right">40px</dimen>
<dimen name="trolley_options_margin_top">16px</dimen>
<dimen name="trolley_price_margin_top">25px</dimen>
<dimen name="trolley_price_margin_left">11px</dimen>
<dimen name="trolley_count_margin">28px</dimen>
<dimen name="trolley_oper_margin">20px</dimen>
<dimen name="confirm_order_width">1000px</dimen>
<dimen name="confirm_order_padding_top">62px</dimen>
<dimen name="confirm_order_padding_bottom">37px</dimen>
<dimen name="confirm_order_qr_margin_top">45px</dimen>
<dimen name="confirm_order_qrcode_size">375px</dimen>
<dimen name="confirm_order_icon_margin">40px</dimen>
<dimen name="confirm_order_text_one">62px</dimen>
<dimen name="confirm_order_text_two">7px</dimen>
<dimen name="interaction_padding_top">234px</dimen>
<dimen name="interaction_padding_left">150px</dimen>
<dimen name="interaction_padding_bottom">132px</dimen>
<dimen name="interaction_padding_right">106px</dimen>
<dimen name="interaction_text_space">80px</dimen>
<dimen name="interaction_recommend_margin">115px</dimen>
<dimen name="interaction_goods_icon_width">470px</dimen>
<dimen name="interaction_goods_icon_height">470px</dimen>
<dimen name="ts_interaction_line1">260px</dimen>
<dimen name="ts_interaction_line2">100px</dimen>
<dimen name="ts_interaction_line3">100px</dimen>
<dimen name="ts_interaction_recommend_small">120px</dimen>
<dimen name="ts_interaction_recommend_big">150px</dimen>
<dimen name="ic_recommend">10dp</dimen>
<dimen name="ic_clear_size">15dp</dimen>
<dimen name="ic_add_size">20dp</dimen>
<dimen name="ic_subtract_size">20dp</dimen>
<dimen name="ic_checkbox">25dp</dimen>
<dimen name="ic_detail_add_size">20dp</dimen>
<dimen name="ic_detail_subtract_size">20dp</dimen>
<dimen name="ic_dialog_close">20dp</dimen>
<dimen name="ic_scan_succ_width">101px</dimen>
<dimen name="ic_scan_succ_height">97px</dimen>
<dimen name="ts_toast">28px</dimen>
<dimen name="ts_trolley_item_price">20px</dimen>
<dimen name="ts_trolley_item_discount">22px</dimen>
<dimen name="ts_recommend_name">16sp</dimen>
<dimen name="ts_recommend_desc">12sp</dimen>
<dimen name="ts_recommend_name_small">12sp</dimen>
<dimen name="ts_recommend_desc_small">6sp</dimen>
<dimen name="ts_category_radio">12sp</dimen>
<dimen name="ts_category_item">18sp</dimen>
<dimen name="ts_goods_item_name">14sp</dimen>
<dimen name="ts_goods_item_intro">12sp</dimen>
<dimen name="ts_goods_item_price">9sp</dimen>
<dimen name="ts_goods_item_discount">12sp</dimen>
<dimen name="ts_goods_item_sellout">12sp</dimen>
<dimen name="ts_goods_item_tag">9sp</dimen>
<dimen name="ts_trolley_item_count">12sp</dimen>
<dimen name="ts_trolley_name">18sp</dimen>
<dimen name="ts_trolley_clear">12sp</dimen>
<dimen name="ts_trolley_total">16sp</dimen>
<dimen name="ts_trolley_count">12sp</dimen>
<dimen name="ts_trolley_pay">16sp</dimen>
<dimen name="ts_tips">9sp</dimen>
<dimen name="ts_detail_name">20sp</dimen>
<dimen name="ts_detail_spec">14sp</dimen>
<dimen name="ts_detail_spec_rec">6sp</dimen>
<dimen name="ts_detail_rule">12sp</dimen>
<dimen name="ts_detail_count">14sp</dimen>
<dimen name="ts_detail_price">12sp</dimen>
<dimen name="ts_detail_discount">14sp</dimen>
<dimen name="ts_detail_add_trolley">14sp</dimen>
<dimen name="ts_detail_buynow">14sp</dimen>
<dimen name="ts_header_text">14sp</dimen>
<dimen name="ts_dialog_title">18sp</dimen>
<dimen name="ts_scan">14sp</dimen>
<dimen name="ts_expire">12sp</dimen>
<dimen name="ts_order_number">18sp</dimen>
<dimen name="ts_order_number_height">19sp</dimen>
<dimen name="ts_menu_title">22sp</dimen>
<dimen name="ts_menu_subtitle">10sp</dimen>
<dimen name="ts_menu_subtitle1">8sp</dimen>
<dimen name="ts_menu_state">26px</dimen>
<dimen name="ts_setting_name">16sp</dimen>
<dimen name="ts_setting_desc">14sp</dimen>
</resources>
app/src/main/res/drawable/anim_progress.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:duration="40" android:drawable="@mipmap/jindutiao_00000"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00001"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00002"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00003"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00004"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00005"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00006"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00007"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00008"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00009"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00010"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00011"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00012"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00013"/>
<item android:duration="40" android:drawable="@mipmap/jindutiao_00014"/>
</animation-list>
\ No newline at end of file
app/src/main/res/layout/activity_launcher.xml
......@@ -27,7 +27,8 @@
android:id="@+id/rec_recommend"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="afterDescendants" />
android:descendantFocusability="afterDescendants"
android:overScrollMode="never" />
</LinearLayout>
<FrameLayout
android:layout_width="0dp"
......@@ -39,7 +40,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:descendantFocusability="afterDescendants" />
android:descendantFocusability="afterDescendants"
android:overScrollMode="never" />
<include layout="@layout/item_goods_category" />
</FrameLayout>
<ScrollView
......@@ -47,6 +49,7 @@
android:layout_height="match_parent"
android:layout_weight="0.09792"
android:descendantFocusability="afterDescendants"
android:overScrollMode="never"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
......@@ -69,7 +72,7 @@
</ScrollView>
</LinearLayout>
<com.ihaoin.hooloo.device.view.TrolleyView
<com.ihaoin.hooloo.device.trolley.view.TrolleyView
android:id="@+id/view_trolley"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
app/src/main/res/layout/activity_settings.xml
......@@ -9,6 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="afterDescendants"
android:overScrollMode="never"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/dialog_goods_detail.xml
......@@ -12,7 +12,8 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:descendantFocusability="afterDescendants">
android:descendantFocusability="afterDescendants"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -133,7 +134,6 @@
android:textSize="@dimen/ts_detail_price" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_operate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
......@@ -165,7 +165,6 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/layout_butns"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/goods_detail_butn_margin_top"
......
app/src/main/res/layout/item_category.xml
......@@ -7,8 +7,9 @@
android:foreground="?selectableItemBackground"
android:gravity="center"
android:paddingHorizontal="@dimen/category_padding_hor"
android:paddingTop="@dimen/category_padding_top"
android:paddingBottom="@dimen/category_padding_bottom"
android:paddingTop="@dimen/category_padding_top_noimg"
android:paddingBottom="@dimen/category_padding_bottom_noimg"
android:text="123123"
android:textColor="@drawable/sel_category_color"
android:textSize="@dimen/ts_category_radio" />
app/src/main/res/layout/layout_interaction.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<com.ihaoin.hooloo.device.interaction.view.AnimView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/interaction_padding_left"
android:paddingTop="@dimen/interaction_padding_top"
android:paddingRight="@dimen/interaction_padding_right"
android:paddingBottom="@dimen/interaction_padding_bottom">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/txt_line_1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="false"
android:text=""
android:textColor="@color/black"
android:textSize="@dimen/ts_interaction_line1"
android:textStyle="bold" />
<TextView
android:id="@+id/txt_line_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/interaction_text_space"
android:singleLine="false"
android:text=""
android:textColor="@color/black"
android:textSize="@dimen/ts_interaction_line2" />
<TextView
android:id="@+id/txt_line_3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/interaction_text_space"
android:singleLine="false"
android:text=""
android:textColor="@color/black"
android:textSize="@dimen/ts_interaction_line3" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:gravity="bottom"
android:orientation="horizontal">
<TextView
android:id="@+id/txt_recommend"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="false"
android:text=""
android:textColor="@color/black"
android:textSize="@dimen/ts_interaction_recommend_small" />
<ImageView
android:id="@+id/img_goods_icon"
android:layout_width="@dimen/interaction_goods_icon_width"
android:layout_height="@dimen/interaction_goods_icon_height"
android:scaleType="centerCrop" />
</LinearLayout>
</com.ihaoin.hooloo.device.interaction.view.AnimView>
\ No newline at end of file
app/src/main/res/layout/layout_progress.xml
......@@ -2,7 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/ts_order_number_height"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/txt_order_number"
......@@ -20,9 +21,10 @@
android:layout_toRightOf="@id/txt_order_number"
android:layout_weight="1">
<ImageView
android:id="@+id/bg_progress"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginBottom="1px"
android:background="@mipmap/pro_progress" />
<LinearLayout
android:layout_width="match_parent"
......@@ -45,7 +47,6 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:background="@mipmap/pro_bg" />
</RelativeLayout>
<TextView
......
app/src/main/res/layout/present_interaction.xml
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/layout_background"
android:layout_height="match_parent"
android:background="@color/black">
<ImageView
android:id="@+id/img_background1"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/img_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@mipmap/hooloo_launcher" />
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:orientation="horizontal"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingConstraints">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="1"
android:singleLine="false"
android:text="就是借此事物代事物"
android:textColor="@color/black"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="1"
android:singleLine="false"
android:text="它与比拟有相似之处，在于"
android:textColor="@color/black"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="1"
android:singleLine="false"
android:text="它与比之处，但又有所不同，不同之处在于"
android:textColor="@color/black"
android:textSize="18sp" />
</LinearLayout>
android:layout_height="match_parent" />
<ImageView
android:id="@+id/img_ip"
android:id="@+id/img_background2"
android:layout_width="match_parent"
android:layout_height="300dp"
android:scaleType="centerCrop"
android:src="@mipmap/mm_049"
app:layout_constraintBottom_toBottomOf="parent" />
android:layout_height="match_parent"
android:visibility="invisible" />
<LinearLayout
<ImageView
android:id="@+id/img_foreground"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/view1"
layout="@layout/layout_interaction"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/view2"
layout="@layout/layout_interaction"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:padding="10dp"
app:layout_constraintBottom_toTopOf="@+id/img_ip">
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@mipmap/mm_049" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容"
android:textColor="@color/black"
android:textSize="18sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
android:layout_height="match_parent" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/present_menu.xml
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorLogo">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -11,8 +10,7 @@
<com.ihaoin.hooloo.device.component.IntroViewPager
android:id="@+id/image_pager"
android:layout_width="@dimen/menu_left"
android:layout_height="match_parent"
android:background="@color/black" />
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="@dimen/menu_right"
android:layout_height="match_parent"
......@@ -45,12 +43,14 @@
android:id="@+id/progress1"
layout="@layout/layout_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="@dimen/ts_order_number_height"
android:gravity="center_vertical" />
<include
android:id="@+id/progress2"
layout="@layout/layout_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="@dimen/ts_order_number_height"
android:gravity="center_vertical" />
</LinearLayout>
<TextView
android:id="@+id/txt_waiting"
......@@ -68,7 +68,8 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/ts_order_number_height"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/waiting1"
......@@ -97,7 +98,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/ts_order_number_height"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/waiting4"
......@@ -151,7 +153,8 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/ts_order_number_height"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/completed1"
......@@ -180,7 +183,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/ts_order_number_height"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/completed4"
......@@ -209,7 +213,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/ts_order_number_height"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/completed7"
......
app/src/main/res/layout/view_trolley.xml
......@@ -64,7 +64,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/trolley_item_height"
android:descendantFocusability="afterDescendants"
android:divider="@null" />
android:divider="@null"
android:overScrollMode="never" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
......
app/src/main/res/values-w1080dp/dimens.xml → app/src/main/res/values-w800dp/dimens.xml
......@@ -34,6 +34,8 @@
<dimen name="goods_price_margin">5px</dimen>
<dimen name="category_padding_top">17px</dimen>
<dimen name="category_padding_bottom">32px</dimen>
<dimen name="category_padding_top_noimg">28px</dimen>
<dimen name="category_padding_bottom_noimg">33px</dimen>
<dimen name="category_padding_hor">35px</dimen>
<dimen name="category_drawable_padding">10px</dimen>
<dimen name="category_drawable_width">100px</dimen>
......@@ -138,6 +140,38 @@
<dimen name="confirm_order_text_one">62px</dimen>
<dimen name="confirm_order_text_two">7px</dimen>
<dimen name="interaction_padding_top">117px</dimen>
<dimen name="interaction_padding_left">75px</dimen>
<dimen name="interaction_padding_bottom">66px</dimen>
<dimen name="interaction_padding_right">58px</dimen>
<dimen name="interaction_text_space">40px</dimen>
<dimen name="interaction_recommend_margin">55px</dimen>
<dimen name="interaction_goods_icon_width">230px</dimen>
<dimen name="interaction_goods_icon_height">230px</dimen>
<dimen name="ts_interaction_line1">130px</dimen>
<dimen name="ts_interaction_line2">50px</dimen>
<dimen name="ts_interaction_line3">50px</dimen>
<dimen name="ts_interaction_recommend_small">60px</dimen>
<dimen name="ts_interaction_recommend_big">75px</dimen>
<!-- <dimen name="interaction_padding_top">234px</dimen>-->
<!-- <dimen name="interaction_padding_left">150px</dimen>-->
<!-- <dimen name="interaction_padding_bottom">132px</dimen>-->
<!-- <dimen name="interaction_padding_right">106px</dimen>-->
<!-- <dimen name="interaction_text_space">80px</dimen>-->
<!-- <dimen name="interaction_recommend_margin">115px</dimen>-->
<!-- <dimen name="interaction_goods_icon_width">470px</dimen>-->
<!-- <dimen name="interaction_goods_icon_height">470px</dimen>-->
<!-- <dimen name="ts_interaction_line1">260px</dimen>-->
<!-- <dimen name="ts_interaction_line2">100px</dimen>-->
<!-- <dimen name="ts_interaction_line3">100px</dimen>-->
<!-- <dimen name="ts_interaction_recommend_small">120px</dimen>-->
<!-- <dimen name="ts_interaction_recommend_big">150px</dimen>-->
<dimen name="ic_recommend">17px</dimen>
<dimen name="ic_clear_size">20px</dimen>
<dimen name="ic_add_size">40px</dimen>
......@@ -188,6 +222,7 @@
<dimen name="ts_menu_subtitle">36px</dimen>
<dimen name="ts_menu_subtitle1">24px</dimen>
<dimen name="ts_order_number">44px</dimen>
<dimen name="ts_order_number_height">66px</dimen>
<dimen name="ts_menu_state">36px</dimen>
<dimen name="ts_setting_name">18sp</dimen>
<dimen name="ts_setting_desc">16sp</dimen>
......
app/src/main/res/values/dimens.xml
<resources>
<dimen name="padding20">20dp</dimen>
<dimen name="padding15">15dp</dimen>
<dimen name="padding10">10dp</dimen>
<dimen name="padding7">7dp</dimen>
<dimen name="padding5">5dp</dimen>
<dimen name="padding3">3dp</dimen>
<dimen name="padding20">40dp</dimen>
<dimen name="padding15">30dp</dimen>
<dimen name="padding10">20dp</dimen>
<dimen name="padding7">14dp</dimen>
<dimen name="padding5">10dp</dimen>
<dimen name="padding3">5dp</dimen>
<dimen name="toast_width">376px</dimen>
<dimen name="toast_padding_hor">32px</dimen>
<dimen name="toast_padding_ver">55px</dimen>
<dimen name="recommend_padding">5dp</dimen>
<dimen name="recommend_padding">38px</dimen>
<dimen name="recommend_image_height_0">794px</dimen>
<dimen name="recommend_image_height_other">392px</dimen>
<dimen name="recommend_name_margin_top">82px</dimen>
<dimen name="recommend_name_margin_left">68px</dimen>
<dimen name="recommend_desc_margin_top">30px</dimen>
<dimen name="recommend_desc_margin_top">18px</dimen>
<dimen name="recommend_desc_margin_left">68px</dimen>
<dimen name="goods_padding_top">60px</dimen>
<dimen name="goods_padding_top">30px</dimen>
<dimen name="goods_padding_ver">30px</dimen>
<dimen name="goods_padding_right">38px</dimen>
<dimen name="goods_last_padding_bottom">400px</dimen>
<dimen name="goods_thum_size">80dp</dimen>
<dimen name="goods_thum_margin_right">10dp</dimen>
<dimen name="goods_recommend_margin">5dp</dimen>
<dimen name="goods_category_margin_top">10dp</dimen>
<dimen name="goods_tag_margin_top">3dp</dimen>
<dimen name="goods_tag_padding_ver">2px</dimen>
<dimen name="goods_tag_padding_hor">10px</dimen>
<dimen name="goods_tag_margin_right">16px</dimen>
<dimen name="goods_last_padding_bottom">300px</dimen>
<dimen name="goods_thum_size">174px</dimen>
<dimen name="goods_thum_margin_right">40px</dimen>
<dimen name="goods_recommend_margin">30px</dimen>
<dimen name="goods_category_margin_top">13px</dimen>
<dimen name="goods_tag_margin_top">13px</dimen>
<dimen name="goods_tag_padding_ver">0px</dimen>
<dimen name="goods_tag_padding_hor">5px</dimen>
<dimen name="goods_tag_margin_right">15px</dimen>
<dimen name="goods_desc_margin_top">26px</dimen>
<dimen name="goods_butns_margin_top">25px</dimen>
<dimen name="goods_price_margin">5px</dimen>
<dimen name="category_padding_top">17px</dimen>
<dimen name="category_padding_bottom">32px</dimen>
<dimen name="category_padding_top_noimg">28px</dimen>
<dimen name="category_padding_bottom_noimg">33px</dimen>
<dimen name="category_padding_hor">35px</dimen>
<dimen name="category_drawable_padding">10px</dimen>
<dimen name="category_drawable_width">100px</dimen>
<dimen name="category_drawable_height">75px</dimen>
<dimen name="category_margin">50dp</dimen>
<dimen name="category_margin">129px</dimen>
<dimen name="category_divider_padding">0px</dimen>
<dimen name="tip_margin_top">40px</dimen>
<dimen name="tip_padding_top">33px</dimen>
<dimen name="tip_padding_bottom">33px</dimen>
<dimen name="menu_left">1420px</dimen>
<dimen name="menu_right">500px</dimen>
<dimen name="menu_left">1872px</dimen>
<dimen name="menu_right">688px</dimen>
<dimen name="menu_right_top">758px</dimen>
<dimen name="menu_right_bottom">322px</dimen>
<dimen name="menu_divider_padding_hor">10px</dimen>
<dimen name="menu_divider_padding_top">20px</dimen>
<dimen name="menu_divider_padding_bottom">20px</dimen>
<dimen name="menu_content_padding_hor">40px</dimen>
<dimen name="menu_divider_padding_hor">33px</dimen>
<dimen name="menu_divider_padding_top">60px</dimen>
<dimen name="menu_divider_padding_bottom">50px</dimen>
<dimen name="menu_content_padding_hor">48px</dimen>
<dimen name="menu_content_padding_top">40px</dimen>
<dimen name="menu_content_padding_bottom">20px</dimen>
<dimen name="menu_spacing_hor">10px</dimen>
<dimen name="menu_spacing_ver">100px</dimen>
<dimen name="menu_logo_bar">80px</dimen>
<dimen name="menu_content_padding_bottom">30px</dimen>
<dimen name="menu_spacing_hor">30px</dimen>
<dimen name="menu_spacing_ver">20px</dimen>
<dimen name="menu_logo_bar">110px</dimen>
<dimen name="menu_progress_start">33px</dimen>
<dimen name="menu_progress_end">33px</dimen>
<dimen name="menu_progress_width">280px</dimen>
<dimen name="menu_progress_width">279px</dimen>
<dimen name="menu_progress_height">26px</dimen>
<dimen name="menu_title_margin_top">20px</dimen>
<dimen name="menu_title_margin_bottom">10px</dimen>
<dimen name="menu_state_padding_hor">40px</dimen>
<dimen name="menu_state_padding_ver">20px</dimen>
<dimen name="menu_title_margin_bottom">12px</dimen>
<dimen name="menu_state_padding_hor">48px</dimen>
<dimen name="menu_state_padding_ver">35px</dimen>
<dimen name="menu_state_padding_bottom">15px</dimen>
<dimen name="menu_state_padding_line">30px</dimen>
<dimen name="menu_state_padding_line">20px</dimen>
<dimen name="menu_state_icon_margin">22px</dimen>
<dimen name="goods_detail_padding_ver">55px</dimen>
<dimen name="goods_detail_padding_hor">40px</dimen>
<dimen name="goods_detail_content_margin_left">40px</dimen>
<dimen name="goods_detail_content_margin_left">90px</dimen>
<dimen name="goods_detail_image_margin_top">50px</dimen>
<dimen name="goods_detail_spec_margin_top">25px</dimen>
<dimen name="goods_detail_rule_width">80dp</dimen>
<dimen name="goods_detail_rule_margin_top">28px</dimen>
<dimen name="goods_detail_rule_margin_right">16px</dimen>
<dimen name="goods_detail_rule_padding_hor">60px</dimen>
<dimen name="goods_detail_rule_width">148px</dimen>
<dimen name="goods_detail_rule_margin_top">16px</dimen>
<dimen name="goods_detail_rule_margin_right">28px</dimen>
<dimen name="goods_detail_rule_padding_hor">30px</dimen>
<dimen name="goods_detail_rule_padding_ver">10px</dimen>
<dimen name="goods_detail_layout_rule_margin_top">17dp</dimen>
<dimen name="goods_detail_layout_rule_margin_top">17px</dimen>
<dimen name="goods_detail_rec_padding_hor">12px</dimen>
<dimen name="goods_detail_rec_padding_ver">5px</dimen>
<dimen name="goods_detail_oper_margin_top">24px</dimen>
<dimen name="goods_detail_oper_margin_top">25px</dimen>
<dimen name="goods_detail_oper_margin_left">55px</dimen>
<dimen name="goods_detail_oper_margin_bottom">28px</dimen>
<dimen name="goods_detail_oper_margin_bottom">40px</dimen>
<dimen name="goods_detail_oper_margin_right">35px</dimen>
<dimen name="goods_detail_price_margin_right">3px</dimen>
<dimen name="goods_detail_butn_margin_top">28px</dimen>
......@@ -92,26 +94,26 @@
<dimen name="goods_detail_count_margin_right">40px</dimen>
<dimen name="goods_detail_indicator_margin">20px</dimen>
<dimen name="dialog_detail_width">600dp</dimen>
<dimen name="dialog_tip_width">600dp</dimen>
<dimen name="dialog_clear_width">350dp</dimen>
<dimen name="dialog_detail_width">1800px</dimen>
<dimen name="dialog_tip_width">1100px</dimen>
<dimen name="dialog_clear_width">715px</dimen>
<dimen name="dialog_clear_height">385px</dimen>
<dimen name="dialog_close_margin">35px</dimen>
<dimen name="clear_butn_height">100px</dimen>
<dimen name="clear_butn_text">40px</dimen>
<dimen name="pwd_input_size">40dp</dimen>
<dimen name="pwd_input_size">50px</dimen>
<dimen name="trolley_width">400dp</dimen>
<dimen name="trolley_item_height">100dp</dimen>
<dimen name="trolley_bar_height">60dp</dimen>
<dimen name="trolley_pay_width">150dp</dimen>
<dimen name="trolley_width">850px</dimen>
<dimen name="trolley_item_height">210px</dimen>
<dimen name="trolley_bar_height">195px</dimen>
<dimen name="trolley_pay_width">385px</dimen>
<dimen name="trolley_ic_margin_left">80px</dimen>
<dimen name="trolley_ic_parent_width">110px</dimen>
<dimen name="trolley_ic_parent_height">120px</dimen>
<dimen name="trolley_ic_width">92dp</dimen>
<dimen name="trolley_ic_height">110dp</dimen>
<dimen name="trolley_ic_border_size">50dp</dimen>
<dimen name="trolley_count_size">20dp</dimen>
<dimen name="trolley_ic_width">92px</dimen>
<dimen name="trolley_ic_height">110px</dimen>
<dimen name="trolley_ic_border_size">116px</dimen>
<dimen name="trolley_count_size">48px</dimen>
<dimen name="trolley_title_margin_ver">30px</dimen>
<dimen name="trolley_title_margin_hor">38px</dimen>
<dimen name="trolley_clear_text_margin_left">8px</dimen>
......@@ -138,57 +140,90 @@
<dimen name="confirm_order_text_one">62px</dimen>
<dimen name="confirm_order_text_two">7px</dimen>
<dimen name="ic_recommend">10dp</dimen>
<dimen name="ic_clear_size">15dp</dimen>
<dimen name="ic_add_size">20dp</dimen>
<dimen name="ic_subtract_size">20dp</dimen>
<dimen name="ic_checkbox">25dp</dimen>
<dimen name="ic_detail_add_size">20dp</dimen>
<dimen name="ic_detail_subtract_size">20dp</dimen>
<dimen name="ic_dialog_close">20dp</dimen>
<dimen name="interaction_padding_top">117px</dimen>
<dimen name="interaction_padding_left">75px</dimen>
<dimen name="interaction_padding_bottom">66px</dimen>
<dimen name="interaction_padding_right">58px</dimen>
<dimen name="interaction_text_space">40px</dimen>
<dimen name="interaction_recommend_margin">55px</dimen>
<dimen name="interaction_goods_icon_width">230px</dimen>
<dimen name="interaction_goods_icon_height">230px</dimen>
<dimen name="ts_interaction_line1">130px</dimen>
<dimen name="ts_interaction_line2">50px</dimen>
<dimen name="ts_interaction_line3">50px</dimen>
<dimen name="ts_interaction_recommend_small">60px</dimen>
<dimen name="ts_interaction_recommend_big">75px</dimen>
<!-- <dimen name="interaction_padding_top">234px</dimen>-->
<!-- <dimen name="interaction_padding_left">150px</dimen>-->
<!-- <dimen name="interaction_padding_bottom">132px</dimen>-->
<!-- <dimen name="interaction_padding_right">106px</dimen>-->
<!-- <dimen name="interaction_text_space">80px</dimen>-->
<!-- <dimen name="interaction_recommend_margin">115px</dimen>-->
<!-- <dimen name="interaction_goods_icon_width">470px</dimen>-->
<!-- <dimen name="interaction_goods_icon_height">470px</dimen>-->
<!-- <dimen name="ts_interaction_line1">260px</dimen>-->
<!-- <dimen name="ts_interaction_line2">100px</dimen>-->
<!-- <dimen name="ts_interaction_line3">100px</dimen>-->
<!-- <dimen name="ts_interaction_recommend_small">120px</dimen>-->
<!-- <dimen name="ts_interaction_recommend_big">150px</dimen>-->
<dimen name="ic_recommend">17px</dimen>
<dimen name="ic_clear_size">20px</dimen>
<dimen name="ic_add_size">40px</dimen>
<dimen name="ic_subtract_size">40px</dimen>
<dimen name="ic_checkbox">40px</dimen>
<dimen name="ic_detail_add_size">60px</dimen>
<dimen name="ic_detail_subtract_size">60px</dimen>
<dimen name="ic_dialog_close">36px</dimen>
<dimen name="ic_scan_succ_width">101px</dimen>
<dimen name="ic_scan_succ_height">97px</dimen>
<dimen name="ts_toast">28px</dimen>
<dimen name="ts_trolley_item_price">20px</dimen>
<dimen name="ts_trolley_item_discount">22px</dimen>
<dimen name="ts_recommend_name">16sp</dimen>
<dimen name="ts_recommend_desc">12sp</dimen>
<dimen name="ts_recommend_name_small">12sp</dimen>
<dimen name="ts_recommend_desc_small">6sp</dimen>
<dimen name="ts_category_radio">12sp</dimen>
<dimen name="ts_category_item">18sp</dimen>
<dimen name="ts_goods_item_name">14sp</dimen>
<dimen name="ts_goods_item_intro">12sp</dimen>
<dimen name="ts_goods_item_price">9sp</dimen>
<dimen name="ts_goods_item_discount">12sp</dimen>
<dimen name="ts_goods_item_sellout">12sp</dimen>
<dimen name="ts_goods_item_tag">9sp</dimen>
<dimen name="ts_trolley_item_count">12sp</dimen>
<dimen name="ts_trolley_name">18sp</dimen>
<dimen name="ts_trolley_clear">12sp</dimen>
<dimen name="ts_trolley_total">16sp</dimen>
<dimen name="ts_trolley_count">12sp</dimen>
<dimen name="ts_trolley_pay">16sp</dimen>
<dimen name="ts_tips">9sp</dimen>
<dimen name="ts_detail_name">20sp</dimen>
<dimen name="ts_detail_spec">14sp</dimen>
<dimen name="ts_detail_spec_rec">6sp</dimen>
<dimen name="ts_detail_rule">12sp</dimen>
<dimen name="ts_detail_count">14sp</dimen>
<dimen name="ts_detail_price">12sp</dimen>
<dimen name="ts_detail_discount">14sp</dimen>
<dimen name="ts_detail_add_trolley">14sp</dimen>
<dimen name="ts_detail_buynow">14sp</dimen>
<dimen name="ts_header_text">14sp</dimen>
<dimen name="ts_dialog_title">18sp</dimen>
<dimen name="ts_scan">14sp</dimen>
<dimen name="ts_expire">12sp</dimen>
<dimen name="ts_order_number">18sp</dimen>
<dimen name="ts_menu_title">22sp</dimen>
<dimen name="ts_menu_subtitle">10sp</dimen>
<dimen name="ts_menu_subtitle1">8sp</dimen>
<dimen name="ts_menu_state">26px</dimen>
<dimen name="ts_setting_name">16sp</dimen>
<dimen name="ts_setting_desc">14sp</dimen>
<dimen name="ts_recommend_name">60px</dimen>
<dimen name="ts_recommend_desc">36px</dimen>
<dimen name="ts_recommend_name_small">36px</dimen>
<dimen name="ts_recommend_desc_small">21px</dimen>
<dimen name="ts_category_radio">28px</dimen>
<dimen name="ts_category_item">40px</dimen>
<dimen name="ts_goods_item_name">28px</dimen>
<dimen name="ts_goods_item_intro">20px</dimen>
<dimen name="ts_goods_item_price">20px</dimen>
<dimen name="ts_goods_item_discount">24px</dimen>
<dimen name="ts_goods_item_sellout">20px</dimen>
<dimen name="ts_goods_item_tag">20px</dimen>
<dimen name="ts_trolley_name">40px</dimen>
<dimen name="ts_trolley_clear">24px</dimen>
<dimen name="ts_trolley_total">48px</dimen>
<dimen name="ts_trolley_item_count">36px</dimen>
<dimen name="ts_trolley_count">36px</dimen>
<dimen name="ts_trolley_pay">48px</dimen>
<dimen name="ts_tips">28px</dimen>
<dimen name="ts_detail_name">40px</dimen>
<dimen name="ts_detail_spec">28px</dimen>
<dimen name="ts_detail_spec_rec">16px</dimen>
<dimen name="ts_detail_rule">28px</dimen>
<dimen name="ts_detail_count">36px</dimen>
<dimen name="ts_detail_price">36px</dimen>
<dimen name="ts_detail_discount">48px</dimen>
<dimen name="ts_detail_add_trolley">48px</dimen>
<dimen name="ts_detail_buynow">48px</dimen>
<dimen name="ts_header_text">40px</dimen>
<dimen name="ts_dialog_title">40px</dimen>
<dimen name="ts_scan">36px</dimen>
<dimen name="ts_expire">36px</dimen>
<dimen name="ts_menu_title">40px</dimen>
<dimen name="ts_menu_subtitle">36px</dimen>
<dimen name="ts_menu_subtitle1">24px</dimen>
<dimen name="ts_order_number">44px</dimen>
<dimen name="ts_order_number_height">66px</dimen>
<dimen name="ts_menu_state">36px</dimen>
<dimen name="ts_setting_name">18sp</dimen>
<dimen name="ts_setting_desc">16sp</dimen>
</resources>
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