Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jan 08 09:43:53 CST 2018
-debugName=395
+#Mon Jan 08 09:42:50 CST 2018
+debugName=389
 versionName=624
-debugCode=395
+debugCode=389
 versionCode=163

app_core/common/src/main/assets/work_menu.json

@@ -266,6 +266,15 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_company_salary",
+        "menuIcon": "company_salary",
+        "menuActivity": "com.modular.appme.CheckWagesActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

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

@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="400dp"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
     android:orientation="vertical"
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
     android:paddingTop="10dp"
-    android:background="@drawable/pop_round_bg">
+    android:background="@drawable/pop_round_bg"
+    >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="请输入你的问题"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main"
+        android:layout_gravity="left"
+        android:layout_marginLeft="10dp"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -15,28 +25,21 @@
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
+            <EditText
+                android:id="@+id/msg_et"
+                style="@style/form_relative_right_text"
+                android:layout_width="match_parent"
+                android:layout_height="110dp"
+                android:maxLength="99"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main"
+                android:gravity="left"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                />
 
         <EditText
-            android:id="@+id/msg_et"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:background="@null"
-            android:maxLines="5"
-            android:maxLength="100"
-            android:hint="请输入你的问题"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main"
-            android:gravity="left"
-            android:padding="10dp"
-            />
-        <EditText
+            android:visibility="gone"
             android:id="@+id/editname_et2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -55,6 +58,23 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
+        <Button
+            android:id="@+id/cancel_error_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_button_invalid"
+            android:padding="10dp"
+            android:text="取消"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
+            android:layout_weight="1"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginTop="10dp"
+            />
+
         <Button
             android:id="@+id/sure_tv"
             android:layout_width="match_parent"
@@ -67,8 +87,10 @@
             android:layout_weight="1"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="10dp"
-            android:layout_marginLeft="20dp"
+            android:layout_marginLeft="5dp"
             android:layout_marginRight="20dp"
             android:layout_marginTop="10dp"
-            /></LinearLayout>
+            />
+
+    </LinearLayout>
 </LinearLayout>

app_core/common/src/main/res/values-en/strings.xml

@@ -1475,7 +1475,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">Payroll inquiry</string>
+    <string name="str_company_salary">Payroll</string>
     <!--工作台菜单-->
 
 </resources>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1589,7 +1589,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">企业工资条</string>
+    <string name="str_company_salary">工资条</string>
     <!--工作台菜单-->
 
 </resources>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -1576,7 +1576,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">企業工資條</string>
+    <string name="str_company_salary">工資條</string>
     <!--工作台菜单-->
 
 </resources>

app_core/common/src/main/res/values/strings.xml

@@ -1927,7 +1927,7 @@
     <string name="str_work_charitable_donations">一元捐</string>
     <string name="str_search_history">搜索历史</string>
     <string name="str_clear">清空</string>
-    <string name="str_company_salary">企业工资条</string>
+    <string name="str_company_salary">工资条</string>
     <!--工作台菜单-->
 
 </resources>

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

@@ -1,7 +1,9 @@
 package com.uas.appme.settings.activity;
 
 import android.os.Bundle;
+import android.text.Editable;
 import android.text.InputType;
+import android.text.TextWatcher;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -50,6 +52,29 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
         super.onCreate(savedInstanceState);
         setContentView(R.layout.wage_forgetps);
         initView();
