集成报名H5

app/src/main/AndroidManifest.xml

@@ -158,6 +158,10 @@
         <activity android:name=".activity.ImageBrowseActivity"
             android:screenOrientation="portrait"/>
 
+        <!--内置浏览器-->
+        <activity android:name=".activity.WebViewActivity"
+            android:screenOrientation="portrait"/>
+
         <!--定位服务-->
         <meta-data android:name="com.amap.api.v2.apikey" android:value="45fb5d8b52ba4f9f214bfb4fdaf81a72"/>
         <service android:name="com.amap.api.location.APSService"/>

app/src/main/java/com/ynstkz/shitu/android/activity/AlterHeadpicActivity.java

@@ -105,15 +105,21 @@ public class AlterHeadpicActivity extends TitleBarActivity implements View.OnCli
         tvTitle.setText("个人头像");
         UserInfoBean userInfo = STSign.getInstance().getUserInfo();
         if(userInfo != null && userInfo.getData() != null){
-            Glide.with(this).load(UrlCat.HOST + userInfo.getData().getHeadPic()).asBitmap().into(new BitmapImageViewTarget(ivHeadPic){
 
-                @Override
-                protected void setResource(Bitmap resource) {
-                    RoundedBitmapDrawable circularBitmapDrawable = RoundedBitmapDrawableFactory.create(getResources(), resource);
-                    circularBitmapDrawable.setCircular(true);
-                    ivHeadPic.setImageDrawable(circularBitmapDrawable);
-                }
-            });
+            if(!TextUtils.isEmpty(userInfo.getData().getHeadPic())){
+                Glide.with(this).load(UrlCat.HOST + userInfo.getData().getHeadPic()).asBitmap().into(new BitmapImageViewTarget(ivHeadPic){
+
+                    @Override
+                    protected void setResource(Bitmap resource) {
+                        RoundedBitmapDrawable circularBitmapDrawable = RoundedBitmapDrawableFactory.create(getResources(), resource);
+                        circularBitmapDrawable.setCircular(true);
+                        ivHeadPic.setImageDrawable(circularBitmapDrawable);
+                    }
+                });
+            } else {
+                ivHeadPic.setImageResource(R.drawable.default_head_icon);
+            }
+
         }
     }
 

app/src/main/java/com/ynstkz/shitu/android/activity/CourseDetailActivity.java

@@ -1,9 +1,12 @@
 package com.ynstkz.shitu.android.activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
+import android.view.View;
+import android.webkit.WebView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -13,6 +16,8 @@ import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.CourseDetilBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
+import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
+import com.ynstkz.shitu.android.data.UrlCat;
 
 import butterknife.Bind;
 import okhttp3.Call;
