1.1.4发布

master
hwf453 1 year ago
parent 5178ce0f04
commit 980756f307

@ -10,8 +10,8 @@ android {
applicationId "com.rehome.dywoa" applicationId "com.rehome.dywoa"
minSdk 24 minSdk 24
targetSdk 34 targetSdk 34
versionCode 14 versionCode 15
versionName "1.1.3" versionName "1.1.4"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//authorities //authorities

@ -200,6 +200,10 @@
android:name=".ui.activity.WaitForToDoActivity" android:name=".ui.activity.WaitForToDoActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.BiShowActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.sbxdjgl.SxcdjActivity" android:name=".ui.activity.sbxdjgl.SxcdjActivity"
android:exported="false" android:exported="false"

@ -2,55 +2,12 @@ package com.rehome.dywoa;
public class Contans { public class Contans {
// public static String IP = "http://192.168.2.175:8601/";
// public static String IP_INTRANET = "http://192.168.2.175:8601/";
// public static String IP_EXTRANET = "http://192.168.2.175:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String IP = "http://192.168.2.21:8601/";
// public static String IP_INTRANET = "http://192.168.2.21:8601/";
// public static String IP_EXTRANET = "http://192.168.2.21:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String IP = "http://192.168.2.91:8601/"; // public static String IP = "http://192.168.2.91:8601/";
// public static String IP_INTRANET = "http://192.168.2.91:8601/"; // public static String IP_INTRANET = "http://192.168.2.91:8601/";
// public static String IP_EXTRANET = "http://192.168.2.91:8601/"; // public static String IP_EXTRANET = "http://192.168.2.91:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; // public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";
// public static String IP = "http://192.168.2.76:8601/";
// public static String IP_INTRANET = "http://192.168.2.76:8601/";
// public static String IP_EXTRANET = "http://192.168.2.76:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String IP = "http://192.168.6.100:8601/";
// public static String IP_INTRANET = "http://192.168.6.100:8601/";
// public static String IP_EXTRANET = "http://192.168.6.100:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
//APP登录接口本地服务器IP
// public static String IP = "http://192.168.2.29:8601/";
// public static String IP_INTRANET = "http://192.168.2.29:8601/";
// public static String IP_EXTRANET = "http://192.168.2.29:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
//APP登录接口厂内服务器IP
// public static String IP = "http://10.25.187.8:8601/";
// //app内网
// public static String IP_INTRANET = "http://10.25.187.8:8601/";
// //app外网
// public static String IP_EXTRANET = "http://10.25.187.8:8601/";
// //SIS系统厂内IP
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
//APP登录接口厂内服务器IP
// public static String IP = "http://10.25.188.126:8601/";
// //app内网
// public static String IP_INTRANET = "http://10.25.188.126:8601/";
// //app外网
// public static String IP_EXTRANET = "http://10.25.188.126:8601/";
// //SIS系统厂内IP
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
@ -63,14 +20,9 @@ public class Contans {
public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; public static String IP_EXTRANET = "https://app.dywzhny.com.cn/";
//SIS系统厂内IP //SIS系统厂内IP
public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
//BI
public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";
// public static String IP = "https://oa.dywzhny.com.cn/";
// //app内网
// public static String IP_INTRANET = "https://oa.dywzhny.com.cn/";
// //app外网
// public static String IP_EXTRANET = "https://oa.dywzhny.com.cn/";
// //SIS系统厂内IP
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
public final static String NETWORK_CHECK_TYPE = "NETWORK_CHECK_TYPE"; public final static String NETWORK_CHECK_TYPE = "NETWORK_CHECK_TYPE";

@ -21,7 +21,6 @@ import com.rehome.dywoa.BuildConfig;
public abstract class BaseLazyFragment extends Fragment { public abstract class BaseLazyFragment extends Fragment {
private boolean isPrepared;
protected View view; protected View view;
protected Context context; protected Context context;
@ -35,8 +34,9 @@ public abstract class BaseLazyFragment extends Fragment {
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
view = inflater.inflate(getContentViewId(), container, false); view = inflater.inflate(getContentViewId(), container, false);
//如果要使用eventBus请将此方法返回true initView();
initPrepare(); initData();
initListener();
return view; return view;
} }
@ -103,92 +103,6 @@ public abstract class BaseLazyFragment extends Fragment {
} }
/**
* onResumeonUserVisibleonFirstUserVisible
*/
private boolean isFirstResume = true;
@Override
public void onResume() {
super.onResume();
if (isFirstResume) {
isFirstResume = false;
return;
}
if (getUserVisibleHint()) {
onUserVisible();
}
}
@Override
public void onPause() {
super.onPause();
if (getUserVisibleHint()) {
onUserInvisible();
}
}
private boolean isFirstVisible = true;
private boolean isFirstInvisible = true;
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (isVisibleToUser) {
if (isFirstVisible) {
isFirstVisible = false;
initPrepare();
} else {
onUserVisible();
}
} else {
if (isFirstInvisible) {
isFirstInvisible = false;
onFirstUserInvisible();
} else {
onUserInvisible();
}
}
}
public synchronized void initPrepare() {
if (isPrepared) {
onFirstUserVisible();
} else {
isPrepared = true;
}
}
/**
* fragment
*/
public void onFirstUserVisible() {
initView();
initData();
initListener();
}
/**
* fragmentonResume
*/
public void onUserVisible() {
}
/**
* fragment
*/
public void onFirstUserInvisible() {
}
/**
* fragmentonPause
*/
public void onUserInvisible() {
}
@Override @Override
public void onAttach(@NonNull Context context) { public void onAttach(@NonNull Context context) {
super.onAttach(context); super.onAttach(context);

@ -0,0 +1,242 @@
package com.rehome.dywoa.ui.activity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.ViewGroup;
import android.webkit.WebResourceRequest;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.just.agentweb.AgentWeb;
import com.just.agentweb.DefaultWebClient;
import com.just.agentweb.WebChromeClient;
import com.just.agentweb.WebViewClient;
import com.rehome.dywoa.App;
import com.rehome.dywoa.BuildConfig;
import com.rehome.dywoa.Contans;
import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseAgentWebActivity;
import com.rehome.dywoa.bean.FwSingleLoginResult;
import com.rehome.dywoa.bean.SisTokenBeanData;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.NohttpUtils;
import com.rehome.dywoa.utils.RSAUtils;
import com.rehome.dywoa.utils.UiUtlis;
import com.rehome.dywoa.weiget.WebLayout;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response;
import java.net.URLEncoder;
import java.text.ParseException;
import java.util.HashMap;
import java.util.Map;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocketFactory;
public class BiShowActivity extends BaseAgentWebActivity {
private Toolbar mToolbar;
private TextView mTitleTextView;
//private String urlToken = "webroot/decision/url/mobile#/directory";
private String urlToken = "webroot/decision";
String type;
String urlLog;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_wait_for_to_do);
type = getIntent().getStringExtra("type");
urlLog = getIntent().getStringExtra("urlLog");
if(TextUtils.isEmpty(type)){
type = "";
}
mToolbar = this.findViewById(R.id.toolbar);
mToolbar.setTitleTextColor(Color.WHITE);
mToolbar.setTitle("");
mToolbar.setNavigationIcon(R.drawable.ac_back_icon);
mTitleTextView = this.findViewById(R.id.toolbar_title);
mTitleTextView.setText(type);
this.setSupportActionBar(mToolbar);
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
mToolbar.setNavigationOnClickListener(v -> BiShowActivity.this.finish());
//支持缩放
mAgentWeb.getWebCreator().getWebView().getSettings().setBuiltInZoomControls(true);
mAgentWeb.getWebCreator().getWebView().getSettings().setDisplayZoomControls(false);
mAgentWeb.getWebCreator().getWebView().getSettings().setSupportZoom(true);
mAgentWeb.getWebCreator().getWebView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
checkServerConnectStatus();
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void onDestroy() {
super.onDestroy();
}
//检查服务器连接状态
private void checkServerConnectStatus() {
Map<String,String> param = new HashMap<>();
param.put("login","dywoa");
String json = GsonUtils.GsonString(param);
String url = Contans.IP + Contans.check_server_connect;
showLog(url);
showLog(json);
Request<String> request = NoHttp.createStringRequest(
url,
RequestMethod.POST
);
request.setDefineRequestBodyForJson(json);
NoProgresshttpUtils.getInstance().add(this, 0, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----onSucceed----");
showLog(result);
if(result.equals("1")){
showLog("connect server success");
//可以连接到服务器,请求数据
getSingleLoginToken();
}else{
showToast("无法连接到服务器,请检查网络环境");
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("connect server onFailed");
showToast("无法连接到服务器,请检查网络环境");
}
});
}
private void getSingleLoginToken() {
//1724740210123
//1640832102097
long nowTime = System.currentTimeMillis();
showLog(String.valueOf(nowTime));
HashMap<String,String> param = new HashMap<>();
param.put("username",App.getInstance().getUserInfo().getManid());
param.put("issueTime",String.valueOf(nowTime));
String jsonParam = GsonUtils.GsonString(param);
String usernameEncrypt = RSAUtils.encryptBASE64BIStr(jsonParam);
String usernameEncode = "";
try {
usernameEncode = URLEncoder.encode(usernameEncrypt, "UTF-8");
} catch (Exception e) {
e.printStackTrace();
}
String url = Contans.BI_TOKEN_IP + urlToken + "?ssoToken=" + usernameEncode;
loadSisPage(url);
}
private void loadSisPage(String biUrl) {
showLog(biUrl);
this.mAgentWeb.getUrlLoader().loadUrl(biUrl);
}
@NonNull
@Override
protected ViewGroup getAgentWebParent() {
return (ViewGroup) this.findViewById(R.id.container);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (mAgentWeb != null && mAgentWeb.handleKeyEvent(keyCode, event)) {
return true;
}
return super.onKeyDown(keyCode, event);
}
@Override
protected int getIndicatorColor() {
return Color.parseColor("#ff0000");
}
@Override
protected void setTitle(WebView view, String title) {
super.setTitle(view, title);
if (!TextUtils.isEmpty(title)) {
if (mTitleTextView != null) {
mTitleTextView.setText(type);
}
}
}
@Override
protected int getIndicatorHeight() {
return 3;
}
@Nullable
@Override
protected String getUrl() {
return null;
//return "https://www.baidu.com/";
}
private void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if (TextUtils.isEmpty(logText)) {
Log.i("app", "logText is null");
} else {
Log.i("app", logText);
}
}
}
public void showToast(String msg) {
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
}
public void showToast(int strId) {
Toast.makeText(this, strId, Toast.LENGTH_SHORT).show();
}
}

@ -88,6 +88,9 @@ class HomeActivity : BaseActivityOaToolbarViewBinding<ActivityHomeBinding>() {
private lateinit var badgeView_me: BadgeView private lateinit var badgeView_me: BadgeView
private var isInitTbs: Boolean = false private var isInitTbs: Boolean = false
private lateinit var homeFragment:HomeFragment
private lateinit var mineFragment:MineFragment
private lateinit var username: String private lateinit var username: String
private lateinit var queueNoHttp: RequestQueue private lateinit var queueNoHttp: RequestQueue
@ -124,8 +127,10 @@ class HomeActivity : BaseActivityOaToolbarViewBinding<ActivityHomeBinding>() {
badgeView_me.setBadgeMargin(0, 2, 10, 0) //设置边距 badgeView_me.setBadgeMargin(0, 2, 10, 0) //设置边距
badgeView_me.textSize = 16f badgeView_me.textSize = 16f
fragments.add(HomeFragment.getInstance()) homeFragment = HomeFragment.getInstance()
fragments.add(MineFragment.getInstance()) mineFragment = MineFragment.getInstance()
fragments.add(homeFragment)
fragments.add(mineFragment)
adapter = object : FragmentPagerAdapter(supportFragmentManager) { adapter = object : FragmentPagerAdapter(supportFragmentManager) {
override fun getItem(position: Int): Fragment { override fun getItem(position: Int): Fragment {
@ -158,6 +163,7 @@ class HomeActivity : BaseActivityOaToolbarViewBinding<ActivityHomeBinding>() {
binding.rbHome.setTextColor(Color.parseColor("#0099ff")) binding.rbHome.setTextColor(Color.parseColor("#0099ff"))
binding.rbHome.isChecked = true binding.rbHome.isChecked = true
binding.toolbarView.topLl.visibility = View.GONE binding.toolbarView.topLl.visibility = View.GONE
homeFragment.updateWaitForToDo()
} }
1 -> { 1 -> {
@ -166,6 +172,7 @@ class HomeActivity : BaseActivityOaToolbarViewBinding<ActivityHomeBinding>() {
binding.toolbarView.topLl.visibility = View.GONE binding.toolbarView.topLl.visibility = View.GONE
binding.rbMine.setTextColor(Color.parseColor("#0099ff")) binding.rbMine.setTextColor(Color.parseColor("#0099ff"))
binding.rbMine.isChecked = true binding.rbMine.isChecked = true
mineFragment.updateWaitForToDo()
} }
} }
} }

@ -192,6 +192,10 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// binding.etUsername.setText("371522") // binding.etUsername.setText("371522")
// binding.etPassword.setText("A000000a") // binding.etPassword.setText("A000000a")
// binding.etUsername.setText("CY00011")
// binding.etPassword.setText("A000000a")
// binding.etUsername.setText("371543") // binding.etUsername.setText("371543")
// binding.etPassword.setText("Dyw@2024") // binding.etPassword.setText("Dyw@2024")
@ -729,7 +733,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
// showLog(json.length.toString()); // showLog(json.length.toString());
showLog(json); showLog(json);
// showLog(jsonEncrypt); showLog(jsonEncrypt);
return jsonEncrypt return jsonEncrypt
} }

@ -417,7 +417,7 @@ public class SdjgzActivity extends BaseActivity {
@Override @Override
public void handleNfc(String result) { public void handleNfc(String result) {
//super.handleNfc(result); //super.handleNfc(result);
// tvNodata.setText(result); //tvNodata.setText(result);
//result = "04351EEA211991"; //result = "04351EEA211991";
if (list.size() != 0) { if (list.size() != 0) {
showLog("--------"); showLog("--------");

@ -1,8 +1,6 @@
package com.rehome.dywoa.ui.fragment; package com.rehome.dywoa.ui.fragment;
import static com.rehome.dywoa.utils.GsonUtils.GsonToBean;
import android.content.Intent; import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
@ -10,51 +8,41 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.rehome.dywoa.App; import com.rehome.dywoa.App;
import com.rehome.dywoa.Contans; import com.rehome.dywoa.Contans;
import com.rehome.dywoa.DBModel.Xjjh;
import com.rehome.dywoa.DBModel.XjjhList;
import com.rehome.dywoa.MainActivity; import com.rehome.dywoa.MainActivity;
import com.rehome.dywoa.R; import com.rehome.dywoa.R;
import com.rehome.dywoa.adapter.GridViewAdapter; import com.rehome.dywoa.adapter.GridViewAdapter;
import com.rehome.dywoa.base.BaseFragment; import com.rehome.dywoa.base.BaseFragment;
import com.rehome.dywoa.bean.GridItem; import com.rehome.dywoa.bean.GridItem;
import com.rehome.dywoa.bean.WaitForBean; import com.rehome.dywoa.bean.WaitForBean;
import com.rehome.dywoa.ui.activity.BiShowActivity;
import com.rehome.dywoa.ui.activity.JiZhuActivity; import com.rehome.dywoa.ui.activity.JiZhuActivity;
import com.rehome.dywoa.ui.activity.KksSearchActivity; import com.rehome.dywoa.ui.activity.KksSearchActivity;
import com.rehome.dywoa.ui.activity.RunLogActivity;
import com.rehome.dywoa.ui.activity.RunLogBaseActivity;
import com.rehome.dywoa.ui.activity.RunLogListActivity; import com.rehome.dywoa.ui.activity.RunLogListActivity;
import com.rehome.dywoa.ui.activity.SisBaseActivity; import com.rehome.dywoa.ui.activity.SisBaseActivity;
import com.rehome.dywoa.ui.activity.UseCarActivity; import com.rehome.dywoa.ui.activity.UseCarActivity;
import com.rehome.dywoa.ui.activity.UseSealActivity; import com.rehome.dywoa.ui.activity.UseSealActivity;
import com.rehome.dywoa.ui.activity.WaitForToDoActivity; import com.rehome.dywoa.ui.activity.WaitForToDoActivity;
import com.rehome.dywoa.ui.activity.WaitForToDoBaseActivity;
import com.rehome.dywoa.ui.activity.YjyaActivity; import com.rehome.dywoa.ui.activity.YjyaActivity;
import com.rehome.dywoa.ui.activity.sbxdjgl.SbxdjglActivity; import com.rehome.dywoa.ui.activity.sbxdjgl.SbxdjglActivity;
import com.rehome.dywoa.ui.activity.sbxj.XscbglActivity; import com.rehome.dywoa.ui.activity.sbxj.XscbglActivity;
import com.rehome.dywoa.utils.GsonUtils; import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener; import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils; import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.NohttpUtils;
import com.rehome.dywoa.weiget.AutoGridView; import com.rehome.dywoa.weiget.AutoGridView;
import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request; import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response; import com.yolanda.nohttp.rest.Response;
import org.litepal.crud.DataSupport; import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
public class HomeFragment extends BaseFragment { public class HomeFragment extends BaseFragment {
@ -220,12 +208,12 @@ public class HomeFragment extends BaseFragment {
startActivity(intentJiZhu); startActivity(intentJiZhu);
break; break;
case 3: case 3:
if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(username!=null&&username.equals("371522"))){ if((firstDeparment!=null&&firstDeparment.equals("运行部"))||(firstDeparment!=null&&firstDeparment.equals("承包商"))||(username!=null&&username.equals("371522"))){
Intent intentXj= new Intent(mActivity, XscbglActivity.class); Intent intentXj= new Intent(mActivity, XscbglActivity.class);
intentXj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intentXj.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intentXj); startActivity(intentXj);
}else{ }else{
showToast("巡检功能只对运行部开放,当前用户不是运行部,无权限"); showToast("巡检功能只对运行部和承包商开放,当前用户无权限");
} }
break; break;
case 4: case 4:
@ -298,16 +286,23 @@ public class HomeFragment extends BaseFragment {
intentUseSeal.putExtra("urlLog",urlSeal); intentUseSeal.putExtra("urlLog",urlSeal);
startActivity(intentUseSeal); startActivity(intentUseSeal);
break; break;
// case 9: case 10:
// Intent intentWaitFor = new Intent(mActivity, WaitForToDoActivity.class); try {
// intentWaitFor.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); //
// Intent intentWaitFor = new Intent(mActivity, BiShowActivity.class);
// String typeWaitFor = "待办"; intentWaitFor.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
// String urlWaitFor = "https://mis.dywzhny.com.cn/mobile/workflow/list/todo?cusMenuId=5116426542447237804&urlPageTitle=5b6F5Yqe5rWB56iL"; String typeBI = "BI";
// intentWaitFor.putExtra("type",typeWaitFor); String urlBI = "https://bi.dywzhny.com.cn/webroot/decision/url/mobile#/directory";
// intentWaitFor.putExtra("urlLog",urlWaitFor); String encodedUrlBI = URLEncoder.encode(urlBI, "UTF-8");
// startActivity(intentWaitFor);
// break; //urlBI = "https://bi.dywzhny.com.cn/webroot/decision#/";
intentWaitFor.putExtra("type",typeBI);
intentWaitFor.putExtra("urlLog",urlBI);
startActivity(intentWaitFor);
} catch (Exception e) {
e.printStackTrace();
}
break;
// case 8: // case 8:
// TAG = GridViewDialog.TAG_PEIXUN; // TAG = GridViewDialog.TAG_PEIXUN;
// break; // break;
@ -336,8 +331,8 @@ public class HomeFragment extends BaseFragment {
// String[] titles = {"两票系统", "会议管理", "用餐管理", "车辆管理", "办公领用", "工作任务", "日程查看", "考勤", "来访管理", "培训", "党建", "安防"}; // String[] titles = {"两票系统", "会议管理", "用餐管理", "车辆管理", "办公领用", "工作任务", "日程查看", "考勤", "来访管理", "培训", "党建", "安防"};
// int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_meetting, R.drawable.icon_dinner_new, R.drawable.icon_vehicle_new, R.drawable.icon_office, R.drawable.icon_task, R.drawable.icon_date, R.drawable.icon_check, R.drawable.icon_px, R.drawable.icon_dj,R.drawable.icon_visit, R.drawable.icon1}; // int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_meetting, R.drawable.icon_dinner_new, R.drawable.icon_vehicle_new, R.drawable.icon_office, R.drawable.icon_task, R.drawable.icon_date, R.drawable.icon_check, R.drawable.icon_px, R.drawable.icon_dj,R.drawable.icon_visit, R.drawable.icon1};
// //
String[] titles = {"两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询","应急预案","用车","用印"}; String[] titles = {"两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询","应急预案","用车","用印","BI"};
int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_sis_new, R.drawable.icon_gcjd_new,R.drawable.xjgz,R.drawable.icon_dianjian,R.drawable.icon_runlog_home,R.drawable.icon_kks,R.drawable.icon_yjya,R.drawable.icon_use_car,R.drawable.icon_use_seal}; int[] imgIds = {R.drawable.icon_liangpiao, R.drawable.icon_sis_new, R.drawable.icon_gcjd_new,R.drawable.xjgz,R.drawable.icon_dianjian,R.drawable.icon_runlog_home,R.drawable.icon_kks,R.drawable.icon_yjya,R.drawable.icon_use_car,R.drawable.icon_use_seal,R.drawable.icon_bi};
@ -375,6 +370,7 @@ public class HomeFragment extends BaseFragment {
HashMap<String,String> param = new HashMap<>(); HashMap<String,String> param = new HashMap<>();
param.put("YHID",username); param.put("YHID",username);
//param.put("YHID","sysadmin");
String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO; String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO;
showLog(url); showLog(url);
@ -395,9 +391,15 @@ public class HomeFragment extends BaseFragment {
if(waitForBean!=null){ if(waitForBean!=null){
if(!TextUtils.isEmpty(waitForBean.getTotal())){ if(!TextUtils.isEmpty(waitForBean.getTotal())){
tv_todo_count.setText(waitForBean.getTotal()); tv_todo_count.setText(waitForBean.getTotal());
if(Integer.valueOf(waitForBean.getTotal()).intValue()==0){
tv_todo_count.setVisibility(View.GONE);
}else{
tv_todo_count.setVisibility(View.VISIBLE);
}
} }
}else{ }else{
tv_todo_count.setText("0"); tv_todo_count.setText("0");
tv_todo_count.setVisibility(View.GONE);
} }
} }
@ -407,5 +409,8 @@ public class HomeFragment extends BaseFragment {
} }
}); });
} }
//更新待办
public void updateWaitForToDo() {
getWaitForToDo();
}
} }

