修改UI细节问题

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

@@ -25,6 +25,7 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.JavascriptInterface;
+import android.webkit.JsResult;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
@@ -35,6 +36,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.common.library.view.materialdialog.MaterialDialog;
 import com.ynstkz.shitu.android.BuildConfig;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
@@ -90,13 +92,6 @@ public class ApplyWebActivity extends TitleBarActivity {
             tvTitle.setText(getString(R.string.app_name));
         }
 
-//        if (Build.VERSION.SDK_INT >= 23 && (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
-//                || ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED)
-//                || ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-//            ActivityCompat.requestPermissions(ApplyWebActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,
-//                    Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE }, 1);
-//        }
-
         if (ActivityCompat.checkSelfPermission(ApplyWebActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
             //权限发生了改变 true  //  false 小米
             ActivityCompat.requestPermissions(ApplyWebActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1000);
@@ -232,7 +227,29 @@ public class ApplyWebActivity extends TitleBarActivity {
                 startActivityForResult(chooserIntent, FCR);
                 return true;
             }
+
+            @Override
+            public boolean onJsAlert(WebView view, String url, final String message, final JsResult result) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        final MaterialDialog dialog = new MaterialDialog(ApplyWebActivity.this);
+                        dialog.setTitle("提示");
+                        dialog.setMessage(message);
+                        dialog.setPositiveButton("确定", new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                result.confirm();
+                                dialog.dismiss();
+                            }
+                        });
+                        dialog.show();
+                    }
+                });
+                return true;
+            }
         });
