修复迁移bug，uusport运行轨迹前

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

@@ -37,7 +37,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:layout_marginLeft="50dp">
-        <com.xzjmyk.pm.activity.ui.erp.view.CircleImageView
+        <com.core.widget.CircleImageView
             android:id="@+id/step_photo_im"
             android:layout_width="40dp"
             android:layout_height="40dp"

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

@@ -13,7 +13,7 @@
         android:background="@color/base_bg"
         android:padding="@dimen/paddingApp">
 
-        <com.xzjmyk.pm.activity.ui.erp.view.CircleImageView
+        <com.core.widget.CircleImageView
             android:id="@+id/handIv"
             android:layout_width="50dp"
             android:background="@color/base_bg"

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

@@ -37,7 +37,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:layout_marginLeft="50dp">
-        <com.xzjmyk.pm.activity.ui.erp.view.CircleImageView
+        <com.core.widget.CircleImageView
             android:id="@+id/step_photo_im"
             android:layout_width="40dp"
             android:layout_height="40dp"

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepActivity.java

@@ -21,7 +21,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.core.base.BaseActivity;
-import com.lidroid.xutils.ViewUtils;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.calendar.BeforeOrAfterCalendarView;
@@ -44,20 +43,16 @@ import java.util.TimerTask;
  */
 public class NewStepActivity extends BaseActivity implements Handler.Callback {
 
-//    public static String UU_STEP_NOTICE = "UUSTEPNOTICE";
     /**
      * 屏幕长度和宽度
      */
     public static int screenWidth, screenHeight;
-
     private BeforeOrAfterCalendarView calenderView;
-
     private String curSelDate;
     private DecimalFormat df = new DecimalFormat("#.##");
     private List<StepEntity> stepEntityList = new ArrayList<>();
     private StepDataDao stepDataDao;
     private Boolean support_step;
-
     private LinearLayout movementCalenderLl;
     private TextView kmTimeTv;
     private TextView totalKmTv;
@@ -72,7 +67,6 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_newstep);
-        ViewUtils.inject(this);
         initView();
         initData();
     }
@@ -112,9 +106,6 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
             supportTv.setVisibility(View.GONE);
             setDatas();
             setupService();
-//            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 0);
-//            PushManager.resumeWork(MyApplication.getInstance());
-//            Toast.makeText(mContext, "您已开启UU运动", Toast.LENGTH_LONG).show();
             initListener();
         } else {
             totalStepsTv.setText("0");
@@ -138,7 +129,6 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         steps_history_ll.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                Log.i("stepEntity",stepEntity+"");
                 startActivity(new Intent(getApplicationContext(),NewStepListActivity.class));
             }
         });

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

@@ -91,7 +91,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
     private ProgressDialog dialog;
     private RelativeLayout share_rl;
-    private String newStep_service_name = "com.xzjmyk.pm.newpedo.service.StepService";
+    private String newStep_service_name = "com.uas.appme.pedometer.service.StepService";
 
     private PopupWindow setWindow = null;//
 

settings.gradle

@@ -1,5 +1,5 @@
 //主工程
-include ':WeiChat'
+include ':WeiChat', ':uusport'
 
 //核心模块
 include ':network'