提交分类： 功能开发，修复BUG；

提交内容：  1、微信支付集成；
           2、解决朋友圈闪退
当前版本：  测试版本6.1.1
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Dec 28 08:47:37 CST 2017
-debugName=310
+#Wed Dec 27 17:04:36 CST 2017
+debugName=294
 versionName=613
-debugCode=310
+debugCode=294
 versionCode=152

app_core/common/src/main/java/com/core/api/wxapi/WXEntryActivity.java

@@ -1,9 +0,0 @@
-package com.core.api.wxapi;
-
-
-import com.umeng.socialize.weixin.view.WXCallbackActivity;
-
-
-public class WXEntryActivity extends WXCallbackActivity {
-    
-}

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

@@ -9,15 +9,6 @@
     android:paddingTop="10dp"
     android:background="@drawable/pop_round_bg">
 
-    <TextView
-        android:id="@+id/title_tv"
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        android:gravity="center"
-        android:text="请输入你的问题"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,7 +30,7 @@
             android:background="@null"
             android:maxLines="3"
             android:maxLength="100"
-            android:hint="@string/common_input"
+            android:hint="请输入你的问题"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main"
             android:gravity="left"
@@ -59,44 +50,25 @@
             android:inputType="number"/>
     </LinearLayout>
 
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_marginTop="10dp"
-        android:background="@color/item_line" />
-
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:orientation="horizontal"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main">
-
-        <TextView
-            android:id="@+id/cancel1_tv"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="@string/cancel"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <View
-            android:layout_width="2px"
-            android:layout_height="match_parent"
-            android:background="@color/item_line" />
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
-        <TextView
+        <Button
             android:id="@+id/sure_tv"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:text="提交"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
             android:layout_weight="1"
-            android:gravity="center"
-            android:text="@string/common_sure"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-    </LinearLayout>
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="30dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="30dp"
+            /></LinearLayout>
 </LinearLayout>

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

@@ -8,6 +8,17 @@
     android:paddingRight="15dp"
     android:paddingTop="5dp">
 
+    <ImageView
+        android:id="@+id/voice_search_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" />
+
     <com.core.widget.ClearEditText
         android:id="@+id/search_edit"
         android:layout_width="fill_parent"
@@ -22,15 +33,4 @@
         android:textColor="@color/dark_grey"
         android:textColorHint="@color/grey"
         android:textSize="15sp" />
-
-    <ImageView
-        android:id="@+id/voice_search_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" />
 </merge>

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

@@ -1587,7 +1587,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

@@ -1575,7 +1575,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

@@ -1925,7 +1925,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/BSettingLocationActivity.java

@@ -8,6 +8,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -171,7 +172,12 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             myAdapter.notifyDataSetChanged();
         }
         Log.i("fanglh",sc_industry+"");
-        progressDialog.dismiss();
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+            }
+        },2000);
     }
 
     private void initView() {

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

@@ -62,18 +62,18 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
     private ImageView eye_im;
     private Boolean canSeePW = false;
     private String emcode;
-    private TextView seconds_tv;
+    private Button seconds_tv;
     private long SecondT = 59;
     private boolean isRun = false;
     private Boolean codeTimeOut = false;
 
-    private Handler timeHandler = new Handler() {
+    private Handler timeHandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            if (msg.what==1212) {
+            if (msg.what==1212){
                 SecondT--;
-                seconds_tv.setText(SecondT+"\t秒后重新发送");
+                seconds_tv.setText("重新获取("+SecondT+"s)");
                 if (SecondT==0) {
                     codeTimeOut = true;
                     seconds_tv.setVisibility(View.GONE);
@@ -81,11 +81,10 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                     isRun = false;
                     SecondT = 59;
                 }
-                Log.i("HttpLogs",SecondT+"");
-            }
+            Log.i("HttpLogs",SecondT+"");
+        }
         }
     };
-
     /**
      * 开启倒计时
      */
