Skip to content

android / dayu

Go to a project
Commit ed2cb01c by 罗翻
Options

android v1.91

parent 6477e57f
Inline Side-by-side
Showing with 25 additions and 19 deletions
app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
......@@ -56,6 +56,8 @@ public class LocationService extends Service {
}
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.commiteLocation(requestBody).subscribe(aBoolean -> {
}, throwable -> {
});
}
}));
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -214,15 +214,19 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
int errorState = item.getExcptionCode();
if (errorState == 1) {
holder.tvErrorState.setText(mContext.getString(R.string.receive_time_out));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
holder.tvErrorState.setVisibility(View.VISIBLE);
} else if (errorState == 2) {
holder.tvErrorState.setText(mContext.getString(R.string.appointment_time_out));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
holder.tvErrorState.setVisibility(View.VISIBLE);
} else if (errorState == 3) {
holder.tvErrorState.setText(mContext.getString(R.string.server_time_out));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
holder.tvErrorState.setVisibility(View.VISIBLE);
} else if (errorState == 4) {
holder.tvErrorState.setText(mContext.getString(R.string.delivery_time_out));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
holder.tvErrorState.setVisibility(View.VISIBLE);
}
......
orderCenter/src/main/res/layout/activity_check_content.xml
......@@ -95,7 +95,7 @@
android:layout_marginLeft="90dp"
android:layout_toEndOf="@+id/text_one_text"
android:layout_toRightOf="@+id/text_one_text"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -130,7 +130,7 @@
android:layout_toRightOf="@id/text_two_text"
android:background="@null"
android:hint="@string/order_brand_name"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -166,7 +166,7 @@
android:layout_toRightOf="@id/tv_version"
android:background="@null"
android:hint="@string/order_product_model_hint"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -201,7 +201,7 @@
android:layout_toRightOf="@id/tv_serial_num"
android:background="@null"
android:hint="@string/order_serail_hint"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -258,7 +258,7 @@
android:layout_marginLeft="45dp"
android:layout_toRightOf="@id/tv_player"
android:background="@null"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -364,7 +364,7 @@
android:paddingLeft="@dimen/dp_13"
android:paddingTop="@dimen/dp_11"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textColorHint="@color/default_text_color"
android:textSize="@dimen/sp_13.3" />
</RelativeLayout>
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
......@@ -180,10 +180,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark"
android:layout_marginBottom="10dp"
android:layout_marginTop="15dp"
android:text="@string/order_attachment"
android:textColor="@color/tv_cl"
android:layout_marginBottom="10dp"
android:textSize="14sp" />
<LinearLayout
......@@ -191,9 +191,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark"
android:layout_marginBottom="10dp"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="10dp"
android:layout_toRightOf="@+id/tv_remark">
<android.support.v7.widget.RecyclerView
......@@ -267,13 +267,13 @@
android:id="@+id/customer_signature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_below="@+id/tv_customer_type"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_customer_type"
android:layout_marginLeft="19dp"
android:layout_marginRight="@dimen/dp_15"
android:gravity="right"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/customer_name"
android:gravity="right"
android:text="@string/check_signature"
android:textColor="@color/bg_button"
android:textSize="14sp" />
......@@ -310,9 +310,9 @@
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@+id/tv_customer_mobile"
android:text="@{item.customerTelphome}"
android:visibility="@{TextUtils.isEmpty(item.customerTelphome)?View.GONE:View.VISIBLE}"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
android:textSize="14sp"
android:visibility="@{TextUtils.isEmpty(item.customerTelphome)?View.GONE:View.VISIBLE}" />
<TextView
......@@ -329,17 +329,17 @@
android:id="@+id/navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_contact_tel"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_below="@+id/tv_contact_tel"
android:layout_toRightOf="@id/tv_address"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_customer_address"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="2"
android:text='@{item.provinceName+item.cityName+item.districtName+item.address}'
......@@ -349,10 +349,10 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:paddingBottom="5dp"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_navigation" />
</LinearLayout>
......@@ -361,8 +361,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="10dp"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/lookforword_time"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -372,9 +372,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginBottom="10dp"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="10dp"
android:layout_toRightOf="@+id/tv_end_time"
android:text='@{!TextUtils.isEmpty(item.appointmentTime)?item.appointmentTime:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
......@@ -393,7 +393,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:background="@color/white"
android:orientation="horizontal"
android:paddingBottom="10dp">
......@@ -401,6 +400,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/order_payer"
android:textColor="@color/tv_cl"
......
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