1.1.8 release

master
hwf453 1 year ago
parent fe4ce4f333
commit 14b88ebee1

@ -10,8 +10,8 @@ android {
applicationId "com.rehome.dywoa"
minSdk 24
targetSdk 34
versionCode 18
versionName "1.1.7"
versionCode 19
versionName "1.1.8"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//authorities

@ -212,6 +212,10 @@
android:name=".ui.activity.WaitForToDoActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.HightRiskActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.FanWeiActivity"
android:exported="false"

@ -3,25 +3,25 @@ package com.rehome.dywoa;
public class Contans {
public static String IP = "http://192.168.2.115:8601/";
public static String IP_INTRANET = "http://192.168.2.115:8601/";
public static String IP_EXTRANET = "http://192.168.2.115:8601/";
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.115:8601/";
// public static String IP_INTRANET = "http://192.168.2.115:8601/";
// public static String IP_EXTRANET = "http://192.168.2.115:8601/";
// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";
//APP登录接口厂内服务器IP
// public static String IP = "https://app.dywzhny.com.cn/";
// //app内网
// public static String IP_INTRANET = "https://app.dywzhny.com.cn/";
// //app外网
// public static String IP_EXTRANET = "https://app.dywzhny.com.cn/";
// //SIS系统厂内IP
// 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://app.dywzhny.com.cn/";
//app内网
public static String IP_INTRANET = "https://app.dywzhny.com.cn/";
//app外网
public static String IP_EXTRANET = "https://app.dywzhny.com.cn/";
//SIS系统厂内IP
public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/";
//BI
public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/";

@ -0,0 +1,298 @@
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.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
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.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.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 HightRiskActivity extends BaseAgentWebActivity {
private Toolbar mToolbar;
private TextView mTitleTextView;
private String urlToken = "api/app/login/singleLogin?account=";
private String startUrl;
String type;
String urlLog;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_hight_risk);
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 -> HightRiskActivity.this.finish());
//支持缩放
mAgentWeb.getWebCreator().getWebView().getSettings().setBuiltInZoomControls(true);
mAgentWeb.getWebCreator().getWebView().getSettings().setDisplayZoomControls(false);
mAgentWeb.getWebCreator().getWebView().getSettings().setSupportZoom(true);
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() {
String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid();
//String url = Contans.IP + urlToken + "803011";
//url = Contans.IP + urlToken + "280846";
Request request = NoHttp.createStringRequest(url, RequestMethod.GET);
showLog(url);
// SSLSocketFactory socketFactory = NohttpUtils.getSisSSLSocketFactory(WaitForToDoActivity.this);
// if (socketFactory != null) {
// request.setSSLSocketFactory(socketFactory);
// request.setHostnameVerifier(new HostnameVerifier() {
// @Override
// public boolean verify(String s, SSLSession sslSession) {
// return true;
// }
// });
// }
NohttpUtils.getInstance().add(this,1,request,new HttpListener<String>(){
@Override
public void onSucceed(int what, Response<String> response) throws ParseException {
String jsonResult = response.get();
showLog("-----login------");
showLog(jsonResult);
String jsonDecode = RSAUtils.decryptBASE64StrClient(jsonResult);
if (TextUtils.isEmpty(jsonDecode)) {
showToast(UiUtlis.getString(HightRiskActivity.this, R.string.data_error));
} else {
FwSingleLoginResult loginResult = GsonUtils.GsonToBean(jsonDecode, FwSingleLoginResult.class);
showLog(jsonDecode);
if (loginResult != null) {
if (loginResult.getErrmsg()!=null&&loginResult.getErrmsg().equals("success")) {
if(!TextUtils.isEmpty(loginResult.getToken())){
loadSisPage(loginResult.getToken());
}
}else{
showToast(loginResult.getErrmsg());
}
}
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("getSisToken onFailed");
}
}, true, true, "请稍候...");
}
private void loadSisPage(String token) {
try {
var tempUrl = "https://mis.dywzhny.com.cn/papi/open/singleSignon?oauthType=singlesign&singleToken="+ token +"&redirect_uri=";
String encodeUrl = URLEncoder.encode(urlLog,"UTF-8");
startUrl = tempUrl + encodeUrl;
showLog(startUrl);
this.mAgentWeb.getUrlLoader().loadUrl(startUrl);
}catch (Exception e){
e.printStackTrace();
}
}
@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 (isApkInDebug(HightRiskActivity.this)) {
if (TextUtils.isEmpty(logText)) {
Log.i("app", "logText is null");
} else {
Log.i("app", logText);
}
}
}
/**
* debug
*/
public static boolean isApkInDebug(Context context) {
try {
ApplicationInfo info = context.getApplicationInfo();
return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
} catch (Exception e) {
return false;
}
}
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();
}
}