@@ -165,7 +164,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
 
     private void initView() {
         setContentView(R.layout.check_wages_activity);
-        getSupportActionBar().setTitle("工资条查询");
+        getSupportActionBar().setTitle(getString(R.string.str_company_salary));
 
         mWagesDate = (TextView) findViewById(R.id.wages_date);
         mWagesPasswordEt = (FormEditText) findViewById(R.id.wages_password_et);
@@ -177,7 +176,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
         mWagesDate.setOnClickListener(this);
         mWagesCodeBtn.setOnClickListener(this);
         mCheckBtn.setOnClickListener(this);
-        seconds_tv = (TextView)findViewById(R.id.seconds_tv);
+        seconds_tv = (Button)findViewById(R.id.seconds_tv);
 
         mTel.setText(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"user_phone"));
         master = CommonUtil.getSharedPreferences(ct, "erp_master");

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

@@ -49,7 +49,6 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.wage_forgetps);
-
         initView();
     }
 
@@ -57,6 +56,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
 
         mStep1Ll = (LinearLayout) findViewById(R.id.step1_ll);
         mPhoneEt = (EditText) findViewById(R.id.phone_et);
+        mPhoneEt.setText(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"user_phone")+"");
         mClearphoneTv = (TextView) findViewById(R.id.clearphone_tv);
         mNext1Btn = (Button) findViewById(R.id.next1_btn);
         mStep2Ll = (LinearLayout) findViewById(R.id.step2_ll);
@@ -73,6 +73,8 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
         mNext3Btn.setOnClickListener(this);
         mEyeTv.setOnClickListener(this);
         mClearphoneTv.setOnClickListener(this);
+        mPhoneEt.setFocusable(false);
+        mPhoneEt.setKeyListener(null);
 
         showStepView(1);
     }

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

@@ -104,6 +104,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
 
     private void showDatas(String result) {
+        haveData = true;
         try {
             JSONObject salaryObject = JSON.parseObject(result).getJSONObject("salary");
             if (salaryObject != null){
@@ -160,15 +161,14 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                         }
                     }
 
-                    invalidateOptionsMenu();
                 }else{
                    showEnty();
                 }
             }else{
                 showEnty();
             }
-
-        } catch (Exception e) {
+            invalidateOptionsMenu();
+       } catch (Exception e) {
             e.printStackTrace();
         }
 }
@@ -237,7 +237,8 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             if (needSignature == 1)
                 showSiganWindow();
             else
-                doSubmit();
+//                doSubmit();
+                doNewSubmit(null,null);
 
         }else if (v.getId() == R.id.clear_im){
             pathView.clear();
@@ -259,7 +260,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                     options.inSampleSize = 2;
                     Bitmap pathBm = BitmapFactory.decodeFile(plainpath);
 //                    doSubmit(pathBm,plainpath);
-                    doNewSubmit( pathBm, plainpath);
+                    doNewSubmit(pathBm, plainpath);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -276,8 +277,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 return;
             }
             doErrorMsgHandle();
