From af750aaf8c0b6e005fbff639df27727b07278934 Mon Sep 17 00:00:00 2001 From: Lihongda <963140097@qq.com> Date: Thu, 4 Jan 2024 12:55:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=9C=B0=E5=9B=BESDK?= =?UTF-8?q?=E5=92=8C=E7=99=BE=E5=BA=A6=E5=AE=9A=E4=BD=8DSDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iFish7/build.gradle | 24 +++--- iFish7/src/main/AndroidManifest.xml | 54 ++++++------ .../com/ifish/activity/LoadingActivity.java | 26 ------ .../ifish/activity/RegisteredActivity.java | 27 ------ .../com/ifish/activity/ShopsAdmActivity.java | 66 ++++---------- .../activity/ShopsCheckUploadActivity.java | 66 ++++---------- .../activity/ShopsFailUploadActivity.java | 68 ++++----------- .../com/ifish/baseclass/BaseApplication.java | 86 +++++++++---------- .../com/ifish/utils/MyLocationListener.java | 76 ++++++++-------- .../main/java/com/ifish/utils/WifiAdmin.java | 7 +- iFish7/src/main/res/layout/login_activity.xml | 1 + .../src/main/res/layout/shopsadm_activity.xml | 36 ++++---- .../res/layout/shopscheckupload_activity.xml | 82 +++++++++--------- 13 files changed, 232 insertions(+), 387 deletions(-) diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 174a7274b..8751efeb9 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -79,34 +79,38 @@ configurations.all { dependencies { implementation files('libs/xUtils-2.6.14.jar') implementation files('libs/commons-logging-1.1.1.jar') - //技威平台 - implementation project(':umeng_sharesdk_library') + //友盟分享 + implementation project(':umeng_sharesdk_library') + implementation files('libs/umeng_social_sdk.jar') implementation 'com.google.code.gson:gson:2.8.9' //bugly implementation files('libs/commons-io-1.4.jar') // implementation files('libs/locSDK_6.13.jar') - implementation files('libs/BaiduLBS_Android.jar') +// implementation files('libs/BaiduLBS_Android.jar') implementation files('libs/TalkingDataAnalytics_V2.1.37.jar') - implementation files('libs/umeng_social_sdk.jar') + implementation 'de.greenrobot:eventbus:2.4.0' implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'com.google.zxing:core:3.3.0' //云信聊天 - implementation 'androidx.multidex:multidex:2.0.0' - implementation files('libs/AMap_Services_V2.3.1.jar') + implementation 'androidx.multidex:multidex:2.0.1' +// implementation files('libs/AMap_Services_V2.3.1.jar') //定位 - implementation files('libs/Android_2DMap_V2.4.0.jar') +// implementation files('libs/Android_2DMap_V2.4.0.jar') //地图 implementation files('libs/MobCommons-2016.1012.1447.jar') implementation files('libs/MobTools-2016.1012.1447.jar') - implementation name: 'SMSSDK-2.1.2', ext: 'aar' + //MOB短信平台 - implementation 'com.jude:rollviewpager:1.4.5' + implementation name: 'SMSSDK-2.1.2', ext: 'aar' + //自动滚动ViewPager - implementation project(':BageView') + implementation 'com.jude:rollviewpager:1.4.5' //拖拽小红点控件 + implementation project(':BageView') + //友盟微社区 implementation 'jp.wasabeef:picasso-transformations:2.1.0' //Picasso 显示圆形图片 diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml index 997cb7315..699ad5e53 100644 --- a/iFish7/src/main/AndroidManifest.xml +++ b/iFish7/src/main/AndroidManifest.xml @@ -96,19 +96,19 @@ - - - - - + + + + + - - - - - - + + + + + + @@ -134,8 +134,8 @@ - - + + @@ -228,9 +228,9 @@ - - - + + + @@ -1001,17 +1001,17 @@ - - - - - - + + + + + + + + + + + diff --git a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java index 67e1a99ed..3e0452dfc 100644 --- a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java @@ -32,8 +32,6 @@ import androidx.annotation.NonNull; import com.alibaba.sdk.android.httpdns.HttpDns; import com.alibaba.sdk.android.httpdns.HttpDnsService; import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory; -import com.baidu.location.LocationClient; -import com.baidu.location.LocationClientOption; import com.bumptech.glide.Glide; import com.ifish.basebean.AdInfos; import com.ifish.basebean.BaseBean; @@ -95,7 +93,6 @@ public class LoadingActivity extends BaseActivityNotAnim { private Boolean IS_FirstOpen = false; private boolean PSW_Error = false; private static boolean firstEnter = true; // 是否首次进入 - private LocationClient mLocationClient; private int screenHeight; private SuperTextView tv_skip; private ImageView iv_loading, iv_loading_default; @@ -478,29 +475,6 @@ public class LoadingActivity extends BaseActivityNotAnim { screenHeight = dm.heightPixels * 1154 / 1334; } - - private void initLocation() { - mLocationClient = ((BaseApplication) getApplication()).mLocationClient;//定位 - LocationClientOption option = new LocationClientOption(); - option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);//可选，默认高精度，设置定位模式，高精度，低功耗，仅设备 - option.setCoorType("gcj02");//可选，默认gcj02，设置返回的定位结果坐标系， - option.setScanSpan(10000);//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的 - option.setIsNeedAddress(true);//可选，设置是否需要地址信息，默认不需要 - option.setOpenGps(true);//可选，默认false,设置是否使用gps - option.setLocationNotify(true);//可选，默认false，设置是否当gps有效时按照1S1次频率输出GPS结果 - option.setIgnoreKillProcess(false);//可选，默认true，定位SDK内部是一个SERVICE，并放到了独立进程，设置是否在stop的时候杀死这个进程，默认不杀死 - mLocationClient.setLocOption(option); - - mLocationClient.start();//定位SDK start之后会默认发起一次定位请求，开发者无须判断isstart并主动调用request - mLocationClient.requestLocation(); - } - - @Override - protected void onStop() { -// mLocationClient.stop(); - super.onStop(); - } - @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); diff --git a/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java b/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java index c4af09b1c..7d6688170 100644 --- a/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java @@ -16,9 +16,6 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import com.baidu.location.LocationClient; -import com.baidu.location.LocationClientOption; -import com.baidu.location.LocationClientOption.LocationMode; import com.ifish.activity.R.drawable; import com.ifish.basebean.BaseBean; import com.ifish.basebean.CountryCode; @@ -27,7 +24,6 @@ import com.ifish.basebean.MyData; import com.ifish.basebean.User; import com.ifish.basebean.WxLoginMessageEvent; import com.ifish.baseclass.BaseActivityNotAnim; -import com.ifish.baseclass.BaseApplication; import com.ifish.geewe.Camera; import com.ifish.geewe.DeviceCamera; import com.ifish.utils.ActivityManager; @@ -82,7 +78,6 @@ public class RegisteredActivity extends BaseActivityNotAnim { private User loginUser; private SPUtil sp; private ConfigUtil cp; - private LocationClient mLocationClient; EventHandler eh = null; private final String UnknownHostException = "UnknownHostException"; private CountryCode countryCode; @@ -100,7 +95,6 @@ public class RegisteredActivity extends BaseActivityNotAnim { initView(); init(); initListener(); - initLocation();//百度定位 } private void test() { @@ -114,18 +108,6 @@ public class RegisteredActivity extends BaseActivityNotAnim { } - private void initLocation() { - LocationClientOption option = new LocationClientOption(); - option.setLocationMode(LocationMode.Hight_Accuracy);//可选，默认高精度，设置定位模式，高精度，低功耗，仅设备 - option.setCoorType("gcj02");//可选，默认gcj02，设置返回的定位结果坐标系， - option.setScanSpan(10000);//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的 - option.setIsNeedAddress(true);//可选，设置是否需要地址信息，默认不需要 - option.setOpenGps(true);//可选，默认false,设置是否使用gps - option.setLocationNotify(true);//可选，默认false，设置是否当gps有效时按照1S1次频率输出GPS结果 - option.setIgnoreKillProcess(false);//可选，默认true，定位SDK内部是一个SERVICE，并放到了独立进程，设置是否在stop的时候杀死这个进程，默认不杀死 - mLocationClient.setLocOption(option); - } - private void initView() { act = this; ct_check = (CheckBox) findViewById(R.id.ct_check); @@ -170,7 +152,6 @@ public class RegisteredActivity extends BaseActivityNotAnim { cp = ConfigUtil.getInstance(RegisteredActivity.this); toast = Toast.makeText(this, "", Toast.LENGTH_SHORT); timer = new Timer(); - mLocationClient = ((BaseApplication) getApplication()).mLocationClient;//定位 eh = new EventHandler() { @Override public void afterEvent(int event, int result, Object data) { @@ -264,12 +245,6 @@ public class RegisteredActivity extends BaseActivityNotAnim { }; - @Override - protected void onStop() { - mLocationClient.stop(); - super.onStop(); - } - public void initListener() { findViewById(R.id.tv_code).setOnClickListener(this); findViewById(R.id.tv_msgcode).setOnClickListener(this); @@ -517,8 +492,6 @@ public class RegisteredActivity extends BaseActivityNotAnim { countryCode = new CountryCode("86", "中国"); } SMSSDK.getVoiceVerifyCode(countryCode.countryCode, et_phone.getText().toString()); - mLocationClient.start();//定位SDK start之后会默认发起一次定位请求，开发者无须判断isstart并主动调用request - mLocationClient.requestLocation(); tv_code.setClickable(false); tv_code.setBackgroundDrawable(tv_code .isClickable() ? getResources().getDrawable(ebleColor) : getResources().getDrawable(disableColor)); diff --git a/iFish7/src/main/java/com/ifish/activity/ShopsAdmActivity.java b/iFish7/src/main/java/com/ifish/activity/ShopsAdmActivity.java index db2c94cec..1ab7d3dff 100644 --- a/iFish7/src/main/java/com/ifish/activity/ShopsAdmActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/ShopsAdmActivity.java @@ -29,17 +29,12 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.baidu.location.LocationClient; -import com.baidu.location.LocationClientOption; -import com.baidu.location.LocationClientOption.LocationMode; import com.ifish.basebean.BaseBean; import com.ifish.basebean.CityModel; import com.ifish.basebean.DistrictModel; -import com.ifish.basebean.LocationBean; import com.ifish.basebean.ProvinceModel; import com.ifish.basebean.ShopsInfo; import com.ifish.baseclass.BaseActivity; -import com.ifish.baseclass.BaseApplication; import com.ifish.baseclass.UriForFile; import com.ifish.utils.AnimationUtil; import com.ifish.utils.Commons; @@ -81,8 +76,6 @@ public class ShopsAdmActivity extends BaseActivity { private ClearEditText et_phone, et_adress, et_shopLink, et_weixinCode; private TextView tv_city, title_text_right, tv_shopsName; private ImageView iv_signimage; - private LocationClient mLocationClient; - private LocationBean location = null; private String[] mProvinceDatas;//所有省 private Map mCitisDatasMap = new HashMap();//key - 省 value - 市 private Map mDistrictDatasMap = new HashMap();// key - 市 values - 区 @@ -111,7 +104,7 @@ public class ShopsAdmActivity extends BaseActivity { initView(); initData(); initListener(); - initLocation(); +// initLocation(); initProvinceDatas(); EventBus.getDefault().register(ShopsAdmActivity.this); } @@ -181,33 +174,6 @@ public class ShopsAdmActivity extends BaseActivity { }.start(); } - private void initLocation() { - mLocationClient = ((BaseApplication) getApplication()).mLocationClient;//定位 - LocationClientOption option = new LocationClientOption(); - option.setLocationMode(LocationMode.Hight_Accuracy);//可选，默认高精度，设置定位模式，高精度，低功耗，仅设备 - option.setCoorType("gcj02");//可选，默认gcj02，设置返回的定位结果坐标系， - option.setScanSpan(10000);//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的 - option.setIsNeedAddress(true);//可选，设置是否需要地址信息，默认不需要 - option.setOpenGps(true);//可选，默认false,设置是否使用gps - option.setLocationNotify(true);//可选，默认false，设置是否当gps有效时按照1S1次频率输出GPS结果 - option.setIgnoreKillProcess(false);//可选，默认true，定位SDK内部是一个SERVICE，并放到了独立进程，设置是否在stop的时候杀死这个进程，默认不杀死 - mLocationClient.setLocOption(option); - mLocationClient.start();//定位SDK start之后会默认发起一次定位请求，开发者无须判断isstart并主动调用request - mLocationClient.requestLocation(); - } - - //收到定位地址 停止定位 - public void onEventMainThread(LocationBean event) { - location = event; - mLocationClient.stop(); - } - - @Override - protected void onStop() { - mLocationClient.stop(); - super.onStop(); - } - @Override protected void onDestroy() { super.onDestroy(); @@ -242,7 +208,7 @@ public class ShopsAdmActivity extends BaseActivity { private void initListener() { findViewById(R.id.ll_add).setOnClickListener(this); - findViewById(R.id.bt_adress).setOnClickListener(this); +// findViewById(R.id.bt_adress).setOnClickListener(this); findViewById(R.id.ll_bg).setOnClickListener(this); findViewById(R.id.in_daohang).setOnClickListener(this); tv_city.setOnClickListener(this); @@ -286,9 +252,9 @@ public class ShopsAdmActivity extends BaseActivity { case R.id.in_daohang://隐藏输入法 hideKeyboard(); break; - case R.id.bt_adress://定位赋值 - addadress(); - break; +// case R.id.bt_adress://定位赋值 +// addadress(); +// break; case R.id.tv_city://弹出选择地址框 showPickView(); break; @@ -566,17 +532,17 @@ public class ShopsAdmActivity extends BaseActivity { updateAreas(); } - private void addadress() { - if (location == null) { - ToastUtil.show(ShopsAdmActivity.this, "暂未获取到定位信息"); - return; - } - tv_city.setText(location.province + location.city + location.district);//省市区 - et_adress.setText(location.street);//街道地址 - mCurrentProviceName = location.province; - mCurrentCityName = location.city; - mCurrentDistrictName = location.district; - } +// private void addadress() { +// if (location == null) { +// ToastUtil.show(ShopsAdmActivity.this, "暂未获取到定位信息"); +// return; +// } +// tv_city.setText(location.province + location.city + location.district);//省市区 +// et_adress.setText(location.street);//街道地址 +// mCurrentProviceName = location.province; +// mCurrentCityName = location.city; +// mCurrentDistrictName = location.district; +// } private void submit() { if (TextUtils.isEmpty(et_phone.getText().toString().replaceAll(" ", ""))) { diff --git a/iFish7/src/main/java/com/ifish/activity/ShopsCheckUploadActivity.java b/iFish7/src/main/java/com/ifish/activity/ShopsCheckUploadActivity.java index 492f6418b..e8b4e1524 100644 --- a/iFish7/src/main/java/com/ifish/activity/ShopsCheckUploadActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/ShopsCheckUploadActivity.java @@ -30,17 +30,12 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.baidu.location.LocationClient; -import com.baidu.location.LocationClientOption; -import com.baidu.location.LocationClientOption.LocationMode; import com.ifish.basebean.BaseBean; import com.ifish.basebean.CityModel; import com.ifish.basebean.DistrictModel; -import com.ifish.basebean.LocationBean; import com.ifish.basebean.ProvinceModel; import com.ifish.basebean.ShopsInfo; import com.ifish.baseclass.BaseActivity; -import com.ifish.baseclass.BaseApplication; import com.ifish.baseclass.UriForFile; import com.ifish.utils.AnimationUtil; import com.ifish.utils.Commons; @@ -82,8 +77,6 @@ public class ShopsCheckUploadActivity extends BaseActivity { private TextView tv_adress, tv_city; private SelectorImageView iv_check; private ImageView iv_idcard, iv_idcard_back, iv_business; - private LocationClient mLocationClient; - private LocationBean location = null; private String[] mProvinceDatas;//所有省 private Map mCitisDatasMap = new HashMap();//key - 省 value - 市 private Map mDistrictDatasMap = new HashMap();// key - 市 values - 区 @@ -115,7 +108,6 @@ public class ShopsCheckUploadActivity extends BaseActivity { initTitle("认证"); initView(); initListener(); - initLocation(); initProvinceDatas(); EventBus.getDefault().register(ShopsCheckUploadActivity.this); } @@ -185,34 +177,6 @@ public class ShopsCheckUploadActivity extends BaseActivity { }.start(); } - private void initLocation() { - mLocationClient = ((BaseApplication) getApplication()).mLocationClient;//定位 - LocationClientOption option = new LocationClientOption(); - option.setLocationMode(LocationMode.Hight_Accuracy);//可选，默认高精度，设置定位模式，高精度，低功耗，仅设备 - option.setCoorType("gcj02");//可选，默认gcj02，设置返回的定位结果坐标系， - option.setScanSpan(10000);//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的 - option.setIsNeedAddress(true);//可选，设置是否需要地址信息，默认不需要 - option.setOpenGps(true);//可选，默认false,设置是否使用gps - option.setLocationNotify(true);//可选，默认false，设置是否当gps有效时按照1S1次频率输出GPS结果 - option.setIgnoreKillProcess(false);//可选，默认true，定位SDK内部是一个SERVICE，并放到了独立进程，设置是否在stop的时候杀死这个进程，默认不杀死 - mLocationClient.setLocOption(option); - mLocationClient.start();//定位SDK start之后会默认发起一次定位请求，开发者无须判断isstart并主动调用request - mLocationClient.requestLocation(); - } - - //收到定位地址 停止定位 - public void onEventMainThread(LocationBean event) { - location = event; - tv_adress.setText(event.province + event.city + event.district + event.street); - mLocationClient.stop(); - } - - @Override - protected void onStop() { - mLocationClient.stop(); - super.onStop(); - } - @Override protected void onDestroy() { super.onDestroy(); @@ -236,7 +200,7 @@ public class ShopsCheckUploadActivity extends BaseActivity { findViewById(R.id.iv_add).setOnClickListener(this); findViewById(R.id.iv_add_back).setOnClickListener(this); findViewById(R.id.iv_add_business).setOnClickListener(this); - findViewById(R.id.bt_adress).setOnClickListener(this); +// findViewById(R.id.bt_adress).setOnClickListener(this); findViewById(R.id.bt_submit).setOnClickListener(this); findViewById(R.id.tv_check).setOnClickListener(this); findViewById(R.id.ll_bg).setOnClickListener(this); @@ -292,9 +256,9 @@ public class ShopsCheckUploadActivity extends BaseActivity { startActivity(intent); AnimationUtil.startAnimation(this); break; - case R.id.bt_adress://定位赋值 - addadress(); - break; +// case R.id.bt_adress://定位赋值 +// addadress(); +// break; case R.id.tv_city://弹出选择地址框 showPickView(); break; @@ -593,17 +557,17 @@ public class ShopsCheckUploadActivity extends BaseActivity { updateAreas(); } - private void addadress() { - if (location == null) { - ToastUtil.show(ShopsCheckUploadActivity.this, "暂未获取到定位信息"); - return; - } - tv_city.setText(location.province + location.city + location.district);//省市区 - et_adress.setText(location.street);//街道地址 - mCurrentProviceName = location.province; - mCurrentCityName = location.city; - mCurrentDistrictName = location.district; - } +// private void addadress() { +// if (location == null) { +// ToastUtil.show(ShopsCheckUploadActivity.this, "暂未获取到定位信息"); +// return; +// } +// tv_city.setText(location.province + location.city + location.district);//省市区 +// et_adress.setText(location.street);//街道地址 +// mCurrentProviceName = location.province; +// mCurrentCityName = location.city; +// mCurrentDistrictName = location.district; +// } private void submit() { if (TextUtils.isEmpty(et_name.getText().toString().replaceAll(" ", ""))) { diff --git a/iFish7/src/main/java/com/ifish/activity/ShopsFailUploadActivity.java b/iFish7/src/main/java/com/ifish/activity/ShopsFailUploadActivity.java index a05bab0bb..c97155074 100644 --- a/iFish7/src/main/java/com/ifish/activity/ShopsFailUploadActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/ShopsFailUploadActivity.java @@ -30,17 +30,12 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.baidu.location.LocationClient; -import com.baidu.location.LocationClientOption; -import com.baidu.location.LocationClientOption.LocationMode; import com.ifish.basebean.BaseBean; import com.ifish.basebean.CityModel; import com.ifish.basebean.DistrictModel; -import com.ifish.basebean.LocationBean; import com.ifish.basebean.ProvinceModel; import com.ifish.basebean.ShopsInfo; import com.ifish.baseclass.BaseActivity; -import com.ifish.baseclass.BaseApplication; import com.ifish.baseclass.UriForFile; import com.ifish.utils.AnimationUtil; import com.ifish.utils.Commons; @@ -83,8 +78,8 @@ public class ShopsFailUploadActivity extends BaseActivity { private TextView tv_adress, tv_city; private SelectorImageView iv_check; private ImageView iv_idcard, iv_idcard_back, iv_business; - private LocationClient mLocationClient; - private LocationBean location = null; +// private LocationClient mLocationClient; +// private LocationBean location = null; private String[] mProvinceDatas;//所有省 private Map mCitisDatasMap = new HashMap();//key - 省 value - 市 private Map mDistrictDatasMap = new HashMap();// key - 市 values - 区 @@ -117,7 +112,6 @@ public class ShopsFailUploadActivity extends BaseActivity { initView(); initData(); initListener(); - initLocation(); initProvinceDatas(); EventBus.getDefault().register(ShopsFailUploadActivity.this); } @@ -187,34 +181,6 @@ public class ShopsFailUploadActivity extends BaseActivity { }.start(); } - private void initLocation() { - mLocationClient = ((BaseApplication) getApplication()).mLocationClient;//定位 - LocationClientOption option = new LocationClientOption(); - option.setLocationMode(LocationMode.Hight_Accuracy);//可选，默认高精度，设置定位模式，高精度，低功耗，仅设备 - option.setCoorType("gcj02");//可选，默认gcj02，设置返回的定位结果坐标系， - option.setScanSpan(10000);//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的 - option.setIsNeedAddress(true);//可选，设置是否需要地址信息，默认不需要 - option.setOpenGps(true);//可选，默认false,设置是否使用gps - option.setLocationNotify(true);//可选，默认false，设置是否当gps有效时按照1S1次频率输出GPS结果 - option.setIgnoreKillProcess(false);//可选，默认true，定位SDK内部是一个SERVICE，并放到了独立进程，设置是否在stop的时候杀死这个进程，默认不杀死 - mLocationClient.setLocOption(option); - mLocationClient.start();//定位SDK start之后会默认发起一次定位请求，开发者无须判断isstart并主动调用request - mLocationClient.requestLocation(); - } - - //收到定位地址 停止定位 - public void onEventMainThread(LocationBean event) { - location = event; - tv_adress.setText(event.province + event.city + event.district + event.street); - mLocationClient.stop(); - } - - @Override - protected void onStop() { - mLocationClient.stop(); - super.onStop(); - } - @Override protected void onDestroy() { super.onDestroy(); @@ -253,7 +219,7 @@ public class ShopsFailUploadActivity extends BaseActivity { findViewById(R.id.iv_add).setOnClickListener(this); findViewById(R.id.iv_add_back).setOnClickListener(this); findViewById(R.id.iv_add_business).setOnClickListener(this); - findViewById(R.id.bt_adress).setOnClickListener(this); +// findViewById(R.id.bt_adress).setOnClickListener(this); findViewById(R.id.bt_submit).setOnClickListener(this); findViewById(R.id.tv_check).setOnClickListener(this); findViewById(R.id.ll_bg).setOnClickListener(this); @@ -309,9 +275,9 @@ public class ShopsFailUploadActivity extends BaseActivity { startActivity(intent); AnimationUtil.startAnimation(this); break; - case R.id.bt_adress://定位赋值 - addadress(); - break; +// case R.id.bt_adress://定位赋值 +// addadress(); +// break; case R.id.tv_city://弹出选择地址框 showPickView(); break; @@ -610,17 +576,17 @@ public class ShopsFailUploadActivity extends BaseActivity { updateAreas(); } - private void addadress() { - if (location == null) { - ToastUtil.show(ShopsFailUploadActivity.this, "暂未获取到定位信息"); - return; - } - tv_city.setText(location.province + location.city + location.district);//省市区 - et_adress.setText(location.street);//街道地址 - mCurrentProviceName = location.province; - mCurrentCityName = location.city; - mCurrentDistrictName = location.district; - } +// private void addadress() { +// if (location == null) { +// ToastUtil.show(ShopsFailUploadActivity.this, "暂未获取到定位信息"); +// return; +// } +// tv_city.setText(location.province + location.city + location.district);//省市区 +// et_adress.setText(location.street);//街道地址 +// mCurrentProviceName = location.province; +// mCurrentCityName = location.city; +// mCurrentDistrictName = location.district; +// } private void submit() { if (TextUtils.isEmpty(et_name.getText().toString().replaceAll(" ", ""))) { diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java index da21fcd1a..515ae3bf2 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java @@ -7,6 +7,8 @@ */ package com.ifish.baseclass; +import android.app.Activity; +import android.os.Bundle; import android.util.Log; import androidx.multidex.MultiDexApplication; @@ -16,8 +18,6 @@ import com.alibaba.sdk.android.push.CommonCallback; import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory; import com.alibaba.sdk.android.push.register.HuaWeiRegister; import com.alibaba.sdk.android.push.register.MiPushRegister; -import com.baidu.location.LocationClient; -import com.ifish.utils.MyLocationListener; import com.ifish.utils.SystemUtil; import com.p2p.core.P2PSpecial.P2PSpecial; import com.tencent.bugly.crashreport.CrashReport; @@ -34,8 +34,6 @@ import cn.smssdk.SMSSDK; * @date 2015-10-30 下午8:23:21 */ public class BaseApplication extends MultiDexApplication { - public LocationClient mLocationClient; - private MyLocationListener mMyLocationListener; public static BaseApplication app; public final static String APPID = "e09c96ff191c4e51831fa156d642eeb4"; public final static String APPToken = "9904aae6e68b6db1978710b07a51507156031648b0f0697e9ad9006a9341ff07"; @@ -60,12 +58,52 @@ public class BaseApplication extends MultiDexApplication { app = this; initCrashSDK(); initTalkingDataSDK(); - initLocationSDK(); +// initLocationSDK(); initShareSDK(); initSMSSDK(); // initAlibcTradeSDK(); initalipushSDK(); P2PSpecial.getInstance().init(app, APPID, APPToken, APPVersion); + initLog(); + } + + private void initLog() { + registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() { + @Override + public void onActivityCreated(Activity activity, Bundle bundle) { + Log.i("ifish7", "LHD" + "---" + activity.getLocalClassName()); + } + + @Override + public void onActivityStarted(Activity activity) { + + } + + @Override + public void onActivityResumed(Activity activity) { + + } + + @Override + public void onActivityPaused(Activity activity) { + + } + + @Override + public void onActivityStopped(Activity activity) { + + } + + @Override + public void onActivitySaveInstanceState(Activity activity, Bundle bundle) { + + } + + @Override + public void onActivityDestroyed(Activity activity) { + + } + }); } private void initalipushSDK() { @@ -93,15 +131,6 @@ public class BaseApplication extends MultiDexApplication { SMSSDK.initSDK(this, "18c495ec6c718", "7db27e28ff94227f246ae7ef5ad3fb92"); } - //初始化百度定位sdk 记得key换成生产环境 - private void initLocationSDK() { - mLocationClient = new LocationClient(this.getApplicationContext()); - mMyLocationListener = new MyLocationListener(); - mLocationClient.registerLocationListener(mMyLocationListener); - // 高德定位 确保不要重复注入同一类型的对象,建议在Application类的onCreate中执行该代码。 -// LocationSDKManager.getInstance().addAndUse(new DefaultLocationImpl()) ; - } - //talkingdata应用留存统计 private void initTalkingDataSDK() { TCAgent.init(getApplicationContext()); @@ -109,22 +138,6 @@ public class BaseApplication extends MultiDexApplication { //初始化腾讯bugly SDK&全局捕获Crash private void initCrashSDK() { -// Cockroach.install(new Cockroach.ExceptionHandler() { -// @Override -// public void handlerException(Thread thread, final Throwable throwable) { -// new Handler(Looper.getMainLooper()).post(new Runnable() { -// @Override -// public void run() { -// try { -// L.i("==============捕获ex==========="); -// CrashReport.postCatchedException(throwable); // bugly会将这个throwable上报 -// } catch (Throwable e) { -// -// } -// } -// }); -// } -// }); CrashReport.initCrashReport(getApplicationContext(), "4c8cf75014", true);//注册bugly上报 } @@ -139,19 +152,6 @@ public class BaseApplication extends MultiDexApplication { PlatformConfig.setQQZone("1105206998", "rTiJNwzYY79DExD9"); } - //初始化BugtagsSDK -// private void initBugtagsSDK() { -// BugtagsOptions options = new BugtagsOptions.Builder(). -// trackingLocation(true).//是否获取位置 -// trackingCrashLog(true).//是否收集crash -// trackingConsoleLog(true).//是否收集console log -// trackingUserSteps(true).//是否收集用户操作步骤 -// versionName(HttpManager.getVersionName(getApplicationContext())).//自定义版本名称 -// versionCode(HttpManager.getVersionCode(getApplicationContext())).//自定义版本号 -// build(); -// Bugtags.start("a1a4ded1006879d5877b53de917efe24", this, Bugtags.BTGInvocationEventBubble,options); -// } - public boolean inMainProcess() { String packageName = getPackageName(); String processName = SystemUtil.getProcessName(this); diff --git a/iFish7/src/main/java/com/ifish/utils/MyLocationListener.java b/iFish7/src/main/java/com/ifish/utils/MyLocationListener.java index 3b75cbccf..8438943e5 100644 --- a/iFish7/src/main/java/com/ifish/utils/MyLocationListener.java +++ b/iFish7/src/main/java/com/ifish/utils/MyLocationListener.java @@ -1,39 +1,37 @@ -/** -* @Title: MyLocationListener.java -* @Package com.ifish.utils -* @Description: TODO -* @author Jacky dada -* @date 2016-1-13 下午4:59:43 - */ -package com.ifish.utils; - -import com.baidu.location.BDLocation; -import com.baidu.location.BDLocationListener; -import com.ifish.basebean.LocationBean; - -import de.greenrobot.event.EventBus; - -/** - * @ClassName: MyLocationListener - * @Description: 实现实时位置回调监听 百度sdk - * @author Jacky dada - * @date 2016-1-13 下午4:59:43 - */ -public class MyLocationListener implements BDLocationListener { - @Override - public void onReceiveLocation(BDLocation location) { - if (location.getLocType() == BDLocation.TypeGpsLocation){// GPS定位结果 - Commons.Address=location.getAddrStr();//获取城市地址 - Commons.Longitude=location.getLongitude();//经度 - Commons.Latitude=location.getLatitude();//纬度 - EventBus.getDefault().post(new LocationBean(location.getProvince(), location.getCity(), location.getDistrict(), location.getStreet())); - } else if (location.getLocType() == BDLocation.TypeNetWorkLocation){// 网络定位结果 - Commons.Address=location.getAddrStr();//获取城市编码 - Commons.Longitude=location.getLongitude();//经度 - Commons.Latitude=location.getLatitude();//纬度 - EventBus.getDefault().post(new LocationBean(location.getProvince(), location.getCity(), location.getDistrict(), location.getStreet())); - } - } - - -} +///** +//* @Title: MyLocationListener.java +//* @Package com.ifish.utils +//* @Description: TODO +//* @author Jacky dada +//* @date 2016-1-13 下午4:59:43 +// */ +//package com.ifish.utils; +// +//import com.ifish.basebean.LocationBean; +// +//import de.greenrobot.event.EventBus; +// +///** +// * @ClassName: MyLocationListener +// * @Description: 实现实时位置回调监听 百度sdk +// * @author Jacky dada +// * @date 2016-1-13 下午4:59:43 +// */ +//public class MyLocationListener implements BDLocationListener { +// @Override +// public void onReceiveLocation(BDLocation location) { +// if (location.getLocType() == BDLocation.TypeGpsLocation){// GPS定位结果 +// Commons.Address=location.getAddrStr();//获取城市地址 +// Commons.Longitude=location.getLongitude();//经度 +// Commons.Latitude=location.getLatitude();//纬度 +// EventBus.getDefault().post(new LocationBean(location.getProvince(), location.getCity(), location.getDistrict(), location.getStreet())); +// } else if (location.getLocType() == BDLocation.TypeNetWorkLocation){// 网络定位结果 +// Commons.Address=location.getAddrStr();//获取城市编码 +// Commons.Longitude=location.getLongitude();//经度 +// Commons.Latitude=location.getLatitude();//纬度 +// EventBus.getDefault().post(new LocationBean(location.getProvince(), location.getCity(), location.getDistrict(), location.getStreet())); +// } +// } +// +// +//} diff --git a/iFish7/src/main/java/com/ifish/utils/WifiAdmin.java b/iFish7/src/main/java/com/ifish/utils/WifiAdmin.java index ca990903a..d48b8a65a 100644 --- a/iFish7/src/main/java/com/ifish/utils/WifiAdmin.java +++ b/iFish7/src/main/java/com/ifish/utils/WifiAdmin.java @@ -7,8 +7,6 @@ import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import android.net.wifi.WifiManager.WifiLock; -import android.os.Build; import android.text.TextUtils; import com.ifish.baseclass.BaseApplication; @@ -31,12 +29,13 @@ public class WifiAdmin { // 网络连接列表 private List mWifiConfiguration; // 定义一个WifiLock - WifiLock mWifiLock; + WifiManager.WifiLock mWifiLock; // 构造器 public WifiAdmin(Context context) { // 取得WifiManager对象 - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE); + mWifiManager.setWifiEnabled(true);//首先要打开wifi // 取得WifiInfo对象 mWifiInfo = mWifiManager.getConnectionInfo(); } diff --git a/iFish7/src/main/res/layout/login_activity.xml b/iFish7/src/main/res/layout/login_activity.xml index 2ff1286d1..796a7b679 100644 --- a/iFish7/src/main/res/layout/login_activity.xml +++ b/iFish7/src/main/res/layout/login_activity.xml @@ -125,6 +125,7 @@ android:id="@+id/ct_check" style="@style/CustomCheckboxTheme" android:layout_width="wrap_content" + android:gravity="center" android:layout_height="wrap_content" android:layout_centerVertical="true" android:checked="false" /> diff --git a/iFish7/src/main/res/layout/shopsadm_activity.xml b/iFish7/src/main/res/layout/shopsadm_activity.xml index c21ace2f6..4b7e91256 100644 --- a/iFish7/src/main/res/layout/shopsadm_activity.xml +++ b/iFish7/src/main/res/layout/shopsadm_activity.xml @@ -227,25 +227,25 @@ /> - -