Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

app/src/main/AndroidManifest.xml

@@ -384,7 +384,8 @@
 
         <activity android:name="com.sheep.groups.creditcard.zx.ZhongXinCreditStep1Activity" android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.groups.creditcard.ms.MinShengCreditActivity" android:screenOrientation="portrait"/>
-        <activity android:name="com.sheep.gamegroup.view.activity.ActMingShengWeb"  android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActMingShengWeb" android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActZhongXinWeb"  android:screenOrientation="portrait"/>
         <!--友盟start-->
 
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActMingShengWeb.java

@@ -74,7 +74,15 @@ public class ActMingShengWeb extends BaseCompatActivity {
 
     private void loadUrl() {
         Logger.d("loadUrl: " + extraUrl);
-        mWebView.setWebChromeClient(new WebChromeClient());
+        mWebView.setWebChromeClient(new WebChromeClient(){
+            @Override
+            public void onReceivedTitle(WebView view, String title) {
+                super.onReceivedTitle(view, title);
+                TitleBarUtils
+                        .getInstance()
+                        .setTitle(ActMingShengWeb.this, title);
+            }
+        });
         mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {

app/src/main/java/com/sheep/gamegroup/view/activity/ActZhongXinWeb.java

@@ -0,0 +1,118 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.TextView;
+
+import com.kfzs.android.view.widget.SafeWebView;
+import com.kfzs.duanduan.BaseCompatActivity;
+import com.kfzs.duanduan.bean.KFIntentKeys;
+import com.orhanobut.logger.Logger;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE;
+
+/**
+ * 民生银行信用卡申请web
+ * Created by zengjiebin on 2018/4/11.
+ */
+public class ActZhongXinWeb extends BaseCompatActivity {
+
+    @BindView(R.id.webview)
+    SafeWebView mWebView;
+    @BindView(R.id.tv_next)
+    TextView tv_next;
+
+    private String extraUrl;
+    private String extraTitle;
+    private WebSettings webViewSettings;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_guide_on_hook);
+
+        extraUrl = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_URL);
+        extraTitle = getIntent().getStringExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE);
+
+        ButterKnife.bind(this);
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, extraTitle)
+                .setTitleFinish(this);
+
+        webViewSettings = mWebView.getSettings();
+        webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+        mWebView.autoSettingWebViewDefaultByWideViewPort(this, false);
+        if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
+            findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
+        }
+        tv_next.setVisibility(View.GONE);
+        loadUrl();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mWebView.setVisibility(View.GONE);
+        mWebView.removeAllViews();
+        mWebView.destroy();
+    }
+
+    private void loadUrl() {
+        Logger.d("loadUrl: " + extraUrl);
+        mWebView.setWebChromeClient(new WebChromeClient(){
+            @Override
+            public void onReceivedTitle(WebView view, String title) {
+                super.onReceivedTitle(view, title);
+                TitleBarUtils
+                        .getInstance()
+                        .setTitle(ActZhongXinWeb.this, title);
+            }
+        });
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                try {
+                    view.loadUrl(url);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return true;
+            }
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+                injectImgClick();
+            }
+        });
+        webViewSettings.setJavaScriptEnabled(true);
+        mWebView.loadUrl(extraUrl);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if(mWebView.canGoBack()){
+            mWebView.goBack();
+            return;
+        }
+        this.finish();
+    }
+    // 注入js函数监听
+    public void injectImgClick() {
+        mWebView.loadUrl("javascript:function ApplayCardProcessCtrl($scope){ alert(1111);}");
+    }
+
+}

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.view.adapter;
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.support.design.widget.AppBarLayout;
 import android.support.v7.widget.LinearLayoutManager;
@@ -26,6 +28,7 @@ import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -173,6 +176,22 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         Jump2View.getInstance().goDialogActivityView(context, taskEty);
                     }
                 });
+                if(BuildConfig.DEBUG){
+                    viewHolder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                        @Override
+                        public boolean onLongClick(View view) {
+                            ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+                            if(clipboardManager != null) {
+                                //创建ClipData对象
+                                ClipData clipData = ClipData.newPlainText("sheep text copy", etyList.get(i).getTask().getDownload_link());
+                                //添加ClipData对象到剪切板中
+                                clipboardManager.setPrimaryClip(clipData);
+                                return true;
+                            }
+                            return false;
+                        }
+                    });
+                }
 
             }
 

app/src/main/res/layout/bind_phone_number_act_layout.xml

@@ -61,6 +61,14 @@
                     android:paddingLeft="@dimen/content_padding_big"
                     android:maxLength="11"/>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:background="@color/white_bg_line"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    />
+
                 <LinearLayout
                     android:id="@+id/ll_code"
                     android:layout_width="match_parent"