@ -836,6 +836,8 @@ class HomeActivity : BaseActivityOaToolbarViewBinding<ActivityHomeBinding>() {
showLog(url)
val request = NoHttp.createStringRequest(url, RequestMethod.POST)
val json = getJsonUploadSingleTaskDj(djCheckedItem)
showLog("上传单个巡检点:")
showLog(json)
request.setDefineRequestBodyForJson(json)
if (App.getInstance().userInfo != null && App.getInstance().userInfo.token != null) {

@ -207,8 +207,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (isApkInDebug(context)) {
//李梓雄
binding.etUsername.setText("371522")
binding.etPassword.setText("A000000a.")
// binding.etUsername.setText("371522")
// binding.etPassword.setText("A000000a.")
//ceshi1
// binding.etUsername.setText("ceshi1")

@ -100,6 +100,11 @@ class RunLogBaseActivity : BaseActivityOaToolbarViewBinding<ActivityRunLogBaseBi
if(type=="调试日志日报"){
initToolbar("调试日志日报", "") {
}
}
if(type=="高风险"){
initToolbar("高风险", "") {
}
}
}

@ -150,9 +150,9 @@ public class WaitForToDoActivity extends BaseAgentWebActivity {
private void getSingleLoginToken() {
//String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid();
String url = Contans.IP + urlToken + App.getInstance().getUserInfo().getManid();
String url = Contans.IP + urlToken + "803011";
//String url = Contans.IP + urlToken + "803011";
//url = Contans.IP + urlToken + "280846";

@ -100,22 +100,6 @@ public class CJFragment extends BaseFragment {
findView();
et_jg.setEnabled(isEdit);
btn_selectCheckResult.setEnabled(isEdit);
et_jg.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
}
});
updata(info, index, zj);
}
@ -253,17 +237,20 @@ public class CJFragment extends BaseFragment {
tv_dw.setVisibility(View.VISIBLE);
ll_et_jg.setVisibility(View.VISIBLE);
btn_selectCheckResult.setVisibility(View.GONE);
//et_jg.setInputType(InputType.TYPE_CLASS_NUMBER|InputType.TYPE_NUMBER_FLAG_DECIMAL);
//et_jg.setText("正常");
}else{
ll_bz.setVisibility(View.GONE);
tv_dw.setVisibility(View.GONE);
ll_et_jg.setVisibility(View.GONE);
btn_selectCheckResult.setVisibility(View.VISIBLE);
et_jg.setInputType(InputType.TYPE_CLASS_TEXT);
//et_jg.setInputType(InputType.TYPE_CLASS_TEXT);
}
}
//android:inputType="numberSigned|numberDecimal"
//android:digits="0123456789.-"
if (info.isChecked()) {
if(!TextUtils.isEmpty(info.getStatus())){

@ -338,6 +338,7 @@ public class SbxjcjsbActivity extends BaseActivity {
ContentValues values = new ContentValues();
values.put("checked", true);
values.put("uploaded", "0");
values.put("CJJG", xjcjFragment.getCJJG());
values.put("cbr", username);

@ -11,10 +11,13 @@ import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import com.rehome.dywoa.Contans;
import com.rehome.dywoa.DBModel.XSJJHDataBean;
import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseFragment;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.SPUtils;
import com.rehome.dywoa.weiget.ListDialog;
import java.util.Arrays;
import java.util.List;
@ -42,14 +45,31 @@ public class XJCJFragment extends BaseFragment {
TextView tv_lower_action;
TextView tv_upper_warning;
TextView tv_lower_warning;
TextView tv_upper_action_stop;
TextView tv_lower_action_stop;
TextView tv_upper_warning_stop;
TextView tv_lower_warning_stop;
TextView tv_kks;
TextView tv_point_type;
TextView tv_kks_desc;
LinearLayout ll_action;
LinearLayout ll_warnning;
// LinearLayout ll_action;
// LinearLayout ll_warnning;
LinearLayout ll_jz_running;
LinearLayout ll_check_option;
// LinearLayout ll_action_stop;
// LinearLayout ll_warnning_stop;
LinearLayout ll_jz_stop;
LinearLayout ll_jz;
TextView tv_jz;
TextView tv_jzzt;
@ -118,14 +138,30 @@ public class XJCJFragment extends BaseFragment {
tv_lower_action = view.findViewById(R.id.tv_lower_action);
tv_upper_warning = view.findViewById(R.id.tv_upper_warning);
tv_lower_warning = view.findViewById(R.id.tv_lower_warning);
tv_upper_action_stop= view.findViewById(R.id.tv_upper_action_stop);
tv_lower_action_stop = view.findViewById(R.id.tv_lower_action_stop);
tv_upper_warning_stop = view.findViewById(R.id.tv_upper_warning_stop);
tv_lower_warning_stop = view.findViewById(R.id.tv_lower_warning_stop);
tv_kks = view.findViewById(R.id.tv_kks);
tv_point_type = view.findViewById(R.id.tv_point_type);
tv_kks_desc = view.findViewById(R.id.tv_kks_desc);
ll_action = view.findViewById(R.id.ll_action);
ll_warnning = view.findViewById(R.id.ll_warnning);
// ll_action = view.findViewById(R.id.ll_action);
// ll_warnning = view.findViewById(R.id.ll_warnning);
ll_jz_running = view.findViewById(R.id.ll_jz_running);
ll_check_option = view.findViewById(R.id.ll_check_option);
// ll_action_stop = view.findViewById(R.id.ll_action_stop);
// ll_warnning_stop = view.findViewById(R.id.ll_warnning_stop);
ll_jz_stop = view.findViewById(R.id.ll_jz_stop);
ll_jz = view.findViewById(R.id.ll_jz);
tv_jz = view.findViewById(R.id.tv_jz);
tv_jzzt = view.findViewById(R.id.tv_jzzt);
etJg.setEnabled(isEdit);
@ -205,6 +241,11 @@ public class XJCJFragment extends BaseFragment {
tv_upper_warning.setText(info.getUPPERWARNING());
tv_lower_warning.setText(info.getLOWERWARNING());
tv_upper_action_stop.setText(info.getUPPERACTIONSTOP());
tv_lower_action_stop.setText(info.getLOWERACTIONSTOP());
tv_upper_warning_stop.setText(info.getUPPERWARNINGSTOP());
tv_lower_warning_stop.setText(info.getLOWERWARNINGSTOP());
tv_kks.setText(info.getKksCode());
tv_point_type.setText(info.getPOINTNAME());
tv_kks_desc.setText(info.getKksDesc());
@ -214,8 +255,14 @@ public class XJCJFragment extends BaseFragment {
if(!TextUtils.isEmpty(info.getDlxmc())){
if(info.getDlxmc().equals("记录类")){
tv_dw.setVisibility(View.VISIBLE);
ll_action.setVisibility(View.VISIBLE);
ll_warnning.setVisibility(View.VISIBLE);
// ll_action.setVisibility(View.VISIBLE);
// ll_warnning.setVisibility(View.VISIBLE);
ll_jz_running.setVisibility(View.VISIBLE);
ll_jz_stop.setVisibility(View.VISIBLE);
ll_check_option.setVisibility(View.VISIBLE);
if(TextUtils.isEmpty(info.getUNITOFMEASURE())){
@ -223,11 +270,61 @@ public class XJCJFragment extends BaseFragment {
}else{
tv_dw.setText(info.getUNITOFMEASURE());
}
// ll_jz_running.setVisibility(View.GONE);
// ll_jz_stop.setVisibility(View.GONE);
// ll_check_option.setVisibility(View.GONE);
//1号机组状态
String firstJiZhuStatusTemp = (String) SPUtils.get(context, Contans.SP.QJ_FIRST_JIZHU_STATUS_SELECT, "开机");
//2号机组状态
String secondJiZhuStatusTemp = (String) SPUtils.get(context, Contans.SP.QJ_SECOND_JIZHU_STATUS_SELECT, "开机");
//根据区域编号计算出当前点属于1号机 还是 2号机DX0 开头属于公共/化学 DX1开头属于1号机 DX2属于2号机
String qybh = info.getQybh();
if(!TextUtils.isEmpty(qybh)){
//区域编号不为空
if(qybh.startsWith("DX0")){
ll_jz.setVisibility(View.VISIBLE);
ll_jz_running.setVisibility(View.VISIBLE);
ll_jz_stop.setVisibility(View.VISIBLE);
tv_jz.setText("公共");
ll_jz_stop.setVisibility(View.GONE);
tv_jzzt.setVisibility(View.GONE);
}
if(qybh.startsWith("DX1")){
tv_jz.setText("1号机组");
tv_jzzt.setText(firstJiZhuStatusTemp);
ll_jz.setVisibility(View.VISIBLE);
if("开机".equals(firstJiZhuStatusTemp)){
ll_jz_running.setVisibility(View.VISIBLE);
ll_jz_stop.setVisibility(View.GONE);
}
if("停机".equals(firstJiZhuStatusTemp)){
ll_jz_running.setVisibility(View.GONE);
ll_jz_stop.setVisibility(View.VISIBLE);
}
}
if(qybh.startsWith("DX2")){
tv_jz.setText("2号机组");
tv_jzzt.setText(secondJiZhuStatusTemp);
ll_jz.setVisibility(View.VISIBLE);
if("开机".equals(secondJiZhuStatusTemp)){
ll_jz_running.setVisibility(View.VISIBLE);
ll_jz_stop.setVisibility(View.GONE);
}
if("停机".equals(secondJiZhuStatusTemp)){
ll_jz_running.setVisibility(View.GONE);
ll_jz_stop.setVisibility(View.VISIBLE);
}
}
}
}else{
tv_dw.setVisibility(View.INVISIBLE);
ll_action.setVisibility(View.GONE);
ll_warnning.setVisibility(View.GONE);
// ll_action.setVisibility(View.GONE);
// ll_warnning.setVisibility(View.GONE);
ll_jz_running.setVisibility(View.GONE);
ll_jz_stop.setVisibility(View.GONE);
ll_check_option.setVisibility(View.GONE);
ll_jz.setVisibility(View.GONE);
}
}

@ -18,8 +18,10 @@ import com.rehome.dywoa.bean.GridItem;
import com.rehome.dywoa.bean.WaitForBean;
import com.rehome.dywoa.ui.activity.BiShowActivity;
import com.rehome.dywoa.ui.activity.FanWeiActivity;
import com.rehome.dywoa.ui.activity.HightRiskActivity;
import com.rehome.dywoa.ui.activity.JiZhuActivity;
import com.rehome.dywoa.ui.activity.KksSearchActivity;
import com.rehome.dywoa.ui.activity.RunLogBaseActivity;
import com.rehome.dywoa.ui.activity.RunLogListActivity;
import com.rehome.dywoa.ui.activity.SisBaseActivity;
import com.rehome.dywoa.ui.activity.UseCarActivity;
@ -315,9 +317,19 @@ public class HomeFragment extends BaseFragment {
// break;
// case 9:
// TAG = GridViewDialog.TAG_PDANGJIAN;
// break;
case 9:
//String urlLog = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/998396522831962120/page/1069629959971758112-8233268850081530012";
//urlLog ="https://mis.dywzhny.com.cn/ebdapp/view/998396522831962120/PAGE/1069629959971758112-8233267182957928946?cusMenuId=8233267182957928946&urlPageTitle=5b2T5YmN6auY6aOO6Zmp5L2c5Lia57uf6K6h&appId_1069629959971758112=998396522831962120";
Intent intentHightRisk = new Intent(mActivity, HightRiskActivity.class);
intentHightRisk.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
String typeHightRisk = "高风险";
String urlWHightRisk = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/998396522831962120/page/1069629959971758112-8233268850081530012";
intentHightRisk.putExtra("type",typeHightRisk);
intentHightRisk.putExtra("urlLog",urlWHightRisk);
startActivity(intentHightRisk);
break;
// case 10:
// TAG = GridViewDialog.TAG_GONGHUI;
// break;

@ -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.HightRiskActivity">
<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>

@ -9,8 +9,8 @@
<com.rehome.dywoa.weiget.NoscrollViewPager
android:id="@+id/vp"
android:layout_width="match_parent"
android:layout_height="700px"
android:maxHeight="800px"
android:layout_height="750px"
android:maxHeight="850px"
android:layout_margin="@dimen/px_10">
</com.rehome.dywoa.weiget.NoscrollViewPager>

@ -296,8 +296,7 @@
android:layout_margin="0dp"
android:layout_width="250px"
android:layout_gravity="center_vertical"
android:digits="0123456789.-"
android:inputType="numberDecimal" />
android:inputType="numberSigned|numberDecimal"/>
<TextView
android:id="@+id/tv_dw"

@ -64,6 +64,7 @@
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
@ -84,17 +85,17 @@
android:layout_width="@dimen/cjwidth"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:textSize="@dimen/sbtextSize"
android:text="专业名称:" />
android:text="专业名称:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_zymc"
style="@style/xjcjRightStyle"
android:textSize="@dimen/sbtextSize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:layout_weight="1" />
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
@ -114,14 +115,80 @@
<TextView
android:id="@+id/tv_dian_type"
style="@style/xjcjRightStyle"
android:textSize="@dimen/sbtextSize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_jz"
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/px_2"
android:minHeight="@dimen/px_50"
android:orientation="horizontal">
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/cjwidth"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:text="所属机组:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_jz"
style="@style/xjcjRightStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/cjwidth"
android:layout_height="match_parent"
android:gravity="center_vertical|right"
android:text="机组状态:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_jzzt"
style="@style/xjcjRightStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:layout_weight="1" />
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_jz_running"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_action"
style="@style/dagerListMarginTopStyle"
@ -143,17 +210,17 @@
android:layout_width="@dimen/cjwidth"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:textSize="@dimen/sbtextSize"
android:text="超限上限:" />
android:text="超限上限:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_upper_action"
style="@style/xjcjRightStyle"
android:textSize="@dimen/sbtextSize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:layout_weight="1" />
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
@ -173,14 +240,15 @@
<TextView
android:id="@+id/tv_lower_action"
style="@style/xjcjRightStyle"
android:textSize="@dimen/sbtextSize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:layout_weight="1" />
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_warnning"
style="@style/dagerListMarginTopStyle"
@ -202,17 +270,17 @@
android:layout_width="@dimen/cjwidth"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:textSize="@dimen/sbtextSize"
android:text="报警上限:" />
android:text="报警上限:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_upper_warning"
style="@style/xjcjRightStyle"
android:textSize="@dimen/sbtextSize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:layout_weight="1" />
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
@ -232,14 +300,142 @@
<TextView
android:id="@+id/tv_lower_warning"
style="@style/xjcjRightStyle"
android:textSize="@dimen/sbtextSize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_jz_stop"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_action_stop"
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/px_2"
android:minHeight="@dimen/px_50"
android:orientation="horizontal">
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:text="停机超限上限:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_upper_action_stop"
style="@style/xjcjRightStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical|right"
android:text="停机超限下限:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_lower_action_stop"
style="@style/xjcjRightStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_warnning_stop"
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/px_2"
android:minHeight="@dimen/px_50"
android:orientation="horizontal">
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:text="停机报警上限:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_upper_warning_stop"
style="@style/xjcjRightStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical|right"
android:text="停机报警下限:"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_lower_warning_stop"
style="@style/xjcjRightStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:layout_weight="1" />
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_check_option"
style="@style/dagerListMarginTopStyle"
@ -266,14 +462,15 @@
<TextView
android:id="@+id/tv_point_type"
style="@style/xjcjRightStyle"
android:textSize="@dimen/sbtextSize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:layout_weight="1" />
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
@ -294,17 +491,17 @@
android:layout_width="@dimen/cjwidth"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:textSize="@dimen/sbtextSize"
android:text="kks编码" />
android:text="kks编码"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_kks"
style="@style/xjcjRightStyle"
android:textSize="@dimen/sbtextSize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:layout_weight="1" />
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
</LinearLayout>
@ -391,9 +588,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/px_5"
android:visibility="gone"
android:maxHeight="120px"
android:minHeight="@dimen/px_60">
android:minHeight="@dimen/px_60"
android:visibility="gone">
<TextView
android:layout_width="@dimen/cjwidth"
@ -435,6 +632,7 @@
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -473,9 +671,9 @@
android:id="@+id/textView2"
android:layout_width="@dimen/cjwidth"
android:layout_height="@dimen/sbHeight"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:gravity="center_vertical|right"
android:text="采集结果:"
android:textSize="@dimen/sbtextSize" />
@ -485,20 +683,21 @@
style="@style/editTextTheme"
android:layout_width="350px"
android:layout_alignParentTop="true"
android:layout_marginLeft="22dp"
android:layout_marginStart="22dp"
android:layout_marginLeft="22dp"
android:layout_toEndOf="@+id/textView2"
android:layout_toRightOf="@+id/textView2"
android:inputType="numberSigned|numberDecimal"
android:textSize="16sp"
android:visibility="visible" />
<TextView
android:id="@+id/tv_dw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/et_jg"
android:layout_centerVertical="true"
android:layout_marginStart="5dp"
android:layout_toEndOf="@+id/et_jg"
android:text=""
android:textSize="24sp" />

@ -6,7 +6,7 @@
<dimen name="sbHeight30">30px</dimen>
<dimen name="zWidth">180px</dimen>
<dimen name="textWidth">140px</dimen>
<dimen name="cjwidth">180px</dimen>
<dimen name="cjwidth">220px</dimen>
<dimen name="px_2">2px</dimen>
<dimen name="px_5">5px</dimen>
<dimen name="px_10">10px</dimen>

Loading…
Cancel
Save