Merge remote-tracking branch 'origin/dev' into dev

baseSDK/src/main/res/layout/activity_webview.xml

@@ -21,12 +21,13 @@
 
                 />
 
-            <TextView
-                android:id="@+id/tv_right_title"
-                style="@style/title_right_text"
-                android:textSize="15sp"
-                android:visibility="gone"
-                android:text="下载" />
+
+<!--            <TextView-->
+<!--                android:id="@+id/tv_right_title"-->
+<!--                style="@style/title_right_text"-->
+<!--                android:textSize="15sp"-->
+<!--                android:text="下载" />-->
+
         </RelativeLayout>
 
         <ImageView style="@style/card_line" />

orderCenter/src/main/java/com/dayu/order/ui/activity/PdfWebViewActivity.java

@@ -50,15 +50,15 @@ public class PdfWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
         mBind.tvTitle.setText(title);
         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);
-            }
-        });
+//        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() {

orderCenter/src/main/java/com/dayu/order/ui/activity/WebViewActivity.java

@@ -52,17 +52,17 @@ public class WebViewActivity extends DataBindingActivity<ActivityWebviewBinding>
         mId = bundle.getInt(Constants.ID);
         mUrl = Constants.WEB_ZHI_SHI + "?id=" + mId;
         mBind.tvTitle.setText(getResources().getString(R.string.order_instruction));
-        mBind.tvRightTitle.setText(getResources().getString(R.string.open_webview));
-        mBind.tvRightTitle.setVisibility(View.VISIBLE);
+//        mBind.tvRightTitle.setText(getResources().getString(R.string.open_webview));
+//        mBind.tvRightTitle.setVisibility(View.VISIBLE);
         mBind.titleBack.setOnClickListener(o -> finish());
-        mBind.tvRightTitle.setOnClickListener(o -> {
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            Uri content_url = Uri.parse(mUrl);
-            intent.setData(content_url);
-            startActivity(Intent.createChooser(intent, getResources().getString(R.string.select_webview)));
-//            MobclickAgent.onEvent(mActivity,"open_web");
-        });
+//        mBind.tvRightTitle.setOnClickListener(o -> {
+//            Intent intent = new Intent();
+//            intent.setAction(Intent.ACTION_VIEW);
+//            Uri content_url = Uri.parse(mUrl);
+//            intent.setData(content_url);
+//            startActivity(Intent.createChooser(intent, getResources().getString(R.string.select_webview)));
+////            MobclickAgent.onEvent(mActivity,"open_web");
+//        });
         UserInfo userInfo = UserManager.getInstance().getUser();
         mToken = userInfo.getToken();
         mWebView = new BridgeWebView(mActivity);