提交类型 处理冲突

1.  设备查询界面，合并两边代码
2.通用搜索框自定义类，取网络
3.版本信息，去网络

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Dec 23 16:52:47 CST 2017
-debugName=235
-versionName=615
-debugCode=235
-versionCode=154
+#Fri Dec 22 17:16:40 CST 2017
+debugName=242
+versionName=612
+debugCode=242
+versionCode=151

app_core/common/src/main/java/com/core/dao/historical/HistoricalRecordDao.java

@@ -4,6 +4,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import com.core.db.CommonCursorWrapper;
 import com.core.db.DatabaseManager;
 import com.core.db.DatabaseTables;
 
@@ -24,8 +25,9 @@ public class HistoricalRecordDao {
     public static HistoricalRecordDao getInstance() {
         if (instance == null) {
             synchronized (HistoricalRecordDao.class) {
-                if (instance == null)
+                if (instance == null) {
                     instance = new HistoricalRecordDao();
+                }
             }
         }
         return instance;
@@ -54,7 +56,7 @@ public class HistoricalRecordDao {
      * @return
      */
     public List<HistoricalRecordBean> getHistoricalRecordBeansById(String schemeId) {
-        HistoricalRecordCursorWrapper cursor = queryHistoricalRecord(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        CommonCursorWrapper cursor = queryHistoricalRecord(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{schemeId});
 
         List<HistoricalRecordBean> historicalRecordBeans = new ArrayList<>();
@@ -123,7 +125,7 @@ public class HistoricalRecordDao {
      * @param whereArgs
      * @return
      */
-    public HistoricalRecordCursorWrapper queryHistoricalRecord(String whereCause, String[] whereArgs) {
+    public CommonCursorWrapper queryHistoricalRecord(String whereCause, String[] whereArgs) {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
         Cursor cursor = sqLiteDatabase.query(DatabaseTables.HistoricalRecordTable.NAME, null,
@@ -133,6 +135,6 @@ public class HistoricalRecordDao {
 
 //        DatabaseManager.getInstance().closeDatabase();
 
-        return new HistoricalRecordCursorWrapper(cursor);
+        return new CommonCursorWrapper(cursor);
     }
 }

app_core/common/src/main/java/com/core/dao/historical/HistoricalRecordCursorWrapper.java → app_core/common/src/main/java/com/core/db/CommonCursorWrapper.java

@@ -1,22 +1,24 @@
-package com.core.dao.historical;
+package com.core.db;
 
 import android.database.Cursor;
 import android.database.CursorWrapper;
 
-import com.core.db.DatabaseTables;
+import com.core.dao.historical.HistoricalRecordBean;
 
 /**
- * Created by RaoMeng on 2017/8/18.
- * 历史记录的CursorWrapper封装类
+ * @author RaoMeng
+ * @describe CursorWrapper封装类
+ * @date 2017/12/12 10:17
  */
-public class HistoricalRecordCursorWrapper extends CursorWrapper {
+
+public class CommonCursorWrapper extends CursorWrapper {
 
     /**
      * Creates a cursor wrapper.
      *
      * @param cursor The underlying cursor to wrap.
      */
-    public HistoricalRecordCursorWrapper(Cursor cursor) {
+    public CommonCursorWrapper(Cursor cursor) {
         super(cursor);
     }
 

app_core/common/src/main/java/com/core/db/DatabaseTables.java

@@ -4,32 +4,32 @@ package com.core.db;
  * Created by RaoMeng on 2017/8/14.
  * 数据库表
  */
-public class DatabaseTables {
-    public static final class HistoricalRecordTable {
-        public static final String NAME = "historical_record";
+public interface DatabaseTables {
+    interface HistoricalRecordTable {
+        String NAME = "historical_record";
 
-        public static final class Cols {
-            public static final String SCHEME_ID = "scheme_id";
-            public static final String SCHEME_NAME = "scheme_name";
-            public static final String SEARCH_FIELD = "search_field";
+        interface Cols {
+            String SCHEME_ID = "scheme_id";
+            String SCHEME_NAME = "scheme_name";
+            String SEARCH_FIELD = "search_field";
         }
     }
 
-    public static final class UUHelperTable {
-        public static final String NAME = "uu_helper";
+    interface UUHelperTable {
+        String NAME = "uu_helper";
 
-        public static final class Cols {
-            public static final String ID = "id";
-            public static final String USER_ID = "userId";
-            public static final String TIME_SEND = "timeSend";
-            public static final String DATE = "date";
-            public static final String IMAGE_URL = "imageUrl";
-            public static final String ICON_URL = "iconUrl";
-            public static final String LINK_URL = "linkUrl";
-            public static final String CONTENT = "content";
-            public static final String READED = "readed";
-            public static final String TITLE = "title";
-            public static final String TYPE = "type";
+        interface Cols {
+            String ID = "id";
+            String USER_ID = "userId";
+            String TIME_SEND = "timeSend";
+            String DATE = "date";
+            String IMAGE_URL = "imageUrl";
+            String ICON_URL = "iconUrl";
+            String LINK_URL = "linkUrl";
+            String CONTENT = "content";
+            String READED = "readed";
+            String TITLE = "title";
+            String TYPE = "type";
         }
     }
 }

app_core/common/src/main/java/com/core/widget/SearchActionView.java

@@ -0,0 +1,141 @@
+package com.core.widget;
+
+import android.app.Activity;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.core.app.R;
+import com.core.utils.CommonUtil;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/12/22 10:17
+ */
+
+public class SearchActionView extends FrameLayout {
+    private ImageView mBackImageView, mMenuImageView, mVoiceImageView;
+    private OnVoiceCompleteListener mOnVoiceCompleteListener;
+    private OnEnterActionListener mOnEnterActionListener;
+    private OnMenuClickListener mOnMenuClickListener;
+    private ClearEditText mSearchEditText;
+
+    public void setOnVoiceCompleteListener(OnVoiceCompleteListener onVoiceCompleteListener) {
+        mOnVoiceCompleteListener = onVoiceCompleteListener;
+    }
+
+    public void setOnEnterActionListener(OnEnterActionListener onEnterActionListener) {
+        mOnEnterActionListener = onEnterActionListener;
+    }
+
+    public void setOnMenuClickListener(OnMenuClickListener onMenuClickListener) {
+        mOnMenuClickListener = onMenuClickListener;
+    }
+
+    public void setMenuImage(int menuImage) {
+        try {
+            mMenuImageView.setImageResource(menuImage);
+            mMenuImageView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (mOnMenuClickListener != null) {
+                        mOnMenuClickListener.onMenuClick(view);
+                    }
+                }
+            });
+        } catch (Exception e) {
+
+        }
+
+    }
+
+    public SearchActionView(@NonNull Context context) {
+        super(context);
+        init(context, null, 0);
+    }
+
+    public SearchActionView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs, 0);
+    }
+
+    public SearchActionView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr);
+    }
+
+    private void init(final Context context, AttributeSet attrs, int defStyleAttr) {
+        LayoutInflater.from(context).inflate(R.layout.layout_search_action, this);
+
+        mBackImageView = (ImageView) findViewById(R.id.search_action_back_iv);
+        mMenuImageView = (ImageView) findViewById(R.id.search_action_menu_iv);
+        mVoiceImageView = (ImageView) findViewById(R.id.search_action_voice_iv);
+        mSearchEditText = (ClearEditText) findViewById(R.id.search_action_search_et);
+
+        mBackImageView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ((Activity) getContext()).finish();
+                ((Activity) getContext()).overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
+            }
+        });
+
+        mVoiceImageView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CommonUtil.getVoiceText(context, mSearchEditText, new com.core.interfac.OnVoiceCompleteListener() {
+                    @Override
+                    public void onVoiceComplete() {
+                        if (mOnVoiceCompleteListener != null) {
+                            mOnVoiceCompleteListener.onVoiceComplete();
+                        }
+                    }
+                });
+            }
+        });
+
+        mSearchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+                if (actionId == EditorInfo.IME_ACTION_SEARCH
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (keyEvent != null && keyEvent.getAction() == KeyEvent.ACTION_DOWN && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    if (mOnEnterActionListener != null) {
+                        mOnEnterActionListener.onEnterAction();
+                        return true;
+                    }
+                }
+                return false;
+            }
+        });
+    }
+
+    public void setSearchHint(String hint) {
+        mSearchEditText.setHint(hint);
+    }
+
+    public void setSearchHint(int hint) {
+        mSearchEditText.setHint(hint);
+    }
+
+    public interface OnVoiceCompleteListener {
+        void onVoiceComplete();
+    }
+
+    public interface OnEnterActionListener {
+        void onEnterAction();
+    }
+
+    public interface OnMenuClickListener {
+        void onMenuClick(View view);
+    }
+}

app_core/common/src/main/java/com/core/widget/VoiceSearchView.java

@@ -8,6 +8,7 @@ import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 public class VoiceSearchView extends RelativeLayout {
     private ClearEditText search_edit;
     private OnVoiceCompleteListener mOnVoiceCompleteListener;
+    private OnEnterActionListener mOnEnterActionListener;
 
     public VoiceSearchView(Context context) {
         this(context, null);
@@ -49,9 +51,18 @@ public class VoiceSearchView extends RelativeLayout {
                 btnVoice();
             }
         });
+
         search_edit.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+            public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+                if (actionId == EditorInfo.IME_ACTION_SEARCH
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (keyEvent != null && keyEvent.getAction() == KeyEvent.ACTION_DOWN && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    if (mOnEnterActionListener != null) {
+                        mOnEnterActionListener.onEnterAction();
+                        return true;
+                    }
+                }
                 return false;
             }
         });