+        initEvents();
+    }
+
+    private void initEvents() {
+        mSetpwEt.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                String str = editable.toString();
+                if (!StringUtil.isEmpty(str))
+                    mEyeTv.setVisibility(View.VISIBLE);
+                else
+                    mEyeTv.setVisibility(View.GONE);
+
+            }
+        });
     }
 
     private void initView() {

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

@@ -6,6 +6,7 @@ import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -23,6 +24,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baidu.cyberplayer.utils.G;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
@@ -86,12 +88,15 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private LinearLayout noWageLl;
     private Boolean haveData = true;
     private TextView announcement_tv;
-    private int needSignature;
+    private int needSignature = 0;
     private JSONObject dataObject;
     private int sl_result = -1;
     private String sl_remark;
     private LinearLayout error_ll;
     private TextView error_tv;
+    private boolean errorgone = false;
+    private LinearLayout wages_ll;
+    private LinearLayout announcement_ll;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -105,6 +110,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
     private void showDatas(String result) {
         haveData = true;
+        wages_ll.setVisibility(View.VISIBLE);
         try {
             JSONObject salaryObject = JSON.parseObject(result).getJSONObject("salary");
             if (salaryObject != null){
@@ -115,26 +121,12 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     return;
                 }
                 String gonggao = dataObject.getString("sl_text");
-                if (!StringUtil.isEmpty(gonggao))
+                if (!StringUtil.isEmpty(gonggao)){
+                    announcement_ll.setVisibility(View.VISIBLE);
                     announcement_tv.setText("通知公告："+gonggao);
-                else if (gonggao == null)
-                    announcement_tv.setText("暂无通知公告");
-
-                needSignature = dataObject.getInteger("sl_signature");
-                if (needSignature == 0) mBtnSignature.setText("确认签收");
-                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);
-                }
+                } else if (gonggao == null)
+                    announcement_ll.setVisibility(View.GONE);
 
-                if (sl_result == 1 || sl_result == -1)
-                    mBtnSignature.setVisibility(View.GONE);
-                else if (sl_result == 0 && haveData)
-                    mBtnSignature.setVisibility(View.VISIBLE);
 
                 sl_id = dataObject.getString("sl_id");
                 if (!ListUtils.isEmpty(configsArray) && dataObject.size() > 0){
@@ -156,7 +148,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                             if (ListUtils.isEmpty(kvModeList))
                                 showEnty();
                             else {
+                                wages_ll.setVisibility(View.VISIBLE);
                                 noWageLl.setVisibility(View.GONE);
+                                showView(dataObject);
                             }
                         }
                     }
@@ -167,27 +161,63 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             }else{
                 showEnty();
             }
-            invalidateOptionsMenu();
        } catch (Exception e) {
             e.printStackTrace();
         }
 }
 
+    private void showView(JSONObject dataObject) {
+
+        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 == 0 && !ListUtils.isEmpty(kvModeList)
+               && StringUtil.isEmpty(sl_remark))
+            mBtnSignature.setVisibility(View.VISIBLE);
+        else
+            mBtnSignature.setVisibility(View.GONE);
+
+        if (sl_result == 1 & !ListUtils.isEmpty(kvModeList))
+            received_im.setVisibility(View.VISIBLE);
+        else
+            received_im.setVisibility(View.GONE);
+        invalidateOptionsMenu();
+        needSignature = dataObject.getInteger("sl_signature");
+        if (needSignature != 1)
+            mBtnSignature.setText("确认签收");
+        else
+            mBtnSignature.setText("签字");
+    }
+
     private void showEnty() {
         haveData = false;
+        wages_ll.setVisibility(View.GONE);
+        received_im.setVisibility(View.GONE);
         noWageLl.setVisibility(View.VISIBLE);
         mBtnSignature.setVisibility(View.GONE);
+        announcement_ll.setVisibility(View.GONE);
+        error_ll.setVisibility(View.GONE);
         Log.i("getEmSalary","showEnty");
+        invalidateOptionsMenu();
     }
 
     private void initView() {
                 emcode = CommonUtil.getEmcode();
 //        emcode = "U0747";
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
-//        master = "uas_dev";
+
         getSupportActionBar().setTitle("工资查询");
 
         mWagesLv = (MyListView) findViewById(R.id.wages_lv);
+        wages_ll = (LinearLayout) findViewById(R.id.wages_ll);
         mBtnSignature = (Button) findViewById(R.id.btn_signature); mBtnSignature.setOnClickListener(this);
         kvModeList = new ArrayList<>();
         myAdapter = new WagesDetailsAdapter(this);
@@ -200,6 +230,7 @@ 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);
+        announcement_ll = (LinearLayout) findViewById(R.id.announcement_ll);
         error_ll = (LinearLayout) findViewById(R.id.error_ll);
         error_tv = (TextView) findViewById(R.id.error_tv);
 
