Quellcode durchsuchen

修改反馈bug

316044749 vor 7 Jahren
Ursprung
Commit
85d2e4b783

+ 14 - 6
app/src/main/java/com/ynstkz/shitu/android/activity/HomeActivity.java

@@ -24,6 +24,7 @@ import com.common.library.cache.Cache;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.LocationDataBean;
+import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.event.LocationChangedEvent;
 import com.ynstkz.shitu.android.event.LogoutEvent;
@@ -207,12 +208,19 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
             if (amapLocation.getErrorCode() == 0) {
                 if(!isLocationSuccess){
                     LocationDataBean locationDataBean = new LocationDataBean();
-                    locationDataBean.setCity(amapLocation.getDistrict());
-                    locationDataBean.setLatitude(amapLocation.getLatitude());
-                    locationDataBean.setLongitude(amapLocation.getLongitude());
+                    if(amapLocation.getProvince().indexOf("云南") > 0) {
+                        locationDataBean.setCity(amapLocation.getDistrict());
+                        locationDataBean.setLatitude(amapLocation.getLatitude());
+                        locationDataBean.setLongitude(amapLocation.getLongitude());
+                    } else {
+                        locationDataBean.setCity(Constants.KM_CITY);
+                        locationDataBean.setLatitude(Constants.KM_LATITUDE);
+                        locationDataBean.setLongitude(Constants.KM_LONGITUDE);
+                    }
                     EventBus.getDefault().post(new LocationChangedEvent(locationDataBean));
                 }
                 SharedPreferencesUtils.setLocation(amapLocation.getDistrict());
+                isLocationSuccess = true;
             } else {
                 //显示错误信息ErrCode是错误码,errInfo是错误信息,详见错误码表。
                 EventBus.getDefault().post(new LocationChangedEvent(null));
@@ -233,10 +241,10 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
                 EventBus.getDefault().post(new LocationChangedEvent(locationDataBean));
                 isLocationSuccess = true;
             }
-        }
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
-                == PackageManager.PERMISSION_GRANTED) {
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
+                    == PackageManager.PERMISSION_GRANTED) {
                 mlocationClient.startLocation();
+            }
         }
     }
 

+ 8 - 1
app/src/main/java/com/ynstkz/shitu/android/adapter/HomeBannerAdapter.java

@@ -62,7 +62,14 @@ public class HomeBannerAdapter extends PagerAdapter{
     @Override
     public Object instantiateItem(ViewGroup container, final int position) {
         ImageView imageView = (ImageView) LayoutInflater.from(context).inflate(R.layout.item_home_banner_img,null);
-        Glide.with(context).load(UrlCat.HOST + listDatas.get(position).getUrl()).into(imageView);
+        String imageUrl = listDatas.get(position).getUrl();
+        if(imageUrl != null){
+            if(imageUrl.startsWith("http")) {
+                Glide.with(context).load(imageUrl).into(imageView);
+            } else {
+                Glide.with(context).load(UrlCat.HOST + imageUrl).into(imageView);
+            }
+        }
         container.addView(imageView);
         imageView.setOnClickListener(new View.OnClickListener() {
             @Override

+ 3 - 2
app/src/main/java/com/ynstkz/shitu/android/common/Constants.java

@@ -17,8 +17,9 @@ public class Constants {
     public static final String KEY_AMAP_LOCATION = "45fb5d8b52ba4f9f214bfb4fdaf81a72";
 
     //昆明火车站经纬度
-    public static final String KM_LONGITUDE = "102.722247";
-    public static final String KM_LATITUDE = "25.015298";
+    public static final String KM_CITY = "昆明";
+    public static final double KM_LONGITUDE = 102.722247;
+    public static final double KM_LATITUDE = 25.015298;
 
     public static final String QQ_ID = "1106743412";
 

+ 2 - 10
app/src/main/java/com/ynstkz/shitu/android/data/UrlCat.java

@@ -179,22 +179,14 @@ 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";
 
     /**
      * 非普通教育机构报名
      */
-    public static final String URL_APPLY_P47 = HOST + "p43.html";
+    public static final String URL_APPLY_P47 = HOST + "p47.html";
 
     /**
      * 保存学生信息

+ 2 - 2
app/src/main/java/com/ynstkz/shitu/android/fragment/OrgListFragment.java

@@ -134,8 +134,8 @@ public class OrgListFragment extends BaseFragment implements PullToRefreshBase.O
 
     private void initData() {
         pageNumber = 1;
-        longitude = Double.parseDouble(Constants.KM_LONGITUDE);
-        latitude = Double.parseDouble(Constants.KM_LATITUDE);
+        longitude = Constants.KM_LONGITUDE;
+        latitude = Constants.KM_LATITUDE;
         getOrgList();
     }