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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 22 15:06:10 CST 2017
-debugName=234
+#Fri Dec 22 16:24:55 CST 2017
+debugName=239
 versionName=612
-debugCode=234
+debugCode=239
 versionCode=151

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

@@ -63,13 +63,10 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
                 sc_industrycode = array.getJSONObject(0).getString("sc_industrycode");
 
                 if ("餐饮".equals(sc_industry)) {
-                    rTyperl.setVisibility(View.GONE);
                     tableSetRl.setVisibility(View.VISIBLE);
                 }else {
-                    rTyperl.setVisibility(View.GONE);
-                    tableSetRl.setVisibility(View.GONE);
+                    tableSetRl.setVisibility(View.VISIBLE);
                 }
-
             }
         }));
 

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

@@ -93,6 +93,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
+        progressDialog.show();
         initView();
         judgeWhichType();
         String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
@@ -170,6 +171,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             myAdapter.notifyDataSetChanged();
         }
         Log.i("fanglh",sc_industry+"");
+        progressDialog.dismiss();
     }
 
     private void initView() {
@@ -217,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/TableSetActivity.java

@@ -139,6 +139,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 model.setAs_id("0");
                 model.setAs_companyid(as_companyid);
                 model.setAs_maxperson("");
+                model.setAs_booknumber("");
                 tableList.add(model);
                 myAdapter.notifyDataSetChanged();
         }else if (id == R.id.save_bt){
@@ -336,6 +337,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             tableView.number_et.setText(modeList.get(position).getAs_number()+"");
             tableView.remark_et.setText(modeList.get(position).getAs_remark()+"");
             tableView.days_et.setText(modeList.get(position).getAs_booknumber());
+            tableView.maxperson_et.setText(modeList.get(position).getAs_maxperson()+"");
             return convertView;
         }
 

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,25 @@ 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);
 
                 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 +137,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 +155,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 +175,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 +198,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 +295,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 +335,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>() {
@@ -327,7 +354,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
     private void doNewSubmit(Bitmap pathBm, String plainpath) {
         String url = "http://192.168.253.58:8080/ERP/"+"mobile/salary/salaryBack.action";
-        byte[] ppp = getBitmapByte(pathBm);
         RequestParams params = new RequestParams();
         params.addBodyParameter("emcode", emcode);
         params.addBodyParameter("sl_id",sl_id);
@@ -444,6 +470,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);
@@ -489,7 +525,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

@@ -63,6 +63,7 @@
                     android:layout_height="match_parent"
                     android:padding="10dp"
                     android:background="@color/white"
+                    android:visibility="gone"
                     >
                 </com.core.widget.MyListView>
                 <ImageView
@@ -81,7 +82,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="300dp"
                 android:gravity="center"
-                android:visibility="gone"
                 >
                 <ImageView
                     android:layout_width="100dp"
@@ -89,6 +89,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"