@@ -61,6 +72,10 @@ public class VoiceSearchView extends RelativeLayout {
         search_edit.setHint(hine);
     }
 
+    public void setHineText(int hint) {
+        search_edit.setHint(hint);
+    }
+
     public void setText(String hine) {
         search_edit.setText(hine);
     }
@@ -97,12 +112,12 @@ public class VoiceSearchView extends RelativeLayout {
         mOnVoiceCompleteListener = onVoiceCompleteListener;
     }
 
-    public void addTextChangedListener(TextWatcher watcher) {
-        search_edit.addTextChangedListener(watcher);
+    public void setOnEnterActionListener(OnEnterActionListener onEnterActionListener) {
+        mOnEnterActionListener = onEnterActionListener;
     }
 
-    public void setOnEditorActionListener(TextView.OnEditorActionListener watcher) {
-        search_edit.setOnEditorActionListener(watcher);
+    public void addTextChangedListener(TextWatcher watcher) {
+        search_edit.addTextChangedListener(watcher);
     }
 
     public ClearEditText getSearch_edit() {
@@ -133,4 +148,8 @@ public class VoiceSearchView extends RelativeLayout {
             return nulltext;
         }
     }
+
+    public interface OnEnterActionListener {
+        void onEnterAction();
+    }
 }

app_core/common/src/main/res/layout/layout_search_action.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:id="@+id/top"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/antionbarcolor">
+
+    <ImageView
+        android:id="@+id/search_action_back_iv"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_centerVertical="true"
+        android:src="@drawable/ic_action_back" />
+
+    <ImageView
+        android:id="@+id/search_action_menu_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:maxWidth="40dp" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
+        android:visibility="visible">
+
+        <com.core.widget.ClearEditText
+            android:id="@+id/search_action_search_et"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_centerVertical="true"
+            android:background="@drawable/search_input"
+            android:drawableLeft="@drawable/search"
+            android:drawableRight="@drawable/search_clear"
+            android:hint="@string/search"
+            android:imeOptions="actionSearch"
+            android:inputType="text"
+            android:paddingRight="26dp"
+            android:textColor="@color/dark_grey"
+            android:textColorHint="@color/grey"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:id="@+id/search_action_voice_iv"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignRight="@+id/search_edit"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="6dp"
+            android:background="@drawable/btn_yuyin_nor"
+            android:visibility="visible" />
+    </RelativeLayout>
+
+</RelativeLayout>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -219,14 +219,17 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     public void onClick(View v) {
         if (v.getId() == R.id.add_new_rl){
             LogUtil.prinlnLongMsg("mPhotoList",JSON.toJSONString(mPhotoList));
-            if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
-                ToastMessage("请输入名称");
-                return;
-            }
-            if (mPhotoList.size() < mList.size()){
-                ToastMessage("请添加照片");
-                return;
+            if(!ListUtils.isEmpty(mList)){
+                if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
+                    ToastMessage("请输入名称");
+                    return;
+                }
+                if (mPhotoList.size() < mList.size()){
+                    ToastMessage("请添加照片");
+                    return;
+                }
             }
+
             BSetLocationBean model = new BSetLocationBean();
             model.setSt_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
             model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FindWagePWActivity.java

@@ -133,7 +133,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
                 mEyeTv.setImageResource(R.drawable.icon_show);
             }
         }else if (id == R.id.clearphone_tv){
-
+            mPhoneEt.setText("");
         }
     }
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -89,6 +89,11 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private Boolean haveData = true;
     private TextView announcement_tv;
     private int needSignature;
