简报页
chengzhenyu
променени са 7 файла, в които са добавени 17 реда и са изтрити 2 реда
+ 2
- 0
app/src/main/java/ai/pai/lensman/bean/BriefsBean.java
@@ -12,6 +12,8 @@ public class BriefsBean {
|
||
| 12 | 12 |
public int todayUpload; |
| 13 | 13 |
public float todayIncome; |
| 14 | 14 |
public int weekSold; |
| 15 |
+ public int originPrice; |
|
| 16 |
+ public int noMarkPrice; |
|
| 15 | 17 |
public ArrayList<MessageBean> msgList; |
| 16 | 18 |
public ArrayList<SystemMessageBean> systemMsgList; |
| 17 | 19 |
|
+ 5
- 0
app/src/main/java/ai/pai/lensman/briefs/BriefsActivity.java
@@ -123,4 +123,9 @@ public class BriefsActivity extends BaseActivity implements BriefsContract.View{
|
||
| 123 | 123 |
boxStatusText.setText(boxStatus); |
| 124 | 124 |
} |
| 125 | 125 |
|
| 126 |
+ @Override |
|
| 127 |
+ public void updatePriceInfo(String priceInfo) {
|
|
| 128 |
+ currentPriceText.setText(priceInfo); |
|
| 129 |
+ } |
|
| 130 |
+ |
|
| 126 | 131 |
} |
+ 1
- 0
app/src/main/java/ai/pai/lensman/briefs/BriefsContract.java
@@ -13,6 +13,7 @@ public class BriefsContract {
|
||
| 13 | 13 |
void updateUserInfo(BriefsBean bean); |
| 14 | 14 |
void updateMessageBar(String sysMsg,String orderMsg); |
| 15 | 15 |
void updateBoxInfo(String boxNo,String boxStatus); |
| 16 |
+ void updatePriceInfo(String priceInfo); |
|
| 16 | 17 |
} |
| 17 | 18 |
|
| 18 | 19 |
public interface Presenter extends BasePresenter{
|
+ 3
- 0
app/src/main/java/ai/pai/lensman/briefs/BriefsInteractor.java
@@ -54,6 +54,9 @@ public class BriefsInteractor implements BaseInteractor {
|
||
| 54 | 54 |
bean.todayIncome = (float)data.getDouble("nomark_today_income");
|
| 55 | 55 |
bean.todayUpload = data.getInt("today_upload");
|
| 56 | 56 |
bean.weekSold = data.getInt("week_sold");
|
| 57 |
+ JSONObject priceObj = data.getJSONObject("price_fixed");
|
|
| 58 |
+ bean.noMarkPrice = priceObj.getInt("nomark");
|
|
| 59 |
+ bean.originPrice = priceObj.getInt("origin");
|
|
| 57 | 60 |
JSONObject msgObj = data.getJSONObject("messages");
|
| 58 | 61 |
JSONArray systemMsgArray = msgObj.getJSONArray("system");
|
| 59 | 62 |
|
+ 2
- 0
app/src/main/java/ai/pai/lensman/briefs/BriefsPresenter.java
@@ -59,6 +59,8 @@ public class BriefsPresenter implements BriefsContract.Presenter,BaseInteractor. |
||
| 59 | 59 |
public void onInteractSuccess(BriefsBean bean) {
|
| 60 | 60 |
this.briefsBean = bean; |
| 61 | 61 |
briefsView.updateUserInfo(bean); |
| 62 |
+ briefsView.updatePriceInfo(App.getAppContext().getString(R.string.fixed_price, |
|
| 63 |
+ String.format("%.2f",bean.originPrice*1.0f/100), String.format("%.2f",bean.noMarkPrice*1.0f/100)));
|
|
| 62 | 64 |
briefsView.updateMessageBar(getNextSystemMessage(),getNextOrderMessage()); |
| 63 | 65 |
if(timer!=null){
|
| 64 | 66 |
timer.cancel(); |
+ 2
- 2
app/src/main/res/layout/activity_briefs.xml
@@ -413,8 +413,8 @@ |
||
| 413 | 413 |
android:layout_gravity="center_vertical" |
| 414 | 414 |
android:text="@string/price_manage" |
| 415 | 415 |
android:paddingLeft="10dp" |
| 416 |
- android:textColor="@color/dark_grey" |
|
| 417 |
- android:textSize="16sp" |
|
| 416 |
+ android:textColor="@color/grey" |
|
| 417 |
+ android:textSize="14sp" |
|
| 418 | 418 |
android:layout_weight="1"/> |
| 419 | 419 |
|
| 420 | 420 |
<ImageView |
+ 2
- 0
app/src/main/res/values/strings.xml
@@ -151,4 +151,6 @@ |
||
| 151 | 151 |
<string name="prepare_in_processing">正在准备中，请稍后进行拍摄</string> |
| 152 | 152 |
|
| 153 | 153 |
<string name="new_order_and_check_box">您后台有新的订单，请检查box是否连接</string> |
| 154 |
+ |
|
| 155 |
+ <string name="fixed_price">高清图 ￥ %1$s 去水印 ￥ %2$s</string> |
|
| 154 | 156 |
</resources> |