Skip to content

android / dayu

Go to a project
Commit 0a7085fa by wukun
Options

1225

parent 7a202982
Inline Side-by-side
Showing with 51 additions and 42 deletions
baseSDK/src/main/res/layout/activity_webview.xml
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:id="@+id/tv_right_title" android:id="@+id/tv_right_title"
style="@style/title_right_text" style="@style/title_right_text"
android:textSize="15sp" android:textSize="15sp"
android:visibility="gone" /> android:text="下载" />
</RelativeLayout> </RelativeLayout>
<ImageView style="@style/card_line" /> <ImageView style="@style/card_line" />
......
orderCenter/src/main/java/com/dayu/order/ui/activity/PdfWebViewActivity.java
...@@ -9,6 +9,7 @@ import android.net.Uri; ...@@ -9,6 +9,7 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View;
import android.webkit.DownloadListener; import android.webkit.DownloadListener;
import android.webkit.URLUtil; import android.webkit.URLUtil;
import android.webkit.WebChromeClient; import android.webkit.WebChromeClient;
...@@ -48,6 +49,16 @@ public class PdfWebViewActivity extends DataBindingActivity<ActivityWebviewBindi ...@@ -48,6 +49,16 @@ public class PdfWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
String title = getIntent().getStringExtra(OrderConstant.TITLE); String title = getIntent().getStringExtra(OrderConstant.TITLE);
mBind.tvTitle.setText(title); mBind.tvTitle.setText(title);
initWebView(); initWebView();
mBind.tvRightTitle.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(docPath));
// startActivity(Intent.createChooser(intent, "Choose browser"));
startActivity(intent);
}
});
} }
private void initWebView() { private void initWebView() {
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
package com.dayu.order.ui.fragment; package com.dayu.order.ui.fragment;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
...@@ -35,11 +34,13 @@ import com.dayu.order.api.protocol.bean.GreenPersionSiteInfo; ...@@ -35,11 +34,13 @@ import com.dayu.order.api.protocol.bean.GreenPersionSiteInfo;
import com.dayu.order.api.protocol.bean.OrderToolsBean; import com.dayu.order.api.protocol.bean.OrderToolsBean;
import com.dayu.order.api.protocol.data.AddDialRecordData; import com.dayu.order.api.protocol.data.AddDialRecordData;
import com.dayu.order.common.OperatePhoneEvent; import com.dayu.order.common.OperatePhoneEvent;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.databinding.FragmentMultiDetailBinding; import com.dayu.order.databinding.FragmentMultiDetailBinding;
import com.dayu.order.databinding.FragmentOrderDatailsBinding; import com.dayu.order.databinding.FragmentOrderDatailsBinding;
import com.dayu.order.databinding.ItemAccessoriesLayoutBinding; import com.dayu.order.databinding.ItemAccessoriesLayoutBinding;
import com.dayu.order.databinding.ItemDetailDeviceCountBinding; import com.dayu.order.databinding.ItemDetailDeviceCountBinding;
import com.dayu.order.databinding.ItemDetailServerInfoBinding; import com.dayu.order.databinding.ItemDetailServerInfoBinding;
import com.dayu.order.ui.activity.PdfWebViewActivity;
import com.dayu.order.ui.view.ToolImageDialog; import com.dayu.order.ui.view.ToolImageDialog;
import com.dayu.provider.event.TakeOrderSuccessEvent; import com.dayu.provider.event.TakeOrderSuccessEvent;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
...@@ -165,22 +166,18 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag ...@@ -165,22 +166,18 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
mFujianAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.Accessories, ItemAccessoriesLayoutBinding>() { mFujianAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.Accessories, ItemAccessoriesLayoutBinding>() {
@Override @Override
public void OnItemClick(OrderDetail.Accessories item, ItemAccessoriesLayoutBinding bind) { public void OnItemClick(OrderDetail.Accessories item, ItemAccessoriesLayoutBinding bind) {
// if (item.getUrl().contains("png") || item.getUrl().contains("PNG") if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
// || item.getUrl().contains("jpg") || item.getUrl().contains("JPG") || item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
// || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) { || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
// imgMax(item.getUrl()); imgMax(item.getUrl());
// } else if (item.getUrl().contains(".pdf")) { } else if (item.getUrl().contains(".pdf")) {
// Intent intent = new Intent(mActivity, PdfWebViewActivity.class); Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
// intent.putExtra(Constants.PICURL, item.getUrl()); intent.putExtra(Constants.PICURL, item.getUrl());
// intent.putExtra(OrderConstant.TITLE, item.getName()); intent.putExtra(OrderConstant.TITLE, item.getName());
// startActivity(intent); startActivity(intent);
// } else { } else {
// ToastUtils.showShortToast(R.string.error_service_file); ToastUtils.showShortToast(R.string.error_service_file);
// } }
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(item.getUrl()));
// startActivity(Intent.createChooser(intent, "Choose browser"));
startActivity(intent);
} }
}); });
mBind.orderRemark.post(() -> { mBind.orderRemark.post(() -> {
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
package com.dayu.order.ui.fragment; package com.dayu.order.ui.fragment;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -18,12 +17,15 @@ import com.dayu.event.UserInfo; ...@@ -18,12 +17,15 @@ import com.dayu.event.UserInfo;
import com.dayu.location.base.LocationUtils; import com.dayu.location.base.LocationUtils;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail; import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.databinding.FragmentOrderDatailsBinding; import com.dayu.order.databinding.FragmentOrderDatailsBinding;
import com.dayu.order.databinding.ItemAccessoriesLayoutBinding; import com.dayu.order.databinding.ItemAccessoriesLayoutBinding;
import com.dayu.order.ui.activity.EditeDetailActivity; import com.dayu.order.ui.activity.EditeDetailActivity;
import com.dayu.order.ui.activity.PdfWebViewActivity;
import com.dayu.order.ui.activity.ServerInstructionActivity; import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.utils.GlideImageLoader; import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils; import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
...@@ -137,22 +139,18 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData ...@@ -137,22 +139,18 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
mAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.Accessories, ItemAccessoriesLayoutBinding>() { mAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.Accessories, ItemAccessoriesLayoutBinding>() {
@Override @Override
public void OnItemClick(OrderDetail.Accessories item, ItemAccessoriesLayoutBinding bind) { public void OnItemClick(OrderDetail.Accessories item, ItemAccessoriesLayoutBinding bind) {
// if (item.getUrl().contains("png") || item.getUrl().contains("PNG") if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
// || item.getUrl().contains("jpg") || item.getUrl().contains("JPG") || item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
// || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) { || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
// imgMax(item.getUrl()); imgMax(item.getUrl());
// } else if (item.getUrl().contains(".pdf")) { } else if (item.getUrl().contains(".pdf")) {
// Intent intent = new Intent(mActivity, PdfWebViewActivity.class); Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
// intent.putExtra(Constants.PICURL, item.getUrl()); intent.putExtra(Constants.PICURL, item.getUrl());
// intent.putExtra(OrderConstant.TITLE, item.getName()); intent.putExtra(OrderConstant.TITLE, item.getName());
// startActivity(intent); startActivity(intent);
// } else { } else {
// ToastUtils.showShortToast(R.string.error_pdf); ToastUtils.showShortToast(R.string.error_pdf);
// } }
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(item.getUrl()));
// startActivity(Intent.createChooser(intent, "Choose browser"));
startActivity(intent);
} }
}); });
} }
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
...@@ -835,7 +835,8 @@ ...@@ -835,7 +835,8 @@
android:text="沟通记录" android:text="沟通记录"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold"/> android:textStyle="bold"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -843,7 +844,8 @@ ...@@ -843,7 +844,8 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@color/cl_white" android:background="@color/cl_white"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<ImageView <ImageView
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar"
...@@ -880,7 +882,8 @@ ...@@ -880,7 +882,8 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_component" android:id="@+id/rl_component"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:visibility="gone"/>
<TextView <TextView
android:id="@+id/tv_contact_seller" android:id="@+id/tv_contact_seller"
......
userCenter/src/main/res/layout/fragment_home_user.xml
...@@ -672,7 +672,7 @@ ...@@ -672,7 +672,7 @@
<TextView <TextView
android:id="@+id/transmitServer" android:id="@+id/transmitServer"
android:layout_width="250dp" android:layout_width="250dp"
android:layout_height="50dp" android:layout_height="30dp"
android:background="@drawable/btn_blue_react_4" android:background="@drawable/btn_blue_react_4"
android:gravity="center" android:gravity="center"
android:text="转发服务名片" android:text="转发服务名片"
......
userCenter/src/main/res/values/styles.xml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<style name="ll_user_bottom2"> <style name="ll_user_bottom2">
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:layout_height">66dp</item> <item name="android:layout_height">56dp</item>
<item name="android:orientation">vertical</item> <item name="android:orientation">vertical</item>
<item name="android:gravity">center_horizontal</item> <item name="android:gravity">center_horizontal</item>
<item name="android:background">@drawable/personal_center_selector</item> <item name="android:background">@drawable/personal_center_selector</item>
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
<style name="tv_user_bottom2"> <style name="tv_user_bottom2">
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">@dimen/dp_3</item> <item name="android:layout_marginTop">2dp</item>
<item name="android:textColor">@color/cl_home_button</item> <item name="android:textColor">@color/cl_home_button</item>
<item name="android:textSize">20sp</item> <item name="android:textSize">14sp</item>
</style> </style>
<style name="ll_service_wechat" parent="ll_horizontal"> <style name="ll_service_wechat" parent="ll_horizontal">
......
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