Skip to content

android / dayu

Go to a project
Commit 8a53191d by luofan
Options

v2.7.6我的页面更改

parent d4b0075f
Inline Side-by-side
Showing with 33 additions and 16 deletions
baseSDK/src/main/java/com/dayu/base/ui/activity/BaseActivity.java
...@@ -24,6 +24,7 @@ import com.dayu.event.AppReturnFrontEvent; ...@@ -24,6 +24,7 @@ import com.dayu.event.AppReturnFrontEvent;
import com.dayu.event.GetRedPacketDataEvent; import com.dayu.event.GetRedPacketDataEvent;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.utils.AppManager; import com.dayu.utils.AppManager;
import com.dayu.utils.LogUtils;
import com.dayu.utils.ProgressUtil; import com.dayu.utils.ProgressUtil;
import com.dayu.utils.TUtil; import com.dayu.utils.TUtil;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
...@@ -76,6 +77,8 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi ...@@ -76,6 +77,8 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
String simpleName = this.getClass().getSimpleName();
LogUtils.e("===当前activity：(" +simpleName+ ".java:1)");
} }
@Override @Override
......
baseSDK/src/main/res/drawable/btn_green_commom_5.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp"/>
<solid android:color="@color/cl_order_item_date"/>
</shape>
\ No newline at end of file
baseSDK/src/main/res/values/strings.xml
...@@ -915,17 +915,17 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ ...@@ -915,17 +915,17 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<!--user--> <!--user-->
<string name="user_customer_satisfied">客户满意度</string> <string name="user_customer_satisfied">客户满意度</string>
<string name="user_cash_arrive">现金到账:</string> <string name="user_cash_arrive">已到账现金:</string>
<string name="cash_arrive_record">现金到账记录</string> <string name="cash_arrive_record">现金到账记录</string>
<string name="user_sale_reward">销售奖励</string> <string name="user_sale_reward">销售奖金</string>
<string name="user_invate_reward">邀请奖励</string> <string name="user_invate_reward">邀请奖励</string>
<string name="invate_person_count">邀请人数</string> <string name="invate_person_count">邀请人数</string>
<string name="reward_total_money">奖励总额</string> <string name="reward_total_money">奖励总额</string>
<string name="be_rewarded_count">获奖次数</string> <string name="be_rewarded_count">获奖次数</string>
<string name="invate_new_reward">邀请师傅有奖</string> <string name="invate_new_reward">有奖邀请新人注册</string>
<string name="invite_record">邀请记录</string> <string name="invite_record">邀请记录</string>
<string name="user_platform_reward">平台奖励</string> <string name="user_platform_reward">平台奖励</string>
<string name="user_service_income">服务收入</string> <string name="user_service_income">服务工费</string>
<string name="user_service_record">服务业绩</string> <string name="user_service_record">服务业绩</string>
<string name="user_sale_record">销售奖励</string> <string name="user_sale_record">销售奖励</string>
<string name="user_word_orders">工单总数</string> <string name="user_word_orders">工单总数</string>
......
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
...@@ -437,7 +437,7 @@ ...@@ -437,7 +437,7 @@
<TextView <TextView
android:id="@+id/tv_settlement_price" android:id="@+id/tv_settlement_price"
style="@style/common_text_style" style="@style/common_text_style"
android:layout_marginLeft="20dp" android:layout_marginLeft="10dp"
android:textColor="@color/common_red" android:textColor="@color/common_red"
android:textStyle="bold" android:textStyle="bold"
android:text="0元" android:text="0元"
...@@ -454,7 +454,7 @@ ...@@ -454,7 +454,7 @@
<TextView <TextView
android:id="@+id/tv_settlement_date" android:id="@+id/tv_settlement_date"
style="@style/common_text_style" style="@style/common_text_style"
android:layout_marginLeft="20dp" android:layout_marginLeft="10dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:text="2020-01-01" android:text="2020-01-01"
/> />
......
orderCenter/src/main/res/values/strings.xml
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<string name="take_oreder_success_tosee">接单成功,请移至待预约列表查看</string> <string name="take_oreder_success_tosee">接单成功,请移至待预约列表查看</string>
<string name="no_settelment_price">待结算工费</string> <string name="no_settelment_price">待结算工费</string>
<string name="settelmented_price">已结算工费</string> <string name="settelmented_price">已结算工费</string>
<string name="settlement_date">结算日期</string> <string name="settlement_date">可提现日期</string>
<string name="pls_complete_address_info">请先完善您的地址信息</string> <string name="pls_complete_address_info">请先完善您的地址信息</string>
<string name="company_send_info">商家发货信息</string> <string name="company_send_info">商家发货信息</string>
<string name="company_receive_info">商家收货信息</string> <string name="company_receive_info">商家收货信息</string>
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
...@@ -369,7 +369,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo ...@@ -369,7 +369,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
//申请提现成功弹框 //申请提现成功弹框
private void showApplySuccessDialog() { private void showApplySuccessDialog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog,
"申请提现成功，您的资金将于下月初打到您的银行卡上" "申请提现成功，您的资金将于每月10日或25日打到您的银行卡上"
, (dialog1, confirm) -> { , (dialog1, confirm) -> {
dialog1.dismiss(); dialog1.dismiss();
mPresenter.getIncomData(); mPresenter.getIncomData();
......
userCenter/src/main/res/layout/fragment_home_user.xml
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_weight="2" android:layout_weight="2"
android:background="@drawable/btn_blue_commom" android:background="@drawable/btn_green_commom_5"
android:gravity="center" android:gravity="center"
android:onClick="@{()->presenter.dumpToInvate()}" android:onClick="@{()->presenter.dumpToInvate()}"
android:text="@string/invate_new_reward" android:text="@string/invate_new_reward"
...@@ -320,6 +320,7 @@ ...@@ -320,6 +320,7 @@
android:gravity="center" android:gravity="center"
android:onClick="@{()->presenter.toInviteRecord()}" android:onClick="@{()->presenter.toInviteRecord()}"
android:text="@string/invite_record" android:text="@string/invite_record"
android:visibility="gone"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16" />
</LinearLayout> </LinearLayout>
...@@ -332,6 +333,7 @@ ...@@ -332,6 +333,7 @@
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:background="@drawable/btn_dark_red" android:background="@drawable/btn_dark_red"
android:gravity="center" android:gravity="center"
android:visibility="gone"
android:onClick="@{()->presenter.invateProvider()}" android:onClick="@{()->presenter.invateProvider()}"
android:text="@string/invate_provider_title" android:text="@string/invate_provider_title"
android:textColor="@color/white" android:textColor="@color/white"
...@@ -356,6 +358,7 @@ ...@@ -356,6 +358,7 @@
style="@style/tv_user_bottom1" style="@style/tv_user_bottom1"
android:layout_marginLeft="25dp" android:layout_marginLeft="25dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:textSize="22sp"
android:text="@string/user_cash_arrive" /> android:text="@string/user_cash_arrive" />
<TextView <TextView
...@@ -387,6 +390,7 @@ ...@@ -387,6 +390,7 @@
style="@style/tv_user_bottom1" style="@style/tv_user_bottom1"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:textStyle="bold"
android:text="可提现金额:" /> android:text="可提现金额:" />
<TextView <TextView
...@@ -396,17 +400,20 @@ ...@@ -396,17 +400,20 @@
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:text="0" android:text="0"
android:textColor="@color/cl_order_item_date" android:textColor="@color/cl_order_item_date"
android:textSize="22sp" /> android:textSize="25sp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/tv_fetch" android:id="@+id/tv_fetch"
style="@style/btn_common" style="@style/btn_common"
android:layout_height="36dp" android:layout_width="91dp"
android:layout_width="95dp" android:layout_height="match_parent"
android:layout_centerVertical="true"
android:background="@drawable/btn_blue_commom"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="@drawable/btn_green_commom_5"
android:text="@string/apply_fetch" /> android:text="@string/apply_fetch" />
</RelativeLayout> </RelativeLayout>
......
userCenter/src/main/res/values/strings.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<string name="input_new_pwd">填写新密码</string> <string name="input_new_pwd">填写新密码</string>
<string name="income_money">收入金额</string> <string name="income_money">收入金额</string>
<string name="oreder_sender_payer">派单付费方</string> <string name="oreder_sender_payer">派单付费方</string>
<string name="pay_date">结算日期</string> <string name="pay_date">可提现日期</string>
<string name="reward_str">奖金</string> <string name="reward_str">奖金</string>
<string name="reward_things">奖励事项</string> <string name="reward_things">奖励事项</string>
<string name="share_reward_money">分享奖金</string> <string name="share_reward_money">分享奖金</string>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<string name="invite_new_share_content_business">邀请商家瓜分千万佣金！</string> <string name="invite_new_share_content_business">邀请商家瓜分千万佣金！</string>
<string name="add_service_wechat">添加客服微信获得更多派单</string> <string name="add_service_wechat">添加客服微信获得更多派单</string>
<string name="copy_wechat_num">复制微信号</string> <string name="copy_wechat_num">复制微信号</string>
<string name="send_user_card">发名片</string> <string name="send_user_card">发微信名片给客户</string>
<string name="user_level">等级</string> <string name="user_level">等级</string>
<string name="user_level1">金牌师傅</string> <string name="user_level1">金牌师傅</string>
<string name="user_level2">银牌师傅</string> <string name="user_level2">银牌师傅</string>
......
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