+    private JSONObject dataObject;
+    private int sl_result = -1;
+    private String sl_remark;
+    private LinearLayout error_ll;
+    private TextView error_tv;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -106,12 +111,27 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             if (salaryObject != null){
                 JSONArray configsArray = salaryObject.getJSONArray("configs");
                 JSONObject dataObject = salaryObject.getJSONObject("data");
+                if (dataObject.size() == 0) {
+                    showEnty();
+                    return;
+                }
                 String gonggao = dataObject.getString("sl_text");
-                if (!StringUtil.isEmpty(gonggao))  announcement_tv.setText(gonggao);
+                if (!StringUtil.isEmpty(gonggao))
+                    announcement_tv.setText("通知公告："+gonggao);
+                else if (gonggao == null)
+                    announcement_tv.setText("暂无通知公告");
 
                 needSignature = dataObject.getInteger("sl_signature");
                 if (needSignature == 0) mBtnSignature.setText("确认签收");
-                int sl_result = dataObject.getInteger("sl_result");
+                sl_result = dataObject.getInteger("sl_result");
+                sl_remark = dataObject.getString("sl_remark");
+                if (!StringUtil.isEmpty(sl_remark) && sl_result == -1){
+                    error_ll.setVisibility(View.VISIBLE);
+                    error_tv.setText(sl_remark);
+                }else {
+                    error_ll.setVisibility(View.GONE);
+                }
+
                 if (sl_result == 1 || sl_result == -1)
                     mBtnSignature.setVisibility(View.GONE);
                 else if (sl_result == 0 && haveData)
@@ -119,7 +139,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
 
                 sl_id = dataObject.getString("sl_id");
-                if (!ListUtils.isEmpty(configsArray) && dataObject != null){
+                if (!ListUtils.isEmpty(configsArray) && dataObject.size() > 0){
                     for (int i = 0; i < configsArray.size(); i++) {
                         String key = configsArray.getJSONObject(i).getString("Caption");
                         String field = configsArray.getJSONObject(i).getString("Field");
@@ -137,6 +157,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                             LogUtil.prinlnLongMsg("fanglh",JSON.toJSONString(kvModeList));
                             if (ListUtils.isEmpty(kvModeList))
                                 showEnty();
+                            else {
+                                noWageLl.setVisibility(View.GONE);
+                            }
                         }
                     }
                 }else{
@@ -154,6 +177,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private void showEnty() {
         haveData = false;
         noWageLl.setVisibility(View.VISIBLE);
+        mBtnSignature.setVisibility(View.GONE);
+        Log.i("getEmSalary","showEnty");
     }
 
     private void initView() {
@@ -175,7 +200,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         wageDateTv.setOnClickListener(this);
         noWageLl = (LinearLayout) findViewById(R.id.wage_nodata_ll);
         announcement_tv = (TextView) findViewById(R.id.announcement);
-
+        error_ll = (LinearLayout) findViewById(R.id.error_ll);
+        error_tv = (TextView) findViewById(R.id.error_tv);
 
 //        findViewById(R.id.h_sign_tv).setOnClickListener(this);
         Intent hh =  getIntent();
@@ -271,7 +297,10 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void searchWage() {
-        if (!ListUtils.isEmpty(kvModeList)) kvModeList.clear();
+        if (!ListUtils.isEmpty(kvModeList)) {
+            kvModeList.clear();
+            myAdapter.notifyDataSetChanged();
+        }
         //        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
@@ -308,7 +337,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 .add("sl_id",sl_id)
                 .add("emcode",emcode)
                 .add("msg",msg_et.getText().toString())
-                .add("result",true)
+                .add("result","0")
                 .add("master", master)
                 .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
@@ -350,6 +379,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
                     mBtnSignature.setText("已收签");
+                    mBtnSignature.setEnabled(false);
                     closePopupWindow();
                 }
                 progressDialog.dismiss();
@@ -443,6 +473,16 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         DisplayUtil.backgroundAlpha(this, 1f);
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        menu.clear();
+        if (!haveData || !StringUtil.isEmpty(sl_remark) || sl_result != -1 ) {
+
+        } else {
+            getMenuInflater().inflate(R.menu.wage_error, menu);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.wage_error, menu);
@@ -488,7 +528,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             }
         });
         popupWindow.showAtLocation(getWindow().getDecorView().
-                findViewById(android.R.id.content), Gravity.BOTTOM, 0, 0);
+                findViewById(android.R.id.content), Gravity.CENTER, 0, 0);
         DisplayUtil.backgroundAlpha(this, 0.4f);
     }
 