@@ -36,6 +41,8 @@ public class CourseDetailActivity extends TitleBarActivity {
     TextView tvOrgDesc;
     @Bind(R.id.tv_price)
     TextView tvPrice;
+    @Bind(R.id.tv_apply)
+    TextView tvApply;
 
     private String courseId;
 
@@ -67,7 +74,23 @@ public class CourseDetailActivity extends TitleBarActivity {
     }
 
     private void setListener() {
-
+        /**
+         * 立即报名
+         */
+        tvApply.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(!isLogin()){
+                    startActivity(new Intent(CourseDetailActivity.this, LoginActivity.class));
+                    return;
+                }
+                Intent intent = new Intent(CourseDetailActivity.this, WebViewActivity.class);
+                intent.putExtra("title", "报名信息");
+                intent.putExtra("url", UrlCat.URL_APPLY_P43+"?userId=" +
+                        SharedPreferencesUtils.getUserId() + "&token=" + SharedPreferencesUtils.getToken());
+                startActivity(intent);
+            }
+        });
     }
 
     /**

app/src/main/java/com/ynstkz/shitu/android/activity/FindPasswordActivity.java

@@ -95,7 +95,7 @@ public class FindPasswordActivity extends TitleBarActivity implements VerifyCode
             public void onClick(View view) {
                 phoneNumber = editPhoneNumber.getText().toString().trim();
                 if(!TextUtils.isEmpty(phoneNumber)){
-                    STSign.getInstance().getVerifycode(1, phoneNumber, FindPasswordActivity.this);
+                    STSign.getInstance().getVerifycode(3, phoneNumber, FindPasswordActivity.this);
                 } else {
                     showToast(getString(R.string.empty_username));
                 }

app/src/main/java/com/ynstkz/shitu/android/activity/OrgDetailActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
@@ -26,7 +27,10 @@ import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.CourseItemBean;
 import com.ynstkz.shitu.android.bean.EvaluateListBean;
 import com.ynstkz.shitu.android.bean.OrgDetailBean;
+import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.RequestGroup;
+import com.ynstkz.shitu.android.data.UrlCat;
+import com.ynstkz.shitu.android.exter.GlideRoundTransform;
 import com.ynstkz.shitu.android.view.ListViewForScrollView;
 
 import java.util.Date;
@@ -229,7 +233,12 @@ public class OrgDetailActivity extends TitleBarActivity {
                 TextView tvCommentContent = view.findViewById(R.id.tv_comment_content);
                 GridView gvCommentPic = view.findViewById(R.id.gv_comment_pic);
 
-                Glide.with(this).load(evaluateListBean.getHeadPic()).into(ivHeadPic);
+                if(!TextUtils.isEmpty(evaluateListBean.getHeadPic())){
+                    Glide.with(this).load(UrlCat.HOST + evaluateListBean.getHeadPic()).asBitmap()
+                            .transform(new GlideRoundTransform(this)).into(ivHeadPic);
+                } else {
+                    ivHeadPic.setImageResource(R.drawable.default_head_icon);
+                }
                 tvUsername.setText(evaluateListBean.getUserName());
                 tvTime.setText(DateUtil.format(new Date(evaluateListBean.getCreateTime()),DateUtil.DATE_TIME_FORMAT_YYYY年MM月DD日));
                 rbScore.setProgress(evaluateListBean.getScore());

app/src/main/java/com/ynstkz/shitu/android/activity/UserInfoActivity.java

@@ -74,7 +74,7 @@ public class UserInfoActivity extends TitleBarActivity {
         UserInfoBean userInfoBean = STSign.getInstance().getUserInfo();
         if(userInfoBean != null && userInfoBean.getData() != null){
             tvUsername.setText(userInfoBean.getData().getUserName());
-            tvPhoneNumber.setText(userInfoBean.getData().getMobile());
+            tvPhoneNumber.setText(userInfoBean.getData().getMobile().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
         }
     }
 

app/src/main/java/com/ynstkz/shitu/android/activity/WebViewActivity.java

@@ -0,0 +1,97 @@
+package com.ynstkz.shitu.android.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.common.library.Constants;
+import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.base.TitleBarActivity;
+
+import butterknife.Bind;
+
+/**
+ * 作者：fuchangle on 2018/3/27 10:53
+ */
+
+public class WebViewActivity extends TitleBarActivity {
+
+    @Bind(R.id.tv_title)
+    TextView tvTitle;
+    @Bind(R.id.view_title)
+    RelativeLayout viewTitle;
+    @Bind(R.id.webView)
+    WebView webView;
+
+    private String url;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
+        setListener();
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_webview;
+    }
+
+    private void initView(){
+        String title = getIntent().getStringExtra("title");
+        if(!TextUtils.isEmpty(title)){
+            tvTitle.setText(title);
+        } else {
+            tvTitle.setText(getString(R.string.app_name));
+        }
+    }
+
+    private void initData(){
+        url = getIntent().getStringExtra("url");
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.getSettings().setUseWideViewPort(true);
+        webView.getSettings().setLoadWithOverviewMode(true);
+        webView.getSettings().setSupportZoom(false);
+        webView.getSettings().setBuiltInZoomControls(false);
+        webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
+        webView.getSettings().setDomStorageEnabled(true);
+        webView.setWebChromeClient(new WebChromeClient());
+        webView.setWebViewClient(new WebViewClient(){
+
+        });
+
+        webView.setWebChromeClient(new WebChromeClient(){
+
+        });
+
+        webView.loadUrl(url);
+        if(Constants.DEVELOP_MODE){
+            Log.e("okhttp", "webView:" + url);
+        }
+    }
+
+    private void setListener(){
+
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (event.getAction() == KeyEvent.ACTION_DOWN
+                && event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+            if (webView.canGoBack()) {
+                webView.goBack();
+                return true;
+            }
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/data/UrlCat.java

@@ -177,6 +177,19 @@ public class UrlCat {
      * 取消绑定
      */
     public static final String URL_THIRD_UNBIND = HOST + "api/third/unbind";
+
+    /**
+     * 普通教育机构报名3
+     */
+    public static final String URL_APPLY_P45 = HOST + "p45.html";
+    /**
+     * 普通教育机构报名信息预览
+     */
+    public static final String URL_APPLY_P36 = HOST + "p36.html";
+    /**
+     * 普通教育机构报名2
+     */
+    public static final String URL_APPLY_P43 = HOST + "p43.html";
 }
 
 

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

@@ -119,6 +119,7 @@
             android:text="￥1280元"/>
 
         <TextView
+            android:id="@+id/tv_apply"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/view_title"/>
+
+    <WebView
+        android:id="@+id/webView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>

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

@@ -56,7 +56,7 @@
                     android:id="@+id/iv_head"
                     android:layout_width="76dp"
                     android:layout_height="76dp"
-                    android:background="@drawable/usercentenr_head"/>
+                    android:background="@drawable/default_head_icon"/>
 
                 <TextView
                     android:id="@+id/tv_username"

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

@@ -14,9 +14,8 @@
 
         <ImageView
             android:id="@+id/iv_headPic"
-            android:layout_width="@dimen/company_70dp"
-            android:layout_height="@dimen/company_70dp"
-            android:background="@mipmap/ic_launcher"/>
+            android:layout_width="@dimen/company_50dp"
+            android:layout_height="@dimen/company_50dp"/>
 
         <LinearLayout
             android:layout_width="match_parent"