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

# Conflicts:
#	WeiChat/version.properties
#	app_core/common/src/main/java/com/common/LogUtil.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -81,9 +81,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
     private NScrollerGridView gv_topic;
     List<DataState> dataStates;
     GridDataAdapter adapter;
-
-
-    private String[] mTypes =  {"商务洽谈", "开会", "外出娱乐", "吃饭", "卡拉OK", "高尔夫","麻将","电影","其它" };
+    private String[] mTypes ;
     private String phone;
 
     @Override
@@ -91,20 +89,21 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_book_add);
         getSupportActionBar().setTitle(getString(R.string.booking_add));
-        tvBookObject = (TextView) findViewById(R.id.tv_book_object);
-        companyAddRl = (RelativeLayout) findViewById(R.id.company_add_rl);
-        tvBookTimes = (TextView) findViewById(R.id.tv_book_times);
-        remarkRl = (RelativeLayout) findViewById(R.id.remark_rl);
-        rlObject = (RelativeLayout) findViewById(R.id.rl_object);
-
-        topic_rl = (RelativeLayout) findViewById(R.id.topic_rl);
-        tvBookAddress = (TextView) findViewById(R.id.tv_book_address);
-        et_book_content = (EditText) findViewById(R.id.et_book_content);
-
-        tv_book_topic = (EditText) findViewById(R.id.tv_book_topic);
-        gv_topic = (NScrollerGridView) findViewById(R.id.gv_topic);
-        tv_book_topic.setText("商务洽谈");
-        bt_commit = (Button) findViewById(R.id.submit_btn);
+        tvBookObject =findViewById(R.id.tv_book_object);
+        companyAddRl =findViewById(R.id.company_add_rl);
+        tvBookTimes =findViewById(R.id.tv_book_times);
+        remarkRl = findViewById(R.id.remark_rl);
+        rlObject =findViewById(R.id.rl_object);
+
+        topic_rl = findViewById(R.id.topic_rl);
+        tvBookAddress =findViewById(R.id.tv_book_address);
+        et_book_content =findViewById(R.id.et_book_content);
+
+        tv_book_topic = findViewById(R.id.tv_book_topic);
+        gv_topic = findViewById(R.id.gv_topic);
+        mTypes = getResources().getStringArray(R.array.booking_topics);
+        tv_book_topic.setText(mTypes[0]);
+        bt_commit = findViewById(R.id.submit_btn);
         findViewById(R.id.submit_btn).setOnClickListener(this);
         rlObject.setOnClickListener(this);
         companyAddRl.setOnClickListener(this);
@@ -169,7 +168,6 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                 break;
             case R.id.company_add_rl://时段
                 if (!StringUtil.isEmpty(tvBookObject.getText().toString())) {
-                  LogUtil.d("HttpLogs","imid:"+imId);
                     startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                                     .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
                                     .putExtra("endDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
@@ -198,7 +196,6 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                 if (model != null) {
                     ToastMessage("预约对象不能更改！");
                 } else {
-                    //SelectPContactsActivity
                     intent = new Intent(this, ContactsActivity.class);
 //                    SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
 //                            .setTitle(getString(R.string.booking_object_name))
@@ -226,18 +223,13 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                 longitude = poi.location.longitude;
                 break;
             case 0x24://时间
-
                 startTime = data.getStringExtra("startDate");
                 endTime = data.getStringExtra("endDate");
-
                 String displayDate = startTime.substring(11, 16) + "-" + endTime.substring(11, 16);
                 tvBookTimes.setText(displayDate);
-
                 break;
             case 0x01://对象
-                // SelectEmUser model = data.getParcelableExtra("data");
                 ContactsModel model = data.getParcelableExtra("data");
-                LogUtil.d("Test",JSON.toJSONString(model));
                 imId = model.getImid();
                 phone = model.getPhone();
                 tvBookObject.setText(model.getName());
@@ -274,11 +266,6 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
             bt_commit.setEnabled(true);
             return;
         }
-//        if (StringUtil.isEmpty(et_book_content.getText().toString())) {
-//            ToastMessage("请填写预约内容！");
-//            bt_commit.setEnabled(true);
-//            return;
-//        }
         if (isEmoji(et_book_content.getText().toString()) || isEmoji(tvBookObject.getText().toString())) {
             ToastMessage("不支持表情符号的输入！");
             bt_commit.setEnabled(true);
@@ -303,7 +290,6 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                 "\"ab_longitude\":\"" + longitude + "\",\n" +
                 "\"ab_latitude\":\"" + latitude + "\"" +
                 "}\n";
-        LogUtil.prinlnLongMsg("Test", json);
         String url = Constants.IM_BASE_URL() + "user/appSaveBooking";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
@@ -342,19 +328,12 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
             bt_commit.setEnabled(true);
             return;
         }
-//        if (StringUtil.isEmpty(et_book_content.getText().toString())) {
-//            ToastMessage("请填写预约内容！");
-//            bt_commit.setEnabled(true);
-//            return;
-//        }
-
         if (isEmoji(et_book_content.getText().toString()) || isEmoji(tvBookObject.getText().toString())) {
             ToastMessage("不支持表情符号的输入！");
             bt_commit.setEnabled(true);
             return;
         }
         showLoading();
-        //   "\"ab_sharestatus\":\"未共享\","+//变为未共享
         String content = "";
         content = et_book_content.getText().toString();
         content = content.replace("'", "''");
@@ -390,7 +369,6 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
         public void handleMessage(Message msg) {
             dimssLoading();
             switch (msg.what) {
-
                 case 0x01:
                     try {
                         String resutl = JSON.parseObject(msg.getData().getString("result")).getString("result");
@@ -451,7 +429,6 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
             selectBean.setName(mTypes[i]);
             formBeaan.add(selectBean);
         }
-
         Intent intent = new Intent();
         intent.setClass(this, SelectActivity.class);
         intent.putExtra("type", 2);
@@ -535,7 +512,6 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
         }
     }
 
-
     private void invite(String user, final String modeid) {
         final String name = CommonUtil.getName();
         final String phone = user.trim().replaceAll(" ", "");
@@ -573,9 +549,4 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
         };
         MyApplication.getInstance().getFastVolley().addDefaultRequest("Volley", request);
     }
-
-
-   
-}
-
-
+}