@ -47,6 +47,7 @@ import com.luck.picture.lib.interfaces.OnResultCallbackListener;
import com.rehome.dywoa.App; import com.rehome.dywoa.App;
import com.rehome.dywoa.BuildConfig; import com.rehome.dywoa.BuildConfig;
import com.rehome.dywoa.Contans; import com.rehome.dywoa.Contans;
import com.rehome.dywoa.DBModel.DjjhRwQy;
import com.rehome.dywoa.Listener.GlideEngine; import com.rehome.dywoa.Listener.GlideEngine;
import com.rehome.dywoa.R; import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseLazyFragment; import com.rehome.dywoa.base.BaseLazyFragment;
@ -72,6 +73,7 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
@ -227,7 +229,6 @@ public class MineFragment extends BaseLazyFragment {
clearImageDiskCache(getActivity()); clearImageDiskCache(getActivity());
loadImage(); loadImage();
getWaitForToDo();
} }
@Override @Override
@ -501,6 +502,7 @@ public class MineFragment extends BaseLazyFragment {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
getWaitForToDo();
} }
@ -797,6 +799,7 @@ public class MineFragment extends BaseLazyFragment {
HashMap<String,String> param = new HashMap<>(); HashMap<String,String> param = new HashMap<>();
param.put("YHID",username); param.put("YHID",username);
//param.put("YHID","sysadmin");
String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO; String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO;
showLog(url); showLog(url);
@ -820,7 +823,7 @@ public class MineFragment extends BaseLazyFragment {
if(Integer.valueOf(waitForBean.getTotal()).intValue()==0){ if(Integer.valueOf(waitForBean.getTotal()).intValue()==0){
tv_count_to_do.setVisibility(View.GONE); tv_count_to_do.setVisibility(View.GONE);
}else{ }else{
tv_count_to_do.setVisibility(View.GONE); tv_count_to_do.setVisibility(View.VISIBLE);
} }
}else{ }else{
tv_count_to_do.setVisibility(View.GONE); tv_count_to_do.setVisibility(View.GONE);
@ -837,4 +840,8 @@ public class MineFragment extends BaseLazyFragment {
} }
}); });
} }
//更新待办
public void updateWaitForToDo() {
getWaitForToDo();
}
} }