app_modular/appme/src/main/res/layout/item_comkey_value.xml

@@ -21,6 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="2"
         android:text="2016-11-25-21:22"
-        android:textColor="@color/done_approval"/>
+        android:textColor="#2F95DD"
+        />
 
 </LinearLayout>

app_modular/appme/src/main/res/layout/wage_forgetps.xml

@@ -48,13 +48,12 @@
                         />
                     <TextView
                         android:id="@+id/clearphone_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="X"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
                         android:layout_alignParentRight="true"
-                        android:padding="20dp"
                         android:textSize="20sp"
-                        />
+                        android:drawableRight="@drawable/phone_del"
+                        android:layout_margin="10dp"/>
                 </RelativeLayout>
                 <View
                     android:layout_width="match_parent"
@@ -162,7 +161,10 @@
                         android:textSize="16sp"
                         android:maxLength="15"
                         android:inputType="textPassword"
-                        android:textColor="@color/black"/>
+                        android:textColor="@color/black"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true" />
                     <ImageView
                         android:id="@+id/eye_tv"
                         android:layout_width="20dp"
@@ -170,6 +172,7 @@
                         android:layout_alignParentRight="true"
                         android:textSize="20sp"
                         android:src="@drawable/icon_unshow"
+                        android:layout_margin="10dp"
                         />
                 </RelativeLayout>
 