@@ -238,29 +269,25 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             if (needSignature == 1)
                 showSiganWindow();
             else
-//                doSubmit();
-                doNewSubmit(null,null);
-
+                doNoSignatureSubmit();
         }else if (v.getId() == R.id.clear_im){
             pathView.clear();
         }else if (v.getId() == R.id.cancel_tv){
             pathView.clear();
             closePopupWindow();
-        }
-//        else if (v.getId() == R.id.h_sign_tv){
-//            startActivityForResult(new Intent(this, LandscapeActivity.class)
-//                            .putExtra("signCode",001)
-//                    , 101);
-//        }
-        else if (v.getId() == R.id.submit_btn){
+        } else if (v.getId() == R.id.submit_btn){
             if (pathView.getTouched())
             {
+                if (!CommonUtil.isNetWorkConnected(ct)){
+                    ToastMessage(getString(R.string.common_notlinknet));
+                    return;
+                }
+
                 try {
                     pathView.save(plainpath,false,10);  //将图片路径保存到plainpath中，并获取Bimap对象
                     BitmapFactory.Options options = new BitmapFactory.Options();
                     options.inSampleSize = 2;
                     Bitmap pathBm = BitmapFactory.decodeFile(plainpath);
-//                    doSubmit(pathBm,plainpath);
                     doNewSubmit(pathBm, plainpath);
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -270,7 +297,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             }
         }else if (v.getId() == R.id.sure_tv){
             if (StringUtil.isEmpty(msg_et.getText().toString())){
-                ToastMessage("请输入你的问题");
+                ToastMessage("请输入你的报错问题");
                 return;
             }
             if (!CommonUtil.isNetWorkConnected(ct)){
@@ -295,6 +322,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 }
             });
             picker.show();
+        }else if (v.getId() == R.id.cancel_error_tv){
+            popupWindow.dismiss();
         }
     }
 
@@ -307,6 +336,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             kvModeList.clear();
             myAdapter.notifyDataSetChanged();
         }
+
+        errorgone = false;
         //        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()
@@ -352,7 +383,12 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("salaryWrong", o.toString()+"");
                 if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")){
-                    ToastMessage("你的问题已提交");
+                    ToastMessage("报错成功");
+                    mBtnSignature.setVisibility(View.GONE);
+                    error_ll.setVisibility(View.VISIBLE);
+                    error_tv.setText(msg_et.getText().toString());
+                    sl_result = -1;
+                    invalidateOptionsMenu();
                     popupWindow.dismiss();
                 }
 
@@ -367,10 +403,15 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         params.addBodyParameter("sl_id",sl_id);
         params.addBodyParameter("result","true");
         params.addQueryStringParameter("master", master);
-        params.addBodyParameter("msg","");
-        Log.i("urlparams",plainpath);
-        if (needSignature == 1)
+        Log.i("urlparams",plainpath+"");
+        if (needSignature == 1 && !StringUtil.isEmpty(plainpath)){
             params.addBodyParameter("img",new File(plainpath));
+        }else {
+//            params.addHeader("Content-Type","multipart/form-data");
+            params.addBodyParameter("img","");
+        }
+//        else
+//            params.addBodyParameter("img",new File());
         final HttpUtils http = new HttpUtils();
         Log.i("urlparams",url+params+"");
 
@@ -388,8 +429,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
                     Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
-                    mBtnSignature.setText("已收签");
-                    mBtnSignature.setEnabled(false);
+                    mBtnSignature.setVisibility(View.GONE);
+                    errorgone = true;
+                    invalidateOptionsMenu();
                     closePopupWindow();
                 }
                 progressDialog.dismiss();
@@ -411,28 +453,34 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     }
 
     //不需要签名情况下的签收
