18:13

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -97,6 +97,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 	private TextView tv_book_num;
 	private MessagePresenter.UnReaderListener unReaderListener;
 	private RelativeLayout uustep_rl;
+	private TextView uustepRedtv;
 
 
 	@Override
@@ -214,6 +215,10 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 		book_time_tv = (TextView) view.findViewById(R.id.book_time_tv);
 		dingyue_num = (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
 		tv_dingyue_desc = (TextView) view.findViewById(R.id.tv_dingyue_desc);//订阅红点
+		uustepRedtv = (TextView) view.findViewById(R.id.uustep_red_tv);  //UU运动红点
+
+		if (PreferenceUtils.getBoolean(MyApplication.getInstance(),Constant.UU_STEP_RED))
+			uustepRedtv.setVisibility(View.GONE);
 
 		uustep_rl = (RelativeLayout) view.findViewById(R.id.uustep_rl);
 		if (CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_dingyue)) {
@@ -338,6 +343,8 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 //                break;
 			case R.id.uustep_rl:
 				startActivity(new Intent(mContext, UUSportActivity.class));
+				uustepRedtv.setVisibility(View.GONE);
+				PreferenceUtils.putBoolean(Constant.UU_STEP_RED, true);
 				break;
 		}
 

WeiChat/src/main/res/layout/new_message_header.xml

@@ -407,7 +407,7 @@
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <FrameLayout
             android:id="@+id/head_uustep"
@@ -457,7 +457,7 @@
                 android:textSize="16sp" />
 
             <TextView
-                android:id="@+id/tv_uustep_num"
+                android:id="@+id/uustep_red_tv"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
                 android:layout_alignParentRight="true"

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

@@ -83,13 +83,13 @@
                 android:id="@+id/login_btn"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="68dp"
                 android:background="@drawable/bg_bule_btn"
                 android:text="@string/login_button"
                 android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_main"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true" />
 
 
         </LinearLayout>

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

@@ -409,7 +409,7 @@
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <FrameLayout
             android:id="@+id/head_uustep"
@@ -459,7 +459,7 @@
                 android:textSize="16sp" />
 
             <TextView
-                android:id="@+id/tv_uustep_num"
+                android:id="@+id/uustep_red_tv"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
                 android:layout_alignParentRight="true"
@@ -467,7 +467,6 @@
                 android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
-
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp" />
 

app_modular/appme/src/main/java/com/uas/appme/settings/Constant/Constant.java

@@ -14,4 +14,7 @@ public class Constant {
     public static String BASE_BOOKING_SETTING_URL= "http://113.105.74.140:8092/";
     public static String BASE_COMPANYID =  CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu");
 //    public static String BASE_COMPANYID = "201";
+
+    public static String B_SETTINGRED = "B_SETTINGRED";
+    public static String UU_STEP_RED = "UU_STEP_RED";
 }

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

@@ -70,6 +70,14 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
         //初始化今天日期
         String CURRENT_DATE = TimeUtil.getCurrentDate();
         current_date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(CURRENT_DATE, "yyyy年MM月dd日"));
+
+        CompanyRestBean model = new CompanyRestBean();
+        model.setSc_companyid(Constant.BASE_COMPANYID);
+//            model.setSc_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
+        model.setSc_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
+        model.setSc_date("");
+        mList.add(model);
+        myAdapter.notifyDataSetChanged();
     }
 
     @Override

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

@@ -113,6 +113,15 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         //初始化今天日期
         String CURRENT_DATE = TimeUtil.getCurrentDate();
         current_date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(CURRENT_DATE, "yyyy年MM月dd日"));
+
+        ComRestBean model = new ComRestBean();
+        model.setSf_companyid(Constant.BASE_COMPANYID);
+        model.setSf_username("");
+        model.setSf_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
+        model.setSf_userid(MyApplication.getInstance().mLoginUser.getUserId());
+        model.setSf_date("");
+        mList.add(model);
+        myAdapter.notifyDataSetChanged();
     }
 
     @Override

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

