Skip to content

android / dayu

Go to a project
Commit 8330d922 by mReturn
Options

fix bug

parent 9cfc3748
Inline Side-by-side
Showing with 59 additions and 19 deletions
baseSDK/src/main/res/values/strings.xml
......@@ -780,6 +780,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="order_send_info">派单信息</string>
<string name="order_send_company">派单商家</string>
<string name="order_take_price">接单工费</string>
<string name="be_takeed_price">代收款项</string>
<string name="take_price_subsidy">工费补贴</string>
<string name="contact_seller_support">联系商家技术支持</string>
<string name="stand_operate_step_">标准操作步骤：</string>
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
......@@ -86,6 +86,12 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
mServerAdapter.setViewType(R.layout.item_detail_server_info);
mBind.rlServerContent.setAdapter(mServerAdapter);
mServerAdapter.setData(detail.getSpus());
if (detail.getPayType() == 1 && detail.getPayStatus() != 3){
mBind.llNoReceivePrice.setVisibility(View.VISIBLE);
}else{
mBind.llNoReceivePrice.setVisibility(View.GONE);
}
//设备数量
if (detail.getSpus() != null && detail.getSpus().size() > 0 && detail.getSpus().get(0).getSpuModels() != null) {
mBind.rlDeviceCount.setVisibility(View.VISIBLE);
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
......@@ -239,6 +239,31 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_no_receive_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:text="@string/be_takeed_price"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:text='@{item.totalPrice+"元"}'
android:textColor="@color/common_red"
android:textSize="14sp" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/HomeSaleFragment.java
......@@ -95,10 +95,11 @@ public class HomeSaleFragment extends BaseFragment<HomeSalePresenter, FragmentHo
}
mTabNumTv = tab.getCustomView().findViewById(R.id.tabtext);
mTabTextTv = tab.getCustomView().findViewById(R.id.tabicon);
mTabNumTv.setTextColor(getResources().getColor(R.color.bg_button));
if (temp != 2)
mTabNumTv.setTextColor(getResources().getColor(R.color.bg_button));
mTabTextTv.setTextColor(getResources().getColor(R.color.bg_button));
mBind.vpSale.setCurrentItem(temp);
MobclickAgent.onPageStart("SaleChildFragment"+temp);
MobclickAgent.onPageStart("SaleChildFragment" + temp);
}
@Override
......@@ -106,7 +107,9 @@ public class HomeSaleFragment extends BaseFragment<HomeSalePresenter, FragmentHo
if (mTabNumTv == null || mTabTextTv == null) {
return;
}
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
int temp = tab.getPosition();
if (temp != 2)
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
}
......@@ -122,13 +125,13 @@ public class HomeSaleFragment extends BaseFragment<HomeSalePresenter, FragmentHo
public void setTabNum(SaleTab tab, int myTabIndex) {
// EventBus.getDefault().post(new SaleTabNumEvent(tab.products+tab.collect+tab.inSale+tab.saleDone));
EventBus.getDefault().post(new SaleTabNumEvent(tab.inSale));
String[] tabNum = new String[]{tab.products + "",tab.collect + "", tab.inSale + "",tab.saleDone + ""};
String[] tabNum = new String[]{tab.products + "", tab.collect + "", tab.inSale + "", tab.saleDone + ""};
if (isFirstAddTab) {
mBind.tbSale.removeAllTabs();
mBind.tbSale.addTab(mBind.tbSale.newTab().setCustomView(CreatTab(tabNum[0], tabDesc[0])));
mBind.tbSale.addTab(mBind.tbSale.newTab().setCustomView(CreatTab(tabNum[1], tabDesc[1])));
mBind.tbSale.addTab(mBind.tbSale.newTab().setCustomView(CreatTab(tabNum[2], tabDesc[2])));
mBind.tbSale.addTab(mBind.tbSale.newTab().setCustomView(CreatTab(tabNum[3], tabDesc[3])));
mBind.tbSale.addTab(mBind.tbSale.newTab().setCustomView(CreatTab(0,tabNum[0], tabDesc[0])));
mBind.tbSale.addTab(mBind.tbSale.newTab().setCustomView(CreatTab(1,tabNum[1], tabDesc[1])));
mBind.tbSale.addTab(mBind.tbSale.newTab().setCustomView(CreatTab(2,tabNum[2], tabDesc[2])));
mBind.tbSale.addTab(mBind.tbSale.newTab().setCustomView(CreatTab(3,tabNum[3], tabDesc[3])));
isFirstAddTab = false;
} else {
for (int i = 0; i < mBind.tbSale.getTabCount(); i++) {
......@@ -144,10 +147,13 @@ public class HomeSaleFragment extends BaseFragment<HomeSalePresenter, FragmentHo
}
}
private View CreatTab(String number, String iconID) {
private View CreatTab(int index,String number, String iconID) {
View newtab = LayoutInflater.from(mActivity).inflate(R.layout.layout_sale_tab, null);
TextView textView_number = newtab.findViewById(R.id.tabtext);
AssetManager mgr = mActivity.getAssets();
if (index == 2){
textView_number.setTextColor(getResources().getColor(R.color.cl_tab_read));
}
Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");
textView_number.setTypeface(tf);
textView_number.setText(number);
......
userCenter/src/main/java/com/dayu/usercenter/presenter/pwlogin/PwLoginPresenter.java
......@@ -146,11 +146,11 @@ public class PwLoginPresenter extends PwLoginContract.Presenter {
public void dumpAndSave(UserInfo info) {
LogUtils.e("HxAccount: "+info.getHxAccount());
switch (UserManager.getInstance().getRole(info)) {
case Constants.MANAGER:
UserManager.getInstance().saveUser(info);
loginHx(info.getHxAccount(), info.getHxPwd());
getStations(Integer.parseInt(info.getAccountId()));
break;
// case Constants.MANAGER:
// UserManager.getInstance().saveUser(info);
// loginHx(info.getHxAccount(), info.getHxPwd());
// getStations(Integer.parseInt(info.getAccountId()));
// break;
case Constants.ENGINEER:
case Constants.MANAGER_ENGINEER:
if (info.getDetectStatus() == 1 || info.getDetectStatus() == 2 || info.getDetectStatus() == 3) {
......@@ -161,6 +161,7 @@ public class PwLoginPresenter extends PwLoginContract.Presenter {
}
break;
default:
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
break;
}
}
......
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
......@@ -121,11 +121,11 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
// role.add(3);
// info.setRoles(role);
switch (UserManager.getInstance().getRole(info)) {
case Constants.MANAGER:
UserManager.getInstance().saveUser(info);
loginHx(info.getHxAccount(), info.getHxPwd());
getStations(Integer.parseInt(info.getAccountId()));
break;
// case Constants.MANAGER:
// UserManager.getInstance().saveUser(info);
// loginHx(info.getHxAccount(), info.getHxPwd());
// getStations(Integer.parseInt(info.getAccountId()));
// break;
case Constants.ENGINEER:
case Constants.MANAGER_ENGINEER:
if (info.getDetectStatus() == 1 || info.getDetectStatus() == 2 || info.getDetectStatus() == 3) {
......@@ -136,6 +136,7 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
}
break;
default:
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
break;
}
}
......
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 sign in to comment