-    private void doSubmit() {
+    private void doNoSignatureSubmit() {
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            return;
+        }
 //        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()
-                .url("mobile/salary/salaryBack.action")
+                .url("mobile/salary/salaryBackNoSignature.action\n")
                 .add("emcode", emcode)
                 .add("sl_id",sl_id)
                 .add("result",true)
                 .add("master", master)
-                .add("msg","")
                 .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("salaryBack", o.toString()+"");
-                if (JSONUtil.validate(o.toString()) && JSON.parseObject(o.toString()).getBoolean("success")) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                if (JSONUtil.validate(o.toString()) && o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
                     Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
                     received_im.setVisibility(View.VISIBLE);
-                    mBtnSignature.setText("已收签");
-                    mBtnSignature.setEnabled(false);
+                    mBtnSignature.setVisibility(View.GONE);
+                    errorgone = true;
+                    invalidateOptionsMenu();
                     closePopupWindow();
+                }else {
+                    ViewUtil.ToastMessage(ct, getString(R.string.common_save_failed));
                 }
                 progressDialog.dismiss();
             }
@@ -454,7 +502,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         if (setWindow == null) initPopupWindow();
         setWindow.showAtLocation(getWindow().getDecorView().
                 findViewById(android.R.id.content), Gravity.BOTTOM, 0, 0);
-        DisplayUtil.backgroundAlpha(this, 0.4f);
+//        DisplayUtil.backgroundAlpha(this, 0.4f);
     }
 
     private void initPopupWindow() {
@@ -472,7 +520,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         setWindow = new PopupWindow(viewContext,
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT, true);
-        setWindow.setOutsideTouchable(false);
+        setWindow.setOutsideTouchable(true);
         setWindow.setAnimationStyle(com.uas.appworks.R.style.MenuAnimationFade);
         setWindow.setBackgroundDrawable(mContext.getResources().getDrawable(com.uas.appworks.R.drawable.bg_popuwin));
         setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
@@ -491,10 +539,11 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
-        if(haveData && StringUtil.isEmpty(sl_remark) && sl_result == 0)
+        if(haveData && StringUtil.isEmpty(sl_remark) && sl_result == 0 && !errorgone)
             getMenuInflater().inflate(R.menu.wage_error, menu);
         else
             menu.clear();
+
         return super.onPrepareOptionsMenu(menu);
     }
     @Override
@@ -521,17 +570,17 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         // 设置按钮的点击事件
         msg_et = (EditText) contentView.findViewById(R.id.msg_et);
         contentView.findViewById(R.id.sure_tv).setOnClickListener(this);
+        contentView.findViewById(R.id.cancel_error_tv).setOnClickListener(this);
 