@@ -29,6 +29,7 @@ import com.core.utils.CommonUtil;
 import com.core.widget.MyListView;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
@@ -98,6 +99,14 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_name(JSON.parseObject(updateData).getString("st_name"));
             mList.add(model);
             myAdapter.notifyDataSetChanged();
+        }else {
+            BSetLocationBean model = new BSetLocationBean();
+            model.setSt_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
+            model.setSt_companyid(Constant.BASE_COMPANYID);
+            model.setSt_siid(sc_industrycode);
+            model.setSt_name("");
+            mList.add(model);
+            myAdapter.notifyDataSetChanged();
         }
     }
 
@@ -146,7 +155,8 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                     .add("map",JSON.toJSONString(param))
                     .add("token",MyApplication.getInstance().mAccessToken)
                     .method(Method.POST)
-                    .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                    .cacheTime(10000)
+                    .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
                 @Override
                 public void onResponse(Object o) {
                     if (!JSONUtil.validate(o.toString()) || o == null) return;
@@ -156,10 +166,15 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                         setResult(20);
                         finish();
                     }
+                    progressDialog.dismiss();save_bt.setEnabled(true);
+                }
 
+                @Override
+                public void onFailure(Object t) {
                     progressDialog.dismiss();save_bt.setEnabled(true);
                 }
             }));
+
         }
 
     }
@@ -267,6 +282,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         TextView cancel_tv = (TextView) contentView.findViewById(R.id.cancel_tv);
         TextView sure_tv = (TextView) contentView.findViewById(R.id.sure_tv);
 
+        editname_et.setText(mList.get(position).getSt_name()+"");
         DisplayMetrics dm = getResources().getDisplayMetrics();
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;

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

@@ -36,6 +36,7 @@ import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
 import com.uas.appme.settings.Constant.Constant;
 import com.umeng.socialize.utils.Log;
@@ -185,7 +186,9 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
             if (resultCode == Activity.RESULT_OK) {
                 if (mNewPhotoUri != null) {
                     photoselect = mNewPhotoUri.getPath();
-                    mImageIm.setImageURI(mNewPhotoUri);
+//                    mImageIm.setImageURI(mNewPhotoUri);
+                    ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(),mImageIm);
+                    Log.i("files0x01",photoselect);
                 } else {
                     ToastUtil.showToast(this, com.uas.appworks.R.string.c_take_picture_failed);
                 }

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

@@ -102,6 +102,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
     private PopupWindow setWindow = null;//
     private RelativeLayout businessmen_setting_rl;
+    private TextView bsettingRed;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -135,6 +136,10 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         booking_set_rl = (RelativeLayout) findViewById(R.id.booking_set_rl);
         businessmen_setting_rl = (RelativeLayout) findViewById(R.id.businessmen_setting_rl);
         businessmen_setting_rl.setOnClickListener(this);
+        bsettingRed = (TextView) findViewById(R.id.businessmen_setting_new);
+
+        if (PreferenceUtils.getBoolean(MyApplication.getInstance(), Constant.B_SETTINGRED)) //商家设置红点
+            bsettingRed.setVisibility(View.GONE);
 
         new_step_rl.setOnClickListener(this);
 //        new_step_rl.setVisibility(View.GONE);
@@ -417,6 +422,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
            closePopupWindow();
        }else if (v.getId() == R.id.businessmen_setting_rl){
            startActivity(new Intent(this,BSettingActivity.class));
+           PreferenceUtils.putBoolean(Constant.B_SETTINGRED, true);
+           bsettingRed.setVisibility(View.GONE);
        }
     }
 

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

@@ -46,7 +46,11 @@
                 android:paddingTop="10dp"
                 android:text="骨科"
                 android:layout_alignParentRight="true"
-                android:layout_marginRight="20dp"/>
+                android:layout_marginRight="20dp"
+                android:maxLength="8"
+                android:singleLine="true"
+                android:ellipsize="end"
+                />
             <TextView
                 android:id="@+id/position_tv"
                 android:layout_width="wrap_content"