app_modular/appme/src/main/res/layout/wages_details_activity.xml

@@ -81,7 +81,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="300dp"
                 android:gravity="center"
-                android:visibility="gone"
                 >
                 <ImageView
                     android:layout_width="100dp"
@@ -89,6 +88,26 @@
                     android:src="@drawable/wage_nodata"
                     />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/error_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="10dp"
+                android:visibility="gone">
+                <TextView
+                    android:textColor="@color/red"
+                    android:text="报错信息"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+                <TextView
+                    android:id="@+id/error_tv"
+                    android:text="报错等我QQ信息"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="10dp"/>
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java

@@ -138,6 +138,9 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
             mClass = intent.getStringExtra(Constants.FLAG.DEVICE_CLASS);
         }
 
+        if (TextUtils.isEmpty(mCaller)) {
+            mCaller = "Device";
+        }
         //TODO gongpengming
         if (!TextUtils.isEmpty(mClass)) {
             String dc_class="dc_class";

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquiryListActivity.java

@@ -113,14 +113,17 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     }
                     String result = msg.getData().getString("result");
                     analysisCondition(result);
-                    getSchemeData();
                     break;
                 case GET_DATA_RESULT:
                     if (mDataListView.isRefreshing()) {
                         mDataListView.onRefreshComplete();
                     }
                     progressDialog.dismiss();
-                    analysisData(msg);
+                    if (mAllSchemeConditions == null || mAllSchemeConditions.size() == 0) {
+                        mEmptyLayout.showEmpty();
+                    } else {
+                        analysisData(msg);
+                    }
                     break;
                 case 0x88:
                     mTotalLl.setVisibility(View.GONE);
@@ -479,7 +482,6 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
                 mDataInquiryTotalAdapter.notifyDataSetChanged();
 
-//                mDataListView.setVisibility(View.VISIBLE);
                 if (listArray != null && listArray.length() > 0) {
                     if (!TextUtils.isEmpty(mSearchField)) {
                         HistoricalRecordBean historicalRecordBean = new HistoricalRecordBean();
@@ -629,7 +631,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             try {
                 JSONObject resultObject = new JSONObject(result);
                 JSONArray dataArray = resultObject.optJSONArray("data");
-                if (dataArray != null) {
+                if (dataArray != null && dataArray.length() > 0) {
+                    getSchemeData();
                     String fuzzyHint = "";
                     for (int i = 0; i < dataArray.length(); i++) {
                         JSONObject dataObject = dataArray.optJSONObject(i);
@@ -748,6 +751,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     } else {
                         mSearchEditText.setHint("搜索");
                     }
+                } else {
+                    progressDialog.dismiss();
+                    mEmptyLayout.showEmpty();
                 }
             } catch (JSONException e) {
                 e.printStackTrace();