-        }else if (v.getId() == R.id.cancel1_tv){
-            popupWindow.dismiss();
         }else if (v.getId() == R.id.wage_date_tv){
             DatePicker picker = new DatePicker(this, DatePicker.YEAR_MONTH);
             picker.setRange(2016, CommonUtil.getNumByString(DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyy")));
@@ -368,7 +367,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         params.addBodyParameter("result","true");
         params.addQueryStringParameter("master", master);
         params.addBodyParameter("msg","");
-        if (!StringUtil.isEmpty(plainpath))
+        if (needSignature != 1)
             params.addBodyParameter("img",new File(plainpath));
         final HttpUtils http = new HttpUtils();
         Log.i("urlparams",url+params+"");
@@ -376,12 +375,13 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
             @Override
             public void onStart() {
-                if (!StringUtil.isEmpty(plainpath))
+                if (needSignature == 1)
                     ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
             }
             @Override
             public void onSuccess(ResponseInfo<String> responseInfo) {
-                ViewUtil.ToastMessage(ct, getString(R.string.Uploaded_successfully));
+                if (needSignature == 1)
+                    ViewUtil.ToastMessage(ct, getString(R.string.Uploaded_successfully));
                 Log.i("doNewSubmit",JSON.parseObject(responseInfo.result).toJSONString());
                 if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
                     Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
@@ -416,7 +416,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 .url("mobile/salary/salaryBack.action")
                 .add("emcode", emcode)
                 .add("sl_id",sl_id)
-                .add("result","true")
+                .add("result",true)
                 .add("master", master)
                 .add("msg","")
                 .method(Method.POST)
@@ -470,6 +470,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.setAnimationStyle(com.uas.appworks.R.style.MenuAnimationFade);
         setWindow.setBackgroundDrawable(mContext.getResources().getDrawable(com.uas.appworks.R.drawable.bg_popuwin));
         setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
@@ -488,11 +489,10 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
-        if (!haveData || !StringUtil.isEmpty(sl_remark) || sl_result != -1 ) {
-
-        } else {
+        if(haveData && StringUtil.isEmpty(sl_remark) && sl_result == 0)
             getMenuInflater().inflate(R.menu.wage_error, menu);
-        }
+        else
+            menu.clear();
         return super.onPrepareOptionsMenu(menu);
     }
     @Override
@@ -518,7 +518,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
         // 设置按钮的点击事件
         msg_et = (EditText) contentView.findViewById(R.id.msg_et);
-        contentView.findViewById(R.id.cancel1_tv).setOnClickListener(this);
         contentView.findViewById(R.id.sure_tv).setOnClickListener(this);
 
 //        DisplayMetrics dm = getResources().getDisplayMetrics();

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

@@ -70,18 +70,7 @@
             android:inputType="textPassword"
             />
 
-        <Button
-            android:id="@+id/forget_password_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="45dp"
-            android:padding="10dp"
-            android:text="忘记密码"
-            android:textColor="@color/blue"
-            android:textSize="@dimen/text_main"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"
-            android:background="@color/white"
-            />
+
     </RelativeLayout>
 
     <View
@@ -110,41 +99,53 @@
         <Button
             android:id="@+id/wages_code_btn"
             android:layout_width="wrap_content"
-            android:layout_height="45dp"
-            android:padding="10dp"
+            android:layout_height="35dp"
+            android:padding="2dp"
             android:text="获取验证码"
-            android:textColor="@color/blue"
+            android:textColor="@color/white"
             android:textSize="@dimen/text_main"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
-            android:background="@color/white"
+            android:background="@drawable/bg_bule_btn"
             android:visibility="visible"
+            android:layout_marginTop="5dp"
             />
 
-
-        <TextView
+        <Button
             android:id="@+id/seconds_tv"
-            android:padding="10dp"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="59"
-            android:textColor="@color/red"
-            android:textSize="16sp"
-            android:layout_toLeftOf="@+id/wages_code_btn"
-            android:gravity="center_vertical"
-            android:maxLength="6"
-            android:visibility="gone"
-            android:layout_marginTop="5dp"
+            android:layout_height="35dp"
+            android:padding="2dp"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
+            android:background="#DCDCDC"
+            android:visibility="gone"
+            android:layout_marginTop="5dp"
             />
 
+
     </RelativeLayout>
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
         android:background="@color/item_line" />
 
+    <Button
+        android:id="@+id/forget_password_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="45dp"
+        android:padding="10dp"
+        android:text="忘记密码?"
+        android:textColor="@color/blue"
+        android:textSize="@dimen/text_main"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="10dp"
+        android:layout_gravity="right"
+        android:background="@null"
+        />
+
     <Button
         android:id="@+id/check_btn"
         android:layout_margin="20dp"

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

@@ -63,7 +63,7 @@
        android:id="@+id/sure_btn"
        android:text="确认"
        android:layout_gravity="center_horizontal"
-       android:layout_width="80dp"
+       android:layout_width="150dp"
        android:layout_height="40dp"
        android:background="@drawable/bg_bule_btn"
        android:gravity="center"

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

@@ -69,7 +69,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_margin="10dp"
                 android:background="@color/white"
-                android:src="@drawable/icon_shuaxin" />
+                android:src="@drawable/clean" />
 
             <View
                 android:id="@+id/view3"
@@ -98,7 +98,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            android:layout_marginRight="10dp"/>
+            />
     </RelativeLayout>
 
     <Button

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

@@ -21,7 +21,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="请输入手机号"
+                    android:text="请确认手机号"
                     android:textSize="20sp"
                     android:textColor="@color/black"/>
                 <TextView
@@ -32,19 +32,21 @@
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    >
                     <EditText
                         android:id="@+id/phone_et"
                         android:background="@null"
                         android:layout_width="250dp"
                         android:layout_height="wrap_content"
                         android:hint="请输入手机号"
-                        android:padding="20dp"
+                        android:padding="1dp"
                         android:textSize="16sp"
                         android:maxLength="11"
                         android:inputType="number"
                         android:textColor="@color/black"
-                        android:layout_alignParentTop="true"
+                        android:layout_alignParentBottom="true"
                         />
                     <TextView
                         android:id="@+id/clearphone_tv"
@@ -53,7 +55,8 @@
                         android:layout_alignParentRight="true"
                         android:textSize="20sp"
                         android:drawableRight="@drawable/phone_del"
-                        android:layout_margin="10dp"/>
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"/>
                 </RelativeLayout>
                 <View
                     android:layout_width="match_parent"
@@ -106,13 +109,10 @@
                     android:layout_width="250dp"
                     android:layout_height="wrap_content"
                     android:hint="请输入验证码"
-                    android:padding="20dp"
                     android:textSize="16sp"
                     android:maxLength="11"
                     android:inputType="number"
                     android:textColor="@color/black"
-                    android:layout_alignParentTop="true"
-
                     />
                 <View
                     android:layout_width="match_parent"
@@ -149,6 +149,7 @@
                     android:text="密码"/>
 
                 <RelativeLayout
+                    android:layout_marginTop="10dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <EditText
@@ -157,14 +158,12 @@
                         android:layout_width="250dp"
                         android:layout_height="wrap_content"
                         android:hint="请输入新密码(限6-20位)"
-                        android:padding="20dp"
                         android:textSize="16sp"
                         android:maxLength="15"
                         android:inputType="textPassword"
                         android:textColor="@color/black"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true" />
+                        android:layout_alignParentBottom="true"
+                         />
                     <ImageView
                         android:id="@+id/eye_tv"
                         android:layout_width="20dp"
@@ -172,7 +171,6 @@
                         android:layout_alignParentRight="true"
                         android:textSize="20sp"
                         android:src="@drawable/icon_unshow"
-                        android:layout_margin="10dp"
                         />
                 </RelativeLayout>
 
@@ -182,7 +180,6 @@
                     android:background="@color/item_line" />
                 <TextView
                     android:layout_marginTop="5dp"
-                    android:layout_marginLeft="10dp"
                     android:textColor="@color/titleBlue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -32,7 +32,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/item_line" />
+        android:background="#FBFBFB" />
     <TextView
         android:id="@+id/announcement"
         android:textSize="12sp"
@@ -40,11 +40,15 @@
         android:padding="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="公告：本月工资发放内容包括了上个月的餐补，请大家查看明细"/>
+        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="@color/item_line" />
+        android:background="#FBFBFB" />
     <com.core.widget.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -65,7 +69,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:padding="10dp"
-                    android:background="@color/white"
+                    android:background="@drawable/wagebg"
                     android:visibility="visible"
                     >
                 </com.core.widget.MyListView>
@@ -116,7 +120,9 @@
                     android:text="报错等我QQ信息"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="10dp"/>
+                    android:background="@drawable/errorbg"
+                    android:padding="10dp"
+                    android:textColor="#00000"/>
             </LinearLayout>
 
             <LinearLayout