WeiChat/src/main/res/values-en/strings.xml

@@ -1554,4 +1554,16 @@
          <string name = "booking_time_set"> reservation time period setting </string>
     <string name="book_empty">you have no appointment,do it now!</string>
 
+
+    <string-array name="booking_topics">
+        <item>Business</item>
+        <item>Meeting</item>
+        <item>Entertainment</item>
+        <item>Eating</item>
+        <item>KTV</item>
+        <item>Golf</item>
+        <item>Mahjong</item>
+        <item>Movie</item>
+        <item>Others</item>
+    </string-array>
 </resources>

WeiChat/src/main/res/values/strings.xml

@@ -1997,4 +1997,16 @@
     <string name="room_location">服务/场地/房间</string>
     <string name="relax_time">休息时间</string>
     <string name="book_empty">您还没有预约，现在就去约吧！</string>
+
+    <string-array name="booking_topics">
+        <item>商务洽谈</item>
+        <item>开会</item>
+        <item>外出娱乐</item>
+        <item>吃饭</item>
+        <item>卡拉OK</item>
+        <item>高尔夫</item>
+        <item>麻将</item>
+        <item>电影</item>
+        <item>其它</item>
+    </string-array>
 </resources>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Feb 08 16:41:36 CST 2018
-debugName=444
+#Thu Feb 08 17:38:33 CST 2018
+debugName=445
 versionName=613
-debugCode=444
+debugCode=445
 versionCode=152

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

@@ -81,7 +81,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
     List<DataState> dataStates;
     GridDataAdapter adapter;
     private String phone;
-    private String[] mTypes = {"商务洽谈", "开会", "外出娱乐", "吃饭", "卡拉OK", "高尔夫","麻将","电影","其它" };
+    private String[] mTypes ;
 
 
     @Override
@@ -129,7 +129,8 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
         tv_book_topic = (EditText) findViewById(R.id.tv_book_topic);
         gv_topic = (NScrollerGridView) findViewById(R.id.gv_topic);
         bt_commit = (Button) findViewById(R.id.submit_btn);
-        tv_book_topic.setText("商务洽谈");
+        mTypes = getResources().getStringArray(R.array.booking_topics);
+        tv_book_topic.setText(mTypes[0]);
 
         if (getIntent() != null && getIntent().getExtras() != null) {
             model = getIntent().getExtras().getParcelable("model");
@@ -150,6 +151,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
             }
         }
 
+   
         dataStates = new ArrayList<>();
         for (String str : mTypes) {
             DataState dataState = new DataState();

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

@@ -34,7 +34,7 @@ public class BBSharesListActivity extends BaseActivity {
     
     private void initView(){
         getSupportActionBar().setTitle(getString(R.string.booking_shared));
-        mlist= (PullToRefreshListView) findViewById(R.id.shareList);
+        mlist=  findViewById(R.id.shareList);
         emptyLayout=new EmptyLayout(mContext,mlist.getRefreshableView());
         if (getIntent()!=null){
             mDatas=getIntent().getParcelableArrayListExtra("model");

app_modular/appbooking/src/main/res/values-en/strings.xml

@@ -61,4 +61,16 @@
         <item>没有必要</item>
         <item>其它</item>
     </string-array>
+
+    <string-array name="booking_topics">
+        <item>Business</item>
+        <item>Meeting</item>
+        <item>Entertainment</item>
+        <item>Eating</item>
+        <item>KTV</item>
+        <item>Golf</item>
+        <item>Mahjong</item>
+        <item>Movie</item>
+        <item>Others</item>
+    </string-array>
 </resources>

app_modular/appbooking/src/main/res/values/strings.xml

@@ -48,8 +48,19 @@
         <item>没有必要</item>
         <item>其它</item>
     </string-array>
-
-
+    <string-array name="booking_topics">
+        <item>商务洽谈</item>
+        <item>开会</item>
+        <item>外出娱乐</item>
+        <item>吃饭</item>
+        <item>卡拉OK</item>
+        <item>高尔夫</item>
+        <item>麻将</item>
+        <item>电影</item>
+        <item>其它</item>
+    </string-array>
+    
+    
     <string name="label_price">￥%1$.1f</string>
     <string name="dialog_clear_shopping_cart_title">是否清空购物车？</string>
     <string name="dialog_clear_shopping_cart_message">你确认清空购物车?一旦清空将不可恢复</string>

app_modular/appme/src/main/res/values-en/strings.xml

@@ -1836,7 +1836,7 @@
     <string name="booking_time_set">预约时间段设置</string>
     <string name="booking_times">时间段：</string>
 
-    <string name="booking_add">appointment plan</string>
+    <string name="booking_add">Appointment Plan</string>
     <string name="select_share_friend">分享好友</string>
 
     <!--关于新审批流的，后期会添加到四个文件中-->