bug修改

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.tjzhxx.union"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //dex分包属性设置

app/src/main/java/com/tjzhxx/union/HomeFragment.java

@@ -139,12 +139,12 @@ public class HomeFragment extends BaseFragment {
                         showSnackBar("请先缴费");
                     }
                 } else {
-                    if (TextUtils.isEmpty(ConstDefine.city)){
+                    if (TextUtils.isEmpty(ConstDefine.city)) {
                         showSnackBar("请先授权获取位置信息");
                         return;
-                    }else if (!ConstDefine.city.contains("天津")){
+                    } else if (!ConstDefine.city.contains("天津")) {
                         intent.setClass(getActivity(), PromptActivity.class);
-                        intent.putExtra("content","因为您现在所在区域不在天津市，暂时工会限定天津市工作人员加入因此您没有成为零散务工人员工会会员，但是恭喜您成为水猫平台会员，您可享受平台提供的会员服务。");
+                        intent.putExtra("content", "因为您现在所在区域不在天津市，暂时工会限定天津市工作人员加入因此您没有成为零散务工人员工会会员，但是恭喜您成为水猫平台会员，您可享受平台提供的会员服务。");
                         startActivity(intent);
 //                        showSnackBar("你不是天津人");
                         return;
@@ -181,25 +181,25 @@ public class HomeFragment extends BaseFragment {
                 }
                 break;
             case R.id.function05:
-                if (ConstDefine.userInfo == null){
+                if (ConstDefine.userInfo == null) {
                     showSnackBar("请先登录");
                     return;
                 }
                 intent.setClass(getActivity(), WebviewActivity.class);
-                intent.putExtra("url", ConstDefine.HttpAdressH5+"/index.html#/sportList?type=jnpx");
+                intent.putExtra("url", ConstDefine.HttpAdressH5 + "/index.html#/sportList?type=jnpx");
                 intent.putExtra("title", "技能培训");
-                intent.putExtra("UserInfo",ConstDefine.userInfo);
+                intent.putExtra("UserInfo", ConstDefine.userInfo);
                 startActivity(intent);
                 break;
             case R.id.function06:
-                if (ConstDefine.userInfo == null){
+                if (ConstDefine.userInfo == null) {
                     showSnackBar("请先登录");
                     return;
                 }
                 intent.setClass(getActivity(), WebviewActivity.class);
-                intent.putExtra("url", ConstDefine.HttpAdressH5+"/index.html#/sportList?type=wthd");
+                intent.putExtra("url", ConstDefine.HttpAdressH5 + "/index.html#/sportList?type=wthd");
                 intent.putExtra("title", "文体活动");
-                intent.putExtra("UserInfo",ConstDefine.userInfo);
+                intent.putExtra("UserInfo", ConstDefine.userInfo);
                 startActivity(intent);
                 break;
             case R.id.function07:
@@ -207,14 +207,14 @@ public class HomeFragment extends BaseFragment {
                 startActivity(intent);
                 break;
             case R.id.function08:
-                if (ConstDefine.userInfo == null){
+                if (ConstDefine.userInfo == null) {
                     showSnackBar("请先登录");
                     return;
                 }
                 intent.setClass(getActivity(), WebviewActivity.class);
-                intent.putExtra("url", ConstDefine.HttpAdressH5+"/index.html#/legalAid");
+                intent.putExtra("url", ConstDefine.HttpAdressH5 + "/index.html#/legalAid");
                 intent.putExtra("title", "法律援助");
-                intent.putExtra("UserInfo",ConstDefine.userInfo);
+                intent.putExtra("UserInfo", ConstDefine.userInfo);
                 startActivity(intent);
                 break;
         }

app/src/main/java/com/tjzhxx/union/MainActivity.java

@@ -118,24 +118,29 @@ public class MainActivity extends BaseActivity implements FragmentVisitor.Fragme
     }
 
     public void startLocaion() {
-        AMapLocationClient mLocationClient = new AMapLocationClient(this);
-        mLocationClient.setLocationListener(mLocationListener);
-        AMapLocationClientOption mLocationOption = new AMapLocationClientOption();
-        //设置定位模式为AMapLocationMode.Hight_Accuracy，高精度模式。
-        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
-        //设置是否返回地址信息（默认返回地址信息）
-        mLocationOption.setNeedAddress(true);
-        //获取一次定位结果：
-        //该方法默认为false。
-        mLocationOption.setOnceLocation(true);
-        //设置是否允许模拟位置,默认为false，不允许模拟位置
-        mLocationOption.setMockEnable(false);
-
-        //给定位客户端对象设置定位参数
-        mLocationClient.setLocationOption(mLocationOption);
-        //启动定位
-        mLocationClient.startLocation();
+        AMapLocationClient.updatePrivacyShow(this, true, true);
+        AMapLocationClient.updatePrivacyAgree(this, true);
+        try {
+            AMapLocationClient mLocationClient = new AMapLocationClient(this);
+            mLocationClient.setLocationListener(mLocationListener);
+            AMapLocationClientOption mLocationOption = new AMapLocationClientOption();
+            //设置定位模式为AMapLocationMode.Hight_Accuracy，高精度模式。
+            mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
+            //设置是否返回地址信息（默认返回地址信息）
+            mLocationOption.setNeedAddress(true);
+            //获取一次定位结果：
+            //该方法默认为false。
+            mLocationOption.setOnceLocation(true);
+            //设置是否允许模拟位置,默认为false，不允许模拟位置
+            mLocationOption.setMockEnable(false);
+
+            //给定位客户端对象设置定位参数
+            mLocationClient.setLocationOption(mLocationOption);
+            //启动定位
+            mLocationClient.startLocation();
+        }catch (Exception e){
 
+        }
     }
 
     public AMapLocationListener mLocationListener = new AMapLocationListener() {

app/src/main/java/com/tjzhxx/union/activity/WelfareListActivity.java

@@ -97,7 +97,7 @@ public class WelfareListActivity extends BaseActivity {
         WelfareListRequest request = new WelfareListRequest();
         request.setPage(pageNo);
         request.setSize(stepSize);
-        request.setWid(Integer.valueOf(ConstDefine.userInfo.getWid()));
+        request.setWid(4);
         services.getalllistbywid(request)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/tjzhxx/union/public_store/ConstDefine.java

@@ -7,7 +7,7 @@ import com.tjzhxx.union.entity.UserInfo;
  * Created by ynyxmac on 16/2/4.
  */
 public class ConstDefine {
-//    public static String HttpAdress = "https://app.tjzhxx.com/labphp/";
+//    public static String HttpAdress = "https://app.tjzhxx.cn:3443/";//测试环境
     public static String HttpAdress = "https://app.tjzhxx.cn:1443/";//正式环境
 
     public static String HttpAdressH5 = "http://app.tjzhxx.cn:9100/zhghsjd";