-//        DisplayMetrics dm = getResources().getDisplayMetrics();
-//        int w_screen = dm.widthPixels;
-//        int h_screen = dm.heightPixels;
-//        w_screen = DisplayUtil.dip2px(this, 300);
-//        h_screen = DisplayUtil.dip2px(this, 250);
-//
-//        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        int w_screen = dm.widthPixels;
+        int h_screen = dm.heightPixels;
+        w_screen = DisplayUtil.dip2px(this, 300);
+        h_screen = DisplayUtil.dip2px(this, 250);
+
+        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
         popupWindow = new PopupWindow(contentView,
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+                w_screen, h_screen,true);
         popupWindow.setAnimationStyle(R.style.MenuAnimationFade);
         popupWindow.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.bg_popuwin));
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {

app_modular/appme/src/main/java/com/uas/appme/settings/adapter/WagesDetailsAdapter.java

@@ -48,7 +48,7 @@ public class WagesDetailsAdapter extends BaseAdapter {
         WagesHolder wHolder;
         if (convertView == null) {
             wHolder = new WagesHolder();
-            convertView = View.inflate(mContext, R.layout.item_comkey_value, null);
+            convertView = View.inflate(mContext, R.layout.item_comkey_value_salary, null);
             wHolder.key = (TextView) convertView.findViewById(R.id.item_comdoc_am_list_tv);
             wHolder.value = (TextView) convertView.findViewById(R.id.item_comdoc_am_value_tv);
             convertView.setTag(wHolder);

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

@@ -14,7 +14,8 @@
         android:layout_marginRight="10dp"
         android:drawableRight="@drawable/oa_next"
         android:textSize="15sp"
-        android:hint="请选择查询日期"/>
+        android:hint="请选择查询日期"
+        android:textColor="#333333"/>
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
@@ -41,12 +42,12 @@
     android:background="@color/item_line" />
 
     <TextView
+        android:textColor="#333333"
         android:id="@+id/wages_phone_tv"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
-        android:drawableRight="@drawable/oa_next"
         android:gravity="center_vertical"
         android:textSize="15sp" />
     <View
@@ -98,31 +99,32 @@
             />
         <Button
             android:id="@+id/wages_code_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
             android:padding="2dp"
             android:text="获取验证码"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_main"
+            android:textSize="13sp"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
-            android:background="@drawable/bg_bule_btn"
+            android:background="#2f95dd"
             android:visibility="visible"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
             />
 
         <Button
             android:id="@+id/seconds_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
             android:padding="2dp"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_main"
+            android:textSize="13sp"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
             android:background="#DCDCDC"
             android:visibility="gone"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:text="重新获取(59s)"
             />
 
 
@@ -138,10 +140,9 @@
         android:layout_height="45dp"
         android:padding="10dp"
         android:text="忘记密码?"
-        android:textColor="@color/blue"
-        android:textSize="@dimen/text_main"
+        android:textColor="#2f95dd"
+        android:textSize="12sp"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="10dp"
         android:layout_gravity="right"
         android:background="@null"
         />

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

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

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/item_comdoc_am_list_tv"
+        android:layout_marginTop="5dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="开始时间："
+        android:layout_marginRight="10dp"
+        android:textColor="#6E6E6E"
+        />
+
+    <TextView
+        android:id="@+id/item_comdoc_am_value_tv"
+        android:layout_marginTop="5dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:text="2016-11-25-21:22"
+        android:textColor="#2f95dd"
+        />
+
+</LinearLayout>

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

@@ -3,12 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@drawable/bg">
+    android:background="@color/white"
+    >
 
     <RelativeLayout
+        android:layout_margin="5dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp">
+        >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,86 +22,49 @@
         <TextView
             android:id="@+id/cancel_tv"
             android:layout_alignParentRight="true"
-            android:layout_width="50dp"
+            android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:text="取消"
             android:textColor="@color/LightBlue"
             android:textSize="16sp"
             android:gravity="right"
+            android:layout_marginRight="20dp"
             />
-        <TextView
-            android:id="@+id/h_sign_tv"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:text="横屏签名"
-            android:textColor="@color/LightBlue"
-            android:textSize="16sp"
-            android:gravity="right"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@id/cancel_tv"
-            android:visibility="gone"/>
-
-        <RelativeLayout
-            android:id="@+id/s_rl"
-            android:layout_width="match_parent"
-            android:layout_height="300dp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="30dp"
-            android:background="@color/white"
-            >
-
-            <Button
-                android:id="@+id/hscreen_btn"
-                android:layout_width="80dp"
-                android:layout_height="35dp"
-                android:layout_alignBottom="@+id/clear_im"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_marginLeft="10dp"
-                android:layout_marginStart="10dp"
-                android:background="@drawable/bg"
-                android:text="横屏签名"
-                android:visibility="gone" />
-
-            <ImageView
-                android:id="@+id/clear_im"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_alignParentRight="true"
-                android:layout_margin="10dp"
-                android:background="@color/white"
-                android:src="@drawable/clean" />
-
-            <View
-                android:id="@+id/view3"
-                android:layout_width="match_parent"
-                android:layout_height="2px"
-                android:layout_below="@+id/clear_im"
-                android:layout_marginTop="5dp"
-                android:background="@color/item_line" />
-
-            <com.uas.appme.settings.handwritedemo.LinePathView
-                android:id="@+id/sigature_view"
-                android:layout_width="match_parent"
-                android:layout_height="250dp"
-                android:layout_below="@+id/view3"
-                android:layout_gravity="center_horizontal"
-                android:background="@color/white" />
+    </RelativeLayout>
 
+    <ImageView
+        android:layout_gravity="right"
+        android:id="@+id/clear_im"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:src="@drawable/clean"
+        android:layout_marginRight="20dp"
+        android:padding="5dp"/>
 
-        </RelativeLayout>
+    <View
+        android:id="@+id/view3"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/clear_im"
+        android:layout_marginTop="5dp"
+        android:background="@color/item_line" />
 
-        <TextView
-            android:layout_below="@+id/s_rl"
-            android:gravity="center"
-            android:background="@color/white"
-            android:text="签名区域"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            />
-    </RelativeLayout>
+    <com.uas.appme.settings.handwritedemo.LinePathView
+        android:id="@+id/sigature_view"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:layout_below="@+id/view3"
+        android:layout_gravity="center_horizontal"
+        android:background="#F0F0F0"
+        android:layout_margin="10dp"/>
+    <TextView
+        android:layout_below="@+id/s_rl"
+        android:gravity="center"
+        android:text="签名区域"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        />
 
     <Button
         android:id="@+id/submit_btn"

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

@@ -71,6 +71,7 @@
                     android:layout_height="45dp"
                     android:background="@drawable/bg_bule_btn"
                     android:gravity="center"
+                    android:textColor="@color/white"
                     />
             </LinearLayout>
 
@@ -127,6 +128,7 @@
                     android:layout_height="45dp"
                     android:background="@drawable/bg_bule_btn"
                     android:gravity="center"
+                    android:textColor="@color/white"
                     />
             </LinearLayout>
 
@@ -171,6 +173,7 @@
                         android:layout_alignParentRight="true"
                         android:textSize="20sp"
                         android:src="@drawable/icon_unshow"
+                        android:visibility="gone"
                         />
                 </RelativeLayout>
 
@@ -193,6 +196,7 @@
                     android:layout_height="45dp"
                     android:background="@drawable/bg_bule_btn"
                     android:gravity="center"
+                    android:textColor="@color/white"
                     />
             </LinearLayout>
         </LinearLayout>

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

@@ -2,12 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="#FBFBFB">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
+        android:padding="5dp"
         android:background="@color/bg_main"
         android:layout_gravity="center_horizontal">
 
@@ -22,33 +23,39 @@
             android:layout_width="match_parent"
             android:layout_height="30dp"
             android:drawablePadding="5dp"
-            android:drawableRight="@drawable/rili"
+            android:drawableRight="@drawable/oa_next"
             android:gravity="center|left"
             android:paddingRight="20dp"
             android:text=""
             android:layout_marginLeft="10dp"
             />
     </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#FBFBFB" />
-    <TextView
-        android:id="@+id/announcement"
-        android:textSize="12sp"
-        android:background="@color/white"
-        android:padding="10dp"
+    <LinearLayout
+        android:id="@+id/announcement_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="公告：本月工资发放内容包括了上个月的餐补，请大家查看明细"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"  />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="#FBFBFB" />
+        android:orientation="vertical">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="#FBFBFB" />
+        <TextView
+            android:id="@+id/announcement"
+            android:textSize="13sp"
+            android:background="@color/white"
+            android:padding="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="公告：本月工资发放内容包括了上个月的餐补，请大家查看明细"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:textColor="#2f95dd"
+            />
+    </LinearLayout>
+
+
     <com.core.widget.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -63,25 +70,42 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
+               <LinearLayout
+                   android:id="@+id/wages_ll"
+                   android:visibility="visible"
+                   android:layout_width="match_parent"
+                   android:layout_height="wrap_content"
+                   android:orientation="vertical"
+                   android:background="@color/white">
+                   <View
+                       android:layout_width="match_parent"
+                       android:layout_height="10dp"
+                       android:background="#FBFBFB" />
+                   <com.core.widget.MyListView
+                       android:id="@+id/wages_lv"
+                       android:layout_width="match_parent"
+                       android:layout_height="wrap_content"
+                       android:padding="10dp"
+                       android:visibility="visible"
+                       android:background="@color/white"
+                       >
+                   </com.core.widget.MyListView>
 
-                <com.core.widget.MyListView
-                    android:id="@+id/wages_lv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:padding="10dp"
-                    android:background="@drawable/wagebg"
-                    android:visibility="visible"
-                    >
-                </com.core.widget.MyListView>
+                   <ImageView
+                       android:background="@drawable/sealang"
+                       android:layout_width="match_parent"
+                       android:layout_height="20dp" />
+               </LinearLayout>
                 <ImageView
                     android:id="@+id/received_im"
-                    android:layout_alignBottom="@+id/wages_lv"
-                    android:layout_alignRight="@+id/wages_lv"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_alignBottom="@+id/wages_ll"
+                    android:layout_alignRight="@+id/wages_ll"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
                     android:src="@drawable/received"
-                    android:layout_margin="30dp"
                     android:visibility="gone"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginBottom="40dp"
                     />
             </RelativeLayout>
             <LinearLayout
@@ -105,30 +129,38 @@
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/error_ll"
+                android:layout_marginTop="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="10dp"
-                android:visibility="gone">
+                android:visibility="gone"
+                android:background="@color/white"
+                >
                 <TextView
-                    android:textColor="@color/red"
                     android:text="报错信息"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:padding="10dp"
+                    />
                 <TextView
                     android:id="@+id/error_tv"
                     android:text="报错等我QQ信息"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/errorbg"
+                    android:textColor="#000000"
                     android:padding="10dp"
-                    android:textColor="#000000"/>
+                    />
+                <ImageView
+                    android:background="@drawable/sealang"
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                >
 
                 <Button
                     android:id="@+id/btn_signature"
@@ -136,7 +168,7 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_bule_btn"
                     android:padding="10dp"
-                    android:text="签字"
+                    android:text="签名"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text_main"
                     android:layout_weight="1"

app_modular/appworks/src/main/java/com/uas/appworks/model/WorkPlatModel.java

@@ -81,6 +81,8 @@ public class WorkPlatModel implements IWorkPlatModel {
                         if (JSONUtil.validate(result)) {
                             JSONObject resultObject = JSON.parseObject(result);
                             failMsg = JSONUtil.getText(resultObject, "exceptionInfo");
+                        } else {
+                            failMsg = result;
                         }
                     }
                     workCallback.onFail(request.getWhat(), failMsg);
@@ -139,6 +141,7 @@ public class WorkPlatModel implements IWorkPlatModel {
                     }
                     List<WorkMenuBean.ModuleListBean> localModuleList = localWorkMenuBean.getModuleList();
                     if (localModuleName.equals(cacheModuleName)) {
+                        //本地模块存在，按本地模块更新缓存数据
                         isWorkMenuExist = true;
                         WorkMenuBean workMenuBean = new WorkMenuBean();
                         workMenuBean.setIsLocalModule(true);
@@ -154,6 +157,7 @@ public class WorkPlatModel implements IWorkPlatModel {
                             for (WorkMenuBean.ModuleListBean localModuleListBean : localModuleList) {
                                 String localMenuIcon = localModuleListBean.getMenuIcon();
                                 if (localMenuIcon.equals(cacheMenuIcon)) {
+                                    //本地应用存在，按本地应用更新缓存数据
                                     isModuleListExist = true;
                                     WorkMenuBean.ModuleListBean resultModuleListBean = new WorkMenuBean.ModuleListBean();
                                     resultModuleListBean.setIsHide(cacheModuleListBean.isHide());
@@ -167,6 +171,7 @@ public class WorkPlatModel implements IWorkPlatModel {
                                     break;
                                 }
                             }
+                            //如果本地应用不存在，则直接添加
                             if (!isModuleListExist && !cacheModuleListBean.isLocalMenu()) {
                                 resultModuleListBeans.add(cacheModuleListBean);
                             }
@@ -181,6 +186,7 @@ public class WorkPlatModel implements IWorkPlatModel {
                                     break;
                                 }
                             }
+                            //本地文件中有缓存中不存在的模块，则将新增模块添加入模块列表最后一项
                             if (!isExist) {
                                 resultModuleListBeans.add(localModuleListBean);
                             }