gaojian/gridclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
itgaojian 2023-05-12 08:59:44 +08:00
parent 0b8a3187da
commit 6d6808c2fc
11 changed files with 108 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/tengshisoft/gridclient/BaseMyApplication.java
View File

@ -3,6 +3,8 @@ package com.tengshisoft.gridclient;
import android.app.ActivityManager;
import android.content.Context;
import android.content.IntentFilter;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.net.ConnectivityManager;
import com.alibaba.android.arouter.launcher.ARouter;
@ -10,7 +12,6 @@ import com.baidu.mapapi.CoordType;
import com.baidu.mapapi.SDKInitializer;
import com.tencent.bugly.crashreport.CrashReport;
import com.tengshisoft.chatmodule.hwclud.receiver.NetWorkStateReceiver;
import com.tengshisoft.commonmodule.beans.AreaGridListBean;
import com.tenlionsoft.baselib.app.BaseAppContext;
import com.tenlionsoft.baselib.utils.AppUtils;
import com.tenlionsoft.baselib.utils.FileUtils;
@ -33,7 +34,6 @@ public class BaseMyApplication extends BaseAppContext {
private NetWorkStateReceiver mNetWorkStateReceiver;
@Override
public void onCreate() {
super.onCreate();
@ -50,6 +50,17 @@ public class BaseMyApplication extends BaseAppContext {
filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
registerReceiver(mNetWorkStateReceiver, filter);
}
// disableRes();
}
/**
* 禁止跟随系统字体
*/
private void disableRes() {
Resources res = getResources();
Configuration config = new Configuration();
config.setToDefaults();
res.updateConfiguration(config, res.getDisplayMetrics());
}
public String getProcessName(Context ctx, int pid) {

1
baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
View File

@ -202,6 +202,7 @@ public class PathConfig {
public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_DEPT_KNOW = "/modulecommon/activity/chooseDeptKnowLedge";//部门选择接口
public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_PERSON = "/modulecommon/activity/choosePerson";//人员选择
public static final String PATH_MODULE_COMMON_ACTIVITY_CHOOSE_ORG_AREA = "/modulecommon/activity/chooseOrgArea";//区域部门选择
public static final String PATH_MODULE_COMMON_ACTIVITY_CHOOSE_GRID_USER = "/modulecommon/activity/chooseGridUser";//网格员选择
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_REPORT = "/modulecommon/activity/incidentReport";//事件上报

4
baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
View File

@ -7,7 +7,7 @@ package com.tenlionsoft.baselib.core.retrofit_net;
*/
public class BaseUrlApi {
// public static final String IP = "http://192.168.0.103:7011/";/* 测试IP */
// public static final String IP = "http://192.168.0.120:9000/";/* 测试IP */
// public static final String IP = "http://10.25.242.183:80/";/* 测试IP */
public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */
public static final String SYS_USERCENTER = "usercenter/";
@ -19,8 +19,10 @@ public class BaseUrlApi {
public static final String SYS_LIBRARY = "library/";/*知识库系统*/
public static final String SYS_VISITS = "visits/";/*信访系统*/
// public static final String BASE_MAIN_IP = "http://192.168.0.15:7011/usercenter/";
public static final String BASE_MAIN_IP = IP + SYS_USERCENTER;
public static final String BASE_CASE_IP = IP + SYS_CASE;
// public static final String BASE_CASE_IP = IP + SYS_CASE;
public static final String BASE_CASE_LOCAL_IP = "http://49.233.36.36:58099/case/";
public static final String BASE_LIBRARY_IP = IP + SYS_LIBRARY;
public static final String BASE_TASK_IP = IP + SYS_TASK;

9
baselib/src/main/java/com/tenlionsoft/baselib/utils/UserLgUtils.java
View File

@ -226,6 +226,15 @@ public class UserLgUtils {
return SPUtils.getInstance(SP_USER_INFO).getString("userAreaCode");
}
public static void setUserAreaLevel(int level) {
SPUtils.getInstance(SP_USER_INFO).put("userAreaLevel", level);
}
public static int getUserAreaLevel() {
return SPUtils.getInstance(SP_USER_INFO).getInt("userAreaLevel", -1);
}
public static String getUserDeptId() {
return SPUtils.getInstance(SP_USER_INFO).getString("deptId");
}

2
commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java
View File

@ -187,8 +187,8 @@ public class IncidentReportActivity extends BaseActivity {
mBind = ButterKnife.bind(this);
mTvBaseTitle.setText("事件上报");
refreshView(STATE_LOAD_SUCCESS);
initMap();
initViews();
initMap();
}
private void initViews() {

14
commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridUserActivity.java
View File

@ -1,14 +0,0 @@
package com.tengshisoft.commonmodule.activitys.department;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
public class ChooseGridUserActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_choose_grid_user);
}
}

66
commonmodule/src/main/res/layout/activity_choose_grid_user.xml
View File

@ -1,9 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activitys.department.ChooseGridUserActivity">
android:background="@color/gray_bg"
android:orientation="vertical"
tools:context=".activitys.department.ChooseDeptActivity">
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_higher_dept"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_bottom_shadow_white"
android:gravity="center_vertical"
android:padding="5dp"
tools:itemCount="1"
tools:listitem="@layout/item_dept_sel_layout" />
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<ProgressBar
android:id="@+id/pb_loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_empty_data"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:background="@drawable/ic_empty_data" />
<TextView
android:id="@+id/tv_error_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:clickable="true"
android:textColor="@color/black"
tools:text="加载数据失败" />
</LinearLayout>
</RelativeLayout>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</LinearLayout>

2
gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java
View File

@ -485,8 +485,10 @@ public class BuildingEditActivity extends BaseActivity {
mEtElevatorNum.setText(bean.getElevator() + "");
//备注
mEtRemark.setText(Html.fromHtml(bean.getRemake()));
if(!TextUtils.isEmpty(bean.getLatitude()) && !TextUtils.isEmpty(bean.getLongitude())){
mLat = Double.parseDouble(bean.getLatitude());
mLng = Double.parseDouble(bean.getLongitude());
}
mTvLocation.setText(mLat + "-" + mLng);
Location84 location84 = PointUtils.wgs84ToBd09(new Location84(mLat, mLng));

5
mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java
View File

@ -287,7 +287,9 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
@Override
public void onNext(@NonNull UserExpandInfoBean userExpandInfoBean) {
UserLgUtils.setUserAreaCode(userExpandInfoBean.getAreaCode());
UserLgUtils.setUserAreaCode("");
UserLgUtils.setLocationAddress("");
UserLgUtils.setUserAreaLevel(-1);
if (!TextUtils.isEmpty(userExpandInfoBean.getAreaCode())) {
String cityCode = userExpandInfoBean.getAreaCode().substring(0, 4);
String areaCode = userExpandInfoBean.getAreaCode().substring(0, 6);
@ -295,6 +297,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
String villageCode = userExpandInfoBean.getAreaCode();
UserLgUtils.setUserAreaCode(userExpandInfoBean.getAreaCode());
UserLgUtils.setLocationAddress(userExpandInfoBean.getAreaName());
UserLgUtils.setUserAreaLevel(userExpandInfoBean.getUserLevel());
GlobalProvider.save(mActivity, "cityCode", cityCode);
GlobalProvider.save(mActivity, "areaCode", areaCode);
GlobalProvider.save(mActivity, "streetCode", streetCode);

1
mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java
View File

@ -182,6 +182,7 @@ public class GridMainFragment extends BaseFragment {
* 获取我的网格列表
*/
private void getMineGridList() {
((BaseAppContext) getApplicationContext()).setGridBean(null);
RetrofitManager.getInstance()
.create(GridApis.class)
.getMineGridList(UserLgUtils.getToken())

8
mainmodule/src/main/res/layout/fragment_main_grid.xml
View File

@ -26,6 +26,14 @@
android:scaleType="fitXY"
android:src="@drawable/ic_home_title" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="网格员客户端"
android:textColor="@color/white"
android:textSize="@dimen/text_16" />
<LinearLayout
android:id="@+id/ll_user_info"
android:layout_width="match_parent"