提交代码

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -402,7 +402,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 "\"ab_recordman\":\"" + MyApplication.getInstance().mLoginUser.getNickName() + "\"," +
 //                "\"ab_content\":\"" + content + "\"," +
                 "\"ab_type\":\"" + tv_book_topic.getText().toString() + "\"," +
-                "\"ab_confirmstatus\":\"待确认\"," +
+                "\"ab_confirmstatus\":\"未确认\"," +
                 "\"ab_address\":\"" + tvBookAddress.getText().toString() + "\"," +
                 "\"ab_longitude\":\"" + longitude + "\",\n" +
                 "\"ab_latitude\":\"" + latitude + "\"" +

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/BBSharesListActivity.java

@@ -36,6 +36,7 @@ public class BBSharesListActivity extends BaseActivity {
         if (getIntent()!=null){
             mDatas=getIntent().getParcelableArrayListExtra("model");
             mAdapter=new BookAdapter(mContext,mDatas);
+            mAdapter.setTime(true);
             mlist.setAdapter(mAdapter);
         }
 

app_modular/appbooking/src/main/java/com/modular/booking/adapter/BookAdapter.java

@@ -24,6 +24,16 @@ public class BookAdapter extends BaseAdapter {
     private Context ct;
     private int type=1;
     private Date currentDate;
+    
+    private boolean isTime=false;
+
+    public boolean isTime() {
+        return isTime;
+    }
+
+    public void setTime(boolean time) {
+        isTime = time;
+    }
 
     public Date getCurrentDate() {
         return currentDate;
@@ -88,10 +98,16 @@ public class BookAdapter extends BaseAdapter {
                 holder.title_tv.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
                         model.getAb_endtime().substring(11,16));
             }else{
+             
+               
+            }
+            if (isTime){
+                holder.title_tv.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
+                        model.getAb_endtime().substring(11,16));
+            }else{
                 holder.title_tv.setText(model.getAb_starttime().substring(11,16)+"-"+
                         model.getAb_endtime().substring(11,16));
             }
-          
            
             holder.status_tv.setText(model.getAb_confirmstatus());
            

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -148,8 +148,10 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             isSingleSelect = getIntent().getBooleanExtra("isSingleSelect", true);
             if(isSingleSelect){
                 include_tag.setVisibility(View.INVISIBLE);
+                include_tag.getBackground().setAlpha(0);
             }else{
                 include_tag.setVisibility(View.VISIBLE);
+                include_tag.getBackground().setAlpha(100);
                 
             }
             if (!StringUtil.isEmpty(title)) {