@ -10,7 +10,7 @@ public class DataPassUtils {
try { try {
//格式化日期的对象(转化成习惯的时间格式) //格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月31日"); Date date = sdFormat.parse("2024年10月20日");
Calendar calendarOne = Calendar.getInstance(); Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date); calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) { if (!Calendar.getInstance().after(calendarOne)) {
@ -27,7 +27,7 @@ public class DataPassUtils {
try { try {
//格式化日期的对象(转化成习惯的时间格式) //格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月31日"); Date date = sdFormat.parse("2024年10月20日");
Calendar calendarOne = Calendar.getInstance(); Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date); calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) { if (!Calendar.getInstance().after(calendarOne)) {
@ -43,7 +43,7 @@ public class DataPassUtils {
try { try {
//格式化日期的对象(转化成习惯的时间格式) //格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月31日"); Date date = sdFormat.parse("2024年10月20日");
Calendar calendarOne = Calendar.getInstance(); Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date); calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) { if (!Calendar.getInstance().after(calendarOne)) {
@ -58,7 +58,7 @@ public class DataPassUtils {
try { try {
//格式化日期的对象(转化成习惯的时间格式) //格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2024年08月31日"); Date date = sdFormat.parse("2024年10月20日");
Calendar calendarOne = Calendar.getInstance(); Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date); calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) { if (!Calendar.getInstance().after(calendarOne)) {

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#ffffff"
tools:context=".ui.activity.BiShowActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:actionBarSize"
android:background="?attr/colorPrimary"
android:titleTextColor="@android:color/white"
app:theme="@style/Widget.AppCompat.Toolbar"
app:titleTextColor="@android:color/white">
<TextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:singleLine="true"
android:textColor="@android:color/white"
android:textSize="20sp"/>
</androidx.appcompat.widget.Toolbar>
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>

@ -57,7 +57,7 @@
android:text="0" android:text="0"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:textColor="#267AE4" android:textColor="#267AE4"
android:visibility="gone" android:visibility="visible"
android:textSize="20sp" /> android:textSize="20sp" />

@ -118,7 +118,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="2dp" android:padding="2dp"
android:text="" android:text=""
android:visibility="gone" android:visibility="visible"
android:textColor="#267AE4" android:textColor="#267AE4"
android:textSize="20sp" /> android:textSize="20sp" />
<TextView <TextView

@ -417,7 +417,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/px_2" android:layout_margin="@dimen/px_2"
android:maxHeight="250px" android:maxHeight="650px"
android:minHeight="@dimen/px_50"> android:minHeight="@dimen/px_50">
<TextView <TextView
@ -432,7 +432,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|left" android:gravity="center_vertical|left"
android:maxHeight="350px"
android:text="" android:text=""
android:textSize="@dimen/sbtextSize"/> android:textSize="@dimen/sbtextSize"/>
</LinearLayout> </LinearLayout>

Loading…
Cancel
Save