+
     }
 
     /**

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

@@ -171,7 +171,7 @@ public class CourseDetailActivity extends TitleBarActivity implements PullToRefr
             public void onClick(View view) {
                 if (courseDetilBean != null) {
                     UmengShareHelper.show(CourseDetailActivity.this, courseDetilBean.getData().getTitle(), courseDetilBean.getData().getDetail(),
-                            "http://www.baidu.com", "");
+                            UrlCat.HOST, "");
                 }
             }
         });
@@ -429,7 +429,7 @@ public class CourseDetailActivity extends TitleBarActivity implements PullToRefr
             for (int i = 0; i < dataBean.getEnrollAreaList().size(); i++) {
                 CourseDetilBean.DataBean.EnrollAreaListBean enrollAreaListBean = dataBean.getEnrollAreaList().get(i);
                 String address = enrollAreaListBean.getProvinceName() + enrollAreaListBean.getCityName()
-                        + enrollAreaListBean.getDistrictName() + enrollAreaListBean.getAddress();
+                        + enrollAreaListBean.getDistrictName();
                 if (TextUtils.isEmpty(address) || "null".equals(address)) {
                     continue;
                 }

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

@@ -230,7 +230,7 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
                         locationDataBean.setLongitude(amapLocation.getLongitude());
                         locationDataBean.setCityId(LocationCityIdTransition.transitionCityId(amapLocation.getCityCode()+""));
                     } else {
-                        locationDataBean.setCity(Constants.KM_CITY);
+                        locationDataBean.setCity(amapLocation.getDistrict());
                         locationDataBean.setLatitude(Constants.KM_LATITUDE);
                         locationDataBean.setLongitude(Constants.KM_LONGITUDE);
                         locationDataBean.setCityId(Constants.KM_CITY_ID);

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

@@ -267,7 +267,7 @@ public class LocationSelectActivity extends TitleBarActivity{
         //不在云南，显示昆明火车站
         LocationDataBean locationDataBean = new LocationDataBean();
         locationDataBean.setCityId(367);
-        locationDataBean.setCity(Constants.KM_CITY);
+        locationDataBean.setCity(cityName);
         Cache.put("locationDataBean", locationDataBean);
         EventBus.getDefault().post(new LocationChangedEvent(locationDataBean));
         cacheLocationHistory(cityName);

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

@@ -219,7 +219,7 @@ public class OrgDetailActivity extends TitleBarActivity implements PullToRefresh
             @Override
             public void onClick(View view) {
                 UmengShareHelper.show(OrgDetailActivity.this, dataBean.getMemberName(), dataBean.getIntroduction(),
-                        "http://www.baidu.com", dataBean.getHeadPic());
+                        UrlCat.HOST, dataBean.getHeadPic());
             }
         });
 

app/src/main/java/com/ynstkz/shitu/android/adapter/HomeBannerAdapter.java

@@ -3,6 +3,7 @@ package com.ynstkz.shitu.android.adapter;
 import android.content.Context;
 import android.content.Intent;
 import android.support.v4.view.PagerAdapter;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -74,9 +75,11 @@ public class HomeBannerAdapter extends PagerAdapter{
         imageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(context, WebViewActivity.class);
-                intent.putExtra("url", listDatas.get(position).getAppJump());
-                context.startActivity(intent);
+                if(!TextUtils.isEmpty(listDatas.get(position).getAppJump())){
+                    Intent intent = new Intent(context, WebViewActivity.class);
+                    intent.putExtra("url", listDatas.get(position).getAppJump());
+                    context.startActivity(intent);
+                }
             }
         });
         return imageView;

app/src/main/java/com/ynstkz/shitu/android/bean/SignUpRecorsBean.java

@@ -25,6 +25,7 @@ public class SignUpRecorsBean extends BaseBean{
     private String applyStatus;
     private String lat;
     private int memberId;
+    private int valid;
 
     public String getMarketPrice() {
         return marketPrice;
@@ -153,4 +154,12 @@ public class SignUpRecorsBean extends BaseBean{
     public void setMemberId(int memberId) {
         this.memberId = memberId;
     }
+
+    public int getValid() {
+        return valid;
+    }
+
+    public void setValid(int valid) {
+        this.valid = valid;
+    }
 }

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

@@ -105,7 +105,7 @@ public class SharedPreferencesUtils {
     }
 
     public static long getMsgLastTime(){
-        return (Long)SharedPreferencesDao.get(KEY_MSG_LASTTIME, (long)0);
+        return (Long)SharedPreferencesDao.get(KEY_MSG_LASTTIME, System.currentTimeMillis());
     }
 
     /**

app/src/main/java/com/ynstkz/shitu/android/fragment/MineSignUpItemFragment.java

@@ -84,10 +84,14 @@ public class MineSignUpItemFragment extends BaseFragment implements PullToRefres
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 SignUpRecorsBean signUpRecorsBean = (SignUpRecorsBean)adapterView.getAdapter().getItem(i);
                 if(signUpRecorsBean != null) {
-                    int courseId = signUpRecorsBean.getCourseId();
-                    Intent intent = new Intent(getActivity(), CourseDetailActivity.class);
-                    intent.putExtra("courseId", courseId+"");
-                    startActivity(intent);
+                    if(signUpRecorsBean.getValid() == 1){
+                        int courseId = signUpRecorsBean.getCourseId();
+                        Intent intent = new Intent(getActivity(), CourseDetailActivity.class);
+                        intent.putExtra("courseId", courseId+"");
+                        startActivity(intent);
+                    } else {
+                        showToast("");
+                    }
                 }
             }
         });

app/src/main/java/com/ynstkz/shitu/android/fragment/UserCenterFragment.java

@@ -262,6 +262,8 @@ public class UserCenterFragment extends BaseFragment {
                         long cacheLastTime = SharedPreferencesUtils.getMsgLastTime();
                         if(lastTime > cacheLastTime) {
                             tvNewMessage.setVisibility(View.VISIBLE);
+                        } else {
+                            tvNewMessage.setVisibility(View.GONE);
                         }
                     }
                 }

app/src/main/res/drawable/shape_userhead_bg.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false">
+
+    <solid android:color="#00000000"/>
+
+    <stroke
+        android:width="2dp"
+        android:color="@color/white"
+        />
+
+    <size
+        android:width="77dp"
+        android:height="77dp"/>
+
+</shape>

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

@@ -68,11 +68,19 @@
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
-                <ImageView
-                    android:id="@+id/iv_head"
-                    android:layout_width="76dp"
-                    android:layout_height="76dp"
-                    android:scaleType="centerCrop"/>
+                <RelativeLayout
+                    android:layout_width= "77dp"
+                    android:layout_height="77dp"
+                    android:background="@drawable/shape_userhead_bg">
+
+                    <ImageView
+                        android:id="@+id/iv_head"
+                        android:layout_width="75dp"
+                        android:layout_height="75dp"
+                        android:layout_centerInParent="true"
+                        android:scaleType="centerCrop"/>
+
+                </RelativeLayout>
 
                 <TextView
                     android:id="@+id/tv_username"