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

WeiChat/src/main/AndroidManifest.xml

@@ -334,11 +334,8 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.uas.appme.settings.activity.SettingActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.uas.appme.settings.activity.AboutActivity"/>
+
+
         <activity android:name=".video.VideoRecordActivity"/>
         <activity
             android:name="com.uas.appme.other.activity.CardcastActivity"
@@ -347,7 +344,6 @@
             android:name="com.uas.appme.other.activity.BasicInfoEditActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
         <activity android:name=".CaptureResultActivity"/>
-        <activity android:name=".CommonWebviewActivity"/>
         <!-- Tool Activity -->
         <activity
             android:name=".ui.tool.MultiImagePreviewActivity"
@@ -534,7 +530,7 @@
             android:name=".video.VideoActivity"
             android:theme="@style/Theme.AppCompat.NoActionBar"/>
         <activity android:name=".ui.erp.activity.CompanyActivity"/>
-        <activity android:name="com.uas.appme.settings.activity.BaseInfoActivity"/>
+
         <activity android:name=".ui.circle.PhoneSelectActivity"/>
         <activity android:name=".ui.erp.activity.crm.ClientActivity"/>
         <activity android:name=".ApplySubscribeActivity"/>
@@ -683,9 +679,7 @@
         <activity android:name=".ui.erp.activity.crm.SubsActivity"/>
         <activity android:name="com.uas.appme.other.activity.UpdateSingleTextActivity"/>
         <activity android:name="com.uas.appme.other.activity.UpdateSexActivity"/>
-        <activity
-            android:name="com.uas.appme.settings.activity.FeedbackActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
+
         <activity android:name=".ui.erp.activity.oa.OAActivity"/>
         <activity android:name=".ui.erp.activity.oa.OAMainActivity"/>
 
@@ -734,14 +728,7 @@
             android:configChanges="keyboardHidden|orientation"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name=".ui.erp.activity.oa.SelectActivity"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden">
-            <intent-filter>
-                <action android:name="com.modular.common.SelectActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
+
         <activity
             android:name=".ui.erp.activity.oa.ChangeMobileActivity"
             android:label="@string/change_mobile" />
@@ -995,12 +982,6 @@
         <activity
             android:name=".ui.erp.activity.oa.NavigationActivity"
             android:label="@string/navigation" />
-        <activity android:name="com.uas.appme.pedometer.view.NewStepActivity"
-            android:label="@string/set_sport"></activity>
-        <activity
-            android:name="com.uas.appme.pedometer.view.NewStepListActivity"
-            android:label="@string/sports_recode_more"/>
-           <activity android:name="com.uas.appme.pedometer.view.StepSplashActivity"></activity>
         <!-- 计步功能 服务 -->
         <service
             android:name="com.uas.appme.pedometer.service.StepService"
@@ -1038,7 +1019,6 @@
         <activity
             android:name=".ui.erp.activity.crm.AddBusinessActivity"
             android:label="@string/crm_creat_business"/>
-        <activity android:name="com.uas.appme.settings.activity.SelectLanguageActivity"/>
         <activity android:name=".ui.erp.activity.oa.SearchSelectActivity"/>
         <activity
             android:name=".ui.me.InfoCodeActivity"
@@ -1058,16 +1038,10 @@
         <activity
             android:name=".ui.erp.activity.secretary.BookingAddActivity"
             android:windowSoftInputMode="adjustPan"/>
-        <activity android:name="com.uas.appme.settings.activity.BookingSetActivity"/>
         <activity
-            android:name="com.xzjmyk.pm.pictureselector.PictureSelectorDemo"
+            android:name="com.core.utils.pictureselector.PictureSelectorDemo"
             android:label="PictureSelectorDemo" />
-        <activity
-            android:name="com.xzjmyk.pm.pictureselector.ImgsActivity"
-            android:label="@string/selector_caption" />
-        <activity
-            android:name="com.xzjmyk.pm.pictureselector.ImgFileListActivity"
-            android:label="@string/ablum_list" />
+
         <activity
             android:name="com.xzjmyk.pm.im.audio.FaceRecognition.FaceView.OnlineFaceDemo"
             android:label="在线人脸识别" />
@@ -1080,8 +1054,7 @@
         <activity android:name=".ui.account.RegisterSelectActivity"></activity>
         <activity android:name=".ui.me.TemperatureActivity"></activity>
 
-        <activity android:name="com.core.widget.view.Activity.ImgFileListActivity"></activity>
-        <activity android:name="com.core.widget.view.Activity.ImgsActivity"/>
+        <activity android:name="com.core.selectcalendar.SelectCalendarActivity"/>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/CommonWebviewActivity.java

@@ -1,96 +0,0 @@
-package com.xzjmyk.pm.activity;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.webkit.DownloadListener;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import com.common.file.DownloadUtil;
-
-/**
- * 公共网页打开页面
- * Created by RaoMeng on 2016/9/14.
- */
-public class CommonWebviewActivity extends Activity {
-    private WebView mWebView;
-    private String mUrl;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_common_webview);
-        mWebView = (WebView) findViewById(R.id.webview);
-
-        WebSettings webSettings = mWebView.getSettings();
-        //允许加载JavaScript
-        webSettings.setJavaScriptEnabled(true);
-        //网页自适应屏幕
-        webSettings.setUseWideViewPort(true);
-        webSettings.setLoadWithOverviewMode(true);
-
-        webSettings.setDomStorageEnabled(true);
-        mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                /*view.loadUrl(url);
-                return true;*/
-                return false;
-            }
-        });
-
-        mWebView.setDownloadListener(new DownloadListener() {
-            @Override
-            public void onDownloadStart(final String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
-                Log.d("weburl", url);
-                String fileName = url.substring(url.lastIndexOf("/") + 1);
-
-                // fileName=fileName.split("&")[3].split("=")[1];
-
-                new AlertDialog.Builder(CommonWebviewActivity.this)
-                        .setTitle("提示").setMessage("确定下载文件" + fileName + "吗?")
-                        .setNegativeButton(R.string.cancel, null)
-                        .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                DownloadUtil.DownloadFile(CommonWebviewActivity.this, url, "/sdcard/uu");
-
-                            }
-                        }).create().show();
-
-            }
-        });
-
-        Intent intent = getIntent();
-        mUrl = intent.getStringExtra("scan_url");
-
-        mWebView.loadUrl(mUrl);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (mWebView.canGoBack()) {
-                mWebView.goBack();
-                return true;
-            }
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        //防止WebView加载内存泄漏
-        if (mWebView != null) {
-            mWebView.removeAllViews();
-            mWebView.destroy();
-        }
-    }
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -42,6 +42,8 @@ import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonObjectRequest;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.LoginHelper;
+import com.core.utils.pictureselector.ComPictureAdapter;
+import com.core.widget.view.Activity.ImgFileListActivity;
 import com.core.widget.view.MyGridView;
 import com.core.xmpp.model.Area;
 import com.core.xmpp.utils.AppConstant;
@@ -50,8 +52,6 @@ import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
-import com.xzjmyk.pm.pictureselector.ComPictureAdapter;
-import com.xzjmyk.pm.pictureselector.ImgFileListActivity;
 
 import java.io.File;
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ExpenseReimbursementActivity.java

@@ -57,6 +57,7 @@ import com.core.model.EmployeesEntity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.ToastUtil;
+import com.core.widget.view.Activity.ImgFileListActivity;
 import com.core.widget.view.MyGridView;
 import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.HttpUtils;
@@ -86,7 +87,6 @@ import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.SquareCenterImageView;
-import com.xzjmyk.pm.pictureselector.ImgFileListActivity;
 
 import java.io.File;
 import java.util.ArrayList;

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

@@ -25,11 +25,11 @@ import com.core.base.BaseActivity;
 import com.core.broadcast.MsgBroadcast;
 import com.core.dao.DBManager;
 import com.core.model.B2BMsg;
+import com.core.widget.view.Activity.CommonWebviewActivity;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.CommonWebviewActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/FileTraversal.java

@@ -1,43 +0,0 @@
-package com.xzjmyk.pm.pictureselector;
-import android.annotation.SuppressLint;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-//文件的类
-@SuppressLint("ParcelCreator")
-public class FileTraversal implements Parcelable {
-	public String filename;//所属图片的文件名称
-	public List<String> filecontent=new ArrayList<String>();
-
-	@Override
-	public int describeContents() {
-		return 0;
-	}
-	@Override
-	public void writeToParcel(Parcel dest, int flags) {
-		dest.writeString(filename);
-		dest.writeList(filecontent);
-	}
-
-	public static final Parcelable.Creator<FileTraversal> CREATOR=new Creator<FileTraversal>() {
-
-		@Override
-		public FileTraversal[] newArray(int size) {
-			return null;
-		}
-
-		@Override
-		public FileTraversal createFromParcel(Parcel source) {
-			FileTraversal ft=new FileTraversal();
-			ft.filename= source.readString();
-			ft.filecontent= source.readArrayList(FileTraversal.class.getClassLoader());
-
-			return ft;
-		}
-
-
-	};
-}

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/ImgCallBack.java

@@ -1,8 +0,0 @@
-package com.xzjmyk.pm.pictureselector;
-
-import android.graphics.Bitmap;
-import android.widget.ImageView;
-
-public interface ImgCallBack {
-	public void resultImgCall(ImageView imageView, Bitmap bitmap);
-}

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/ImgFileListActivity.java

@@ -1,98 +0,0 @@
-package com.xzjmyk.pm.pictureselector;
-
-import android.Manifest;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-
-import com.common.system.PermissionUtil;
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class ImgFileListActivity extends BaseActivity implements OnItemClickListener{
-
-	ListView listView;
-	Util util;
-	ImgFileListAdapter listAdapter;
-	List<FileTraversal> locallist;
-	private int max_size;
-	private int current_size;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.imgfilelist);
-		listView=(ListView) findViewById(R.id.listView1);
-		initView();
-		initData();
-	}
-
-	private void initData() {
-		Intent intent = getIntent();
-		max_size = intent.getIntExtra("MAX_SIZE",9);
-		current_size = intent.getIntExtra("CURRENT_SIZE",0);
-	}
-
-	private void initView() {
-		util=new Util(this);
-		locallist=util.LocalImgFileList();
-		List<HashMap<String, String>> listdata=new ArrayList<HashMap<String,String>>();
-		Bitmap bitmap[] = null;
-		if (locallist!=null) {
-			bitmap=new Bitmap[locallist.size()];
-			for (int i = 0; i < locallist.size(); i++) {
-				HashMap<String, String> map=new HashMap<String, String>();
-				map.put("filecount", locallist.get(i).filecontent.size()+"张");
-				map.put("imgpath", locallist.get(i).filecontent.get(0)==null?null:(locallist.get(i).filecontent.get(0)));
-				map.put("filename", locallist.get(i).filename);
-				listdata.add(map);
-			}
-		}
-		listAdapter=new ImgFileListAdapter(this, listdata);
-		listView.setAdapter(listAdapter);
-		listView.setOnItemClickListener(this);
-	}
-
-	@Override
-	public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-		Intent intent=new Intent(this,ImgsActivity.class);
-		Bundle bundle=new Bundle();
-		bundle.putInt("MAX_SIZE",max_size);
-		bundle.putInt("CURRENT_SIZE",current_size);
-		bundle.putParcelable("data", locallist.get(arg2));
-		intent.putExtras(bundle);
-		startActivityForResult(intent,0x06);
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (requestCode == 0x06 && resultCode == 0x03 && data != null){
-			Intent intent = new Intent();
-			intent.putExtra("files",data.getStringArrayListExtra("files"));
-			Log.i("files0x02",data.getStringArrayListExtra("files").toString());
-			setResult(0x02,intent);
-			finish();
-		}
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
-		for (String permission : permissions) {
-			if (PermissionUtil.lacksPermissions(ct, permission)) {
-				PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
-			}
-		}
-	}
-}

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/ImgsActivity.java

@@ -1,176 +0,0 @@
-package com.xzjmyk.pm.pictureselector;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
-import android.widget.RelativeLayout;
-
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.common.data.ListUtils;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class ImgsActivity extends BaseActivity {
-
-	Bundle bundle;
-	FileTraversal fileTraversal;
-	GridView imgGridView;
-	ImgsAdapter imgsAdapter;
-	LinearLayout select_layout;
-	Util util;
-	RelativeLayout relativeLayout2;
-	HashMap<Integer, ImageView> hashImage;
-	Button choise_button;
-	ArrayList<String> filelist;
-	private int max_size;
-	private int current_size;
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.photogrally);
-
-		imgGridView=(GridView) findViewById(R.id.gridView1);
-		bundle= getIntent().getExtras();
-		fileTraversal=bundle.getParcelable("data");
-		max_size = bundle.getInt("MAX_SIZE");
-		current_size = bundle.getInt("CURRENT_SIZE");
-		imgsAdapter=new ImgsAdapter(this, fileTraversal.filecontent,onItemClickClass);
-		imgGridView.setAdapter(imgsAdapter);
-		select_layout=(LinearLayout) findViewById(R.id.selected_image_layout);
-		relativeLayout2=(RelativeLayout) findViewById(R.id.relativeLayout2);
-		choise_button=(Button) findViewById(R.id.button3);
-		hashImage=new HashMap<Integer, ImageView>();
-		filelist=new ArrayList<String>();
-//		imgGridView.setOnItemClickListener(this);
-		util=new Util(this);
-	}
-
-	class BottomImgIcon implements OnItemClickListener{
-
-		int index;
-		public BottomImgIcon(int index) {
-			this.index=index;
-		}
-
-		@Override
-		public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
-				long arg3) {
-
-		}
-	}
-
-	@SuppressLint("NewApi")
-	public ImageView iconImage(String filepath,int index,CheckBox checkBox) throws FileNotFoundException{
-		LayoutParams params=new LayoutParams(relativeLayout2.getMeasuredHeight()-10, relativeLayout2.getMeasuredHeight()-10);
-		ImageView imageView=new ImageView(this);
-		imageView.setLayoutParams(params);
-//		imageView.setBackgroundResource(R.drawable.imgbg);
-		int alpha=100;
-		imageView.setAlpha(alpha);
-		util.imgExcute(imageView, imgCallBack, filepath);
-		imageView.setOnClickListener(new ImgOnclick(filepath,checkBox));
-		return imageView;
-	}
-
-	ImgCallBack imgCallBack=new ImgCallBack() {
-		@Override
-		public void resultImgCall(ImageView imageView, Bitmap bitmap) {
-			imageView.setImageBitmap(bitmap);
-		}
-	};
-
-	class ImgOnclick implements OnClickListener{
-		String filepath;
-		CheckBox checkBox;
-		public ImgOnclick(String filepath,CheckBox checkBox) {
-			this.filepath=filepath;
-			this.checkBox=checkBox;
-		}
-		@Override
-		public void onClick(View arg0) {
-			checkBox.setChecked(false);
-			select_layout.removeView(arg0);
-			choise_button.setText("已选择("+select_layout.getChildCount()+")张");
-			filelist.remove(filepath);
-		}
-	}
-
-	ImgsAdapter.OnItemClickClass onItemClickClass=new ImgsAdapter.OnItemClickClass() {
-		@Override
-		public void OnItemClick(View v, int Position, CheckBox checkBox) {
-			String filapath=fileTraversal.filecontent.get(Position);
-			if (checkBox.isChecked()) {
-				checkBox.setChecked(false);
-				select_layout.removeView(hashImage.get(Position));
-				filelist.remove(filapath);
-				choise_button.setText("已选择("+select_layout.getChildCount()+")张");
-			}else {
-				if (select_layout.getChildCount() > max_size -1 || select_layout.getChildCount() > max_size - current_size -1){
-					ToastMessage("您当前最多可选"+(max_size - current_size)+"张图片");
-					return;
-				}else {
-					try {
-						checkBox.setChecked(true);
-						Log.i("img", "img choise position->"+Position);
-						ImageView imageView=iconImage(filapath, Position,checkBox);
-						if (imageView !=null) {
-							hashImage.put(Position, imageView);
-							filelist.add(filapath);
-							select_layout.addView(imageView);
-							choise_button.setText("已选择("+select_layout.getChildCount()+"张");
-						}
-					} catch (FileNotFoundException e) {
-						e.printStackTrace();
-					}
-				}
-
-			}
-		}
-	};
-
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.back_sure, menu);
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.sure:
-				if (!ListUtils.isEmpty(filelist)){
-					Intent intent = new Intent();
-					intent.putExtra("files",filelist);
-					Log.i("files0x03",filelist.toString());
-					setResult(0x03,intent);
-					finish();
-				}else {
-					ToastMessage(getString(R.string.please_add_image));
-				}
-				break;
-			case android.R.id.home:
-				onBackPressed();
-				break;
-
-		}
-		return true;
-	}
-}

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/Util.java

@@ -1,169 +0,0 @@
-package com.xzjmyk.pm.pictureselector;
-
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.MediaStore;
-import android.widget.ImageView;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-public class Util {
-
-	Context context;
-
-	public Util(Context context) {
-		this.context=context;
-	}
-
-	/**
-	 * 获取全部图片地址
-	 * @return
-	 */
-	public ArrayList<String>  listAlldir(){
-		Intent intent = new Intent(Intent.ACTION_PICK,android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-		Uri uri = intent.getData();
-		ArrayList<String> list = new ArrayList<String>();
-		String[] proj ={MediaStore.Images.Media.DATA};
-		Cursor cursor = context.getContentResolver().query(uri, proj, null, null, null);//managedQuery(uri, proj, null, null, null);
-		while(cursor.moveToNext()){
-			String path =cursor.getString(0);
-			list.add(new File(path).getAbsolutePath());
-		}
-		return list;
-	}
-
-	public List<FileTraversal> LocalImgFileList(){
-		List<FileTraversal> data=new ArrayList<FileTraversal>();
-		String filename="";
-		List<String> allimglist=listAlldir();
-		List<String> retulist=new ArrayList<String>();
-		if (allimglist!=null) {
-			Set set = new TreeSet();
-			String []str;
-			for (int i = 0; i < allimglist.size(); i++) {
-				retulist.add(getfileinfo(allimglist.get(i)));
-			}
-			for (int i = 0; i < retulist.size(); i++) {
-				set.add(retulist.get(i));
-			}
-			str= (String[]) set.toArray(new String[0]);
-			for (int i = 0; i < str.length; i++) {
-				filename=str[i];
-				FileTraversal ftl= new FileTraversal();
-				ftl.filename=filename;
-				data.add(ftl);
-			}
-
-			for (int i = 0; i < data.size(); i++) {
-				for (int j = 0; j < allimglist.size(); j++) {
-					if (data.get(i).filename.equals(getfileinfo(allimglist.get(j)))) {
-						data.get(i).filecontent.add(allimglist.get(j));
-					}
-				}
-			}
-		}
-		return data;
-	}
-
-	//显示原生图片尺寸大小
-	public Bitmap getPathBitmap(Uri imageFilePath,int dw,int dh)throws FileNotFoundException{
-		//获取屏幕的宽和高
-		/**
-		 * 为了计算缩放的比例，我们需要获取整个图片的尺寸，而不是图片
-		 * BitmapFactory.Options类中有一个布尔型变量inJustDecodeBounds，将其设置为true
-		 * 这样，我们获取到的就是图片的尺寸，而不用加载图片了。
-		 * 当我们设置这个值的时候，我们接着就可以从BitmapFactory.Options的outWidth和outHeight中获取到值
-		 */
-		BitmapFactory.Options op = new BitmapFactory.Options();
-		op.inJustDecodeBounds = true;
-		//由于使用了MediaStore存储，这里根据URI获取输入流的形式
-		Bitmap pic = BitmapFactory.decodeStream(context.getContentResolver().openInputStream(imageFilePath),
-				null, op);
-
-		int wRatio = (int) Math.ceil(op.outWidth / (float) dw); //计算宽度比例
-		int hRatio = (int) Math.ceil(op.outHeight / (float) dh); //计算高度比例
-
-		/**
-		 * 接下来，我们就需要判断是否需要缩放以及到底对宽还是高进行缩放。
-		 * 如果高和宽不是全都超出了屏幕，那么无需缩放。
-		 * 如果高和宽都超出了屏幕大小，则如何选择缩放呢》
-		 * 这需要判断wRatio和hRatio的大小
-		 * 大的一个将被缩放，因为缩放大的时，小的应该自动进行同比率缩放。
-		 * 缩放使用的还是inSampleSize变量
-		 */
-		if (wRatio > 1 && hRatio > 1) {
-			if (wRatio > hRatio) {
-				op.inSampleSize = wRatio;
-			} else {
-				op.inSampleSize = hRatio;
-			}
-		}
-		op.inJustDecodeBounds = false; //注意这里，一定要设置为false，因为上面我们将其设置为true来获取图片尺寸了
-		pic = BitmapFactory.decodeStream(context.getContentResolver()
-				.openInputStream(imageFilePath), null, op);
-
-		return pic;
-	}
-
-	public String getfileinfo(String data){
-		String filename[]= data.split("/");
-		if (filename!=null) {
-			return filename[filename.length-2];
-		}
-		return null;
-	}
-
-	public void imgExcute(ImageView imageView,ImgCallBack icb, String... params){
-		LoadBitAsynk loadBitAsynk=new LoadBitAsynk(imageView,icb);
-		loadBitAsynk.execute(params);
-	}
-
-	public class LoadBitAsynk extends AsyncTask<String, Integer, Bitmap>{
-
-		ImageView imageView;
-		ImgCallBack icb;
-
-		LoadBitAsynk(ImageView imageView,ImgCallBack icb){
-			this.imageView=imageView;
-			this.icb=icb;
-		}
-
-		@Override
-		protected Bitmap doInBackground(String... params) {
-			Bitmap bitmap=null;
-			try {
-				if (params!=null) {
-					for (int i = 0; i < params.length; i++) {
-						bitmap=getPathBitmap(Uri.fromFile(new File(params[i])), 200, 200);
-					}
-				}
-			} catch (FileNotFoundException e) {
-				e.printStackTrace();
-			}
-
-			return bitmap;
-		}
-
-		@Override
-		protected void onPostExecute(Bitmap result) {
-			super.onPostExecute(result);
-			if (result!=null) {
-//				imageView.setImageBitmap(result);
-				icb.resultImgCall(imageView, result);
-			}
-		}
-
-
-	}
-
-}

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

@@ -10,7 +10,7 @@
     android:background="@drawable/selector_me_menu_item_bg"
     android:layout_height="wrap_content">
 
-    <com.core.widget.view
+    <com.core.widget.view.SmoothCheckBox
         android:id="@+id/cb_left"
         android:layout_width="20dp"
         android:layout_height="20dp"

app_core/common/src/main/AndroidManifest.xml

@@ -2,4 +2,18 @@
     package="com.core.app"
     android:versionCode="111"
     android:versionName="5.8.9">
+
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+
+
+        <activity android:name="com.core.widget.view.Activity.CommonWebviewActivity"/>
+        <activity android:name="com.core.widget.view.Activity.ImgFileListActivity"/>
+        <activity android:name="com.core.utils.pictureselector.ImgsActivity"
+            android:label="@string/selector_caption"/>
+
+    </application>
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/ComPictureAdapter.java → app_core/common/src/main/java/com/core/utils/pictureselector/ComPictureAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.pictureselector;
+package com.core.utils.pictureselector;
 
 import android.content.Context;
 import android.net.Uri;
@@ -9,9 +9,9 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.core.app.R;
+import com.core.widget.SquareCenterImageView;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.view.SquareCenterImageView;
 
 import java.io.File;
 import java.util.ArrayList;

app_core/common/src/main/java/com/core/utils/pictureselect/FileTraversal.java → app_core/common/src/main/java/com/core/utils/pictureselector/FileTraversal.java

@@ -1,4 +1,4 @@
-package com.core.utils.pictureselect;
+package com.core.utils.pictureselector;
 import android.annotation.SuppressLint;
 import android.os.Parcel;
 import android.os.Parcelable;

app_core/common/src/main/java/com/core/utils/pictureselect/ImgCallBack.java → app_core/common/src/main/java/com/core/utils/pictureselector/ImgCallBack.java

@@ -1,4 +1,4 @@
-package com.core.utils.pictureselect;
+package com.core.utils.pictureselector;
 
 import android.graphics.Bitmap;
 import android.widget.ImageView;

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/ImgFileListAdapter.java → app_core/common/src/main/java/com/core/utils/pictureselector/ImgFileListAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.pictureselector;
+package com.core.utils.pictureselector;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -9,7 +9,8 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
+
+import com.core.app.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_core/common/src/main/java/com/core/widget/view/Activity/ImgsActivity.java → app_core/common/src/main/java/com/core/utils/pictureselector/ImgsActivity.java

@@ -1,4 +1,4 @@
-package com.core.widget.view.Activity;
+package com.core.utils.pictureselector;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -22,10 +22,6 @@ import android.widget.RelativeLayout;
 import com.common.data.ListUtils;
 import com.core.app.R;
 import com.core.base.BaseActivity;
-import com.core.utils.pictureselect.FileTraversal;
-import com.core.utils.pictureselect.ImgCallBack;
-import com.core.utils.pictureselect.Util;
-import com.core.widget.view.adapter.ImgsAdapter;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -158,7 +154,7 @@ public class ImgsActivity extends BaseActivity {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == R.id.sure){
+		if (item.getItemId() ==  R.id.sure){
 			if (!ListUtils.isEmpty(filelist)){
 				Intent intent = new Intent();
 				intent.putExtra("files",filelist);
@@ -168,8 +164,9 @@ public class ImgsActivity extends BaseActivity {
 			}else {
 				ToastMessage(getString(R.string.please_add_image));
 			}
-		}else if (item.getItemId() == android.R.id.home){
+		}else if (item.getItemId() ==  android.R.id.home){
 			onBackPressed();
+
 		}
 		return true;
 	}

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/ImgsAdapter.java → app_core/common/src/main/java/com/core/utils/pictureselector/ImgsAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.pictureselector;
+package com.core.utils.pictureselector;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -10,7 +10,8 @@ import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 
-import com.xzjmyk.pm.activity.R;
+
+import com.core.app.R;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/PictureSelectorDemo.java → app_core/common/src/main/java/com/core/utils/pictureselector/PictureSelectorDemo.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.pictureselector;
+package com.core.utils.pictureselector;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -13,14 +13,14 @@ import android.widget.Toast;
 
 import com.common.ui.CameraUtil;
 import com.core.app.MyApplication;
+import com.core.app.R;
 import com.core.base.BaseActivity;
 import com.core.utils.ToastUtil;
+import com.core.widget.view.Activity.ImgFileListActivity;
+import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.core.widget.view.MyGridView;
 import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,7 +31,6 @@ import java.util.ArrayList;
  */
 
 public class PictureSelectorDemo extends BaseActivity {
-    @ViewInject(R.id.grid_view)
     private MyGridView grid_view;
     private ArrayList<String> mPhotoList;
     private ComPictureAdapter mAdapter;
@@ -83,6 +82,8 @@ public class PictureSelectorDemo extends BaseActivity {
     }
 
     private void initView() {
+
+        grid_view = (MyGridView) findViewById(R.id.grid_view);
         mPhotoList = new ArrayList<>();
         mAdapter = new ComPictureAdapter(this);
         mAdapter.setmPhotoList(mPhotoList);

app_core/common/src/main/java/com/core/utils/pictureselect/Util.java → app_core/common/src/main/java/com/core/utils/pictureselector/Util.java

@@ -1,4 +1,4 @@
-package com.core.utils.pictureselect;
+package com.core.utils.pictureselector;
 
 import android.content.Context;
 import android.content.Intent;

app_core/common/src/main/java/com/core/widget/view/Activity/ImgFileListActivity.java

@@ -13,8 +13,9 @@ import android.widget.ListView;
 import com.common.system.PermissionUtil;
 import com.core.app.R;
 import com.core.base.BaseActivity;
-import com.core.utils.pictureselect.FileTraversal;
-import com.core.utils.pictureselect.Util;
+import com.core.utils.pictureselector.FileTraversal;
+import com.core.utils.pictureselector.ImgsActivity;
+import com.core.utils.pictureselector.Util;
 import com.core.widget.view.adapter.ImgFileListAdapter;
 
 import java.util.ArrayList;

app_core/common/src/main/java/com/core/widget/view/adapter/ImgFileListAdapter.java

@@ -10,8 +10,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.core.app.R;
-import com.core.utils.pictureselect.ImgCallBack;
-import com.core.utils.pictureselect.Util;
+import com.core.utils.pictureselector.ImgCallBack;
+import com.core.utils.pictureselector.Util;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_core/common/src/main/java/com/core/widget/view/adapter/ImgsAdapter.java

@@ -1,121 +0,0 @@
-package com.core.widget.view.adapter;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-
-import com.core.app.R;
-import com.core.utils.pictureselect.ImgCallBack;
-import com.core.utils.pictureselect.Util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ImgsAdapter extends BaseAdapter {
-
-	Context context;
-	List<String> data;
-	public Bitmap bitmaps[];
-	Util util;
-	OnItemClickClass onItemClickClass;
-	private int index=-1;
-	
-	List<View> holderlist;
-	public ImgsAdapter(Context context,List<String> data,OnItemClickClass onItemClickClass) {
-		this.context=context;
-		this.data=data;
-		this.onItemClickClass=onItemClickClass;
-		bitmaps=new Bitmap[data.size()];
-		util=new Util(context);
-		holderlist=new ArrayList<View>();
-	}
-	
-	@Override
-	public int getCount() {
-		return data.size();
-	}
-
-	@Override
-	public Object getItem(int arg0) {
-		return data.get(arg0);
-	}
-
-	@Override
-	public long getItemId(int arg0) {
-		return arg0;
-	}
-	
-	public void setIndex(int index) {
-		this.index = index;
-	}
-
-	@Override
-	public View getView(int arg0, View arg1, ViewGroup arg2) {
-		Holder holder;
-		if (arg0 != index && arg0 > index) {
-			index=arg0;
-			arg1=LayoutInflater.from(context).inflate(R.layout.imgsitem, null);
-			holder=new Holder();
-			holder.imageView=(ImageView) arg1.findViewById(R.id.imageView1);
-			holder.checkBox=(CheckBox) arg1.findViewById(R.id.checkBox1);
-			arg1.setTag(holder);
-			holderlist.add(arg1);
-		}else {
-			holder= (Holder)holderlist.get(arg0).getTag();
-			arg1=holderlist.get(arg0);
-		}
-		if (bitmaps[arg0] == null) {
-			util.imgExcute(holder.imageView,new ImgClallBackLisner(arg0), data.get(arg0));
-		}
-		else {
-			holder.imageView.setImageBitmap(bitmaps[arg0]);
-		}
-		arg1.setOnClickListener(new OnPhotoClick(arg0, holder.checkBox));
-		return arg1;
-	}
-	
-	class Holder{
-		ImageView imageView;
-		CheckBox checkBox;
-	}
-
-	public class ImgClallBackLisner implements ImgCallBack {
-		int num;
-		public ImgClallBackLisner(int num) {
-			this.num=num;
-		}
-		
-		@Override
-		public void resultImgCall(ImageView imageView, Bitmap bitmap) {
-			bitmaps[num]=bitmap;
-			imageView.setImageBitmap(bitmap);
-		}
-	}
-
-	public interface OnItemClickClass{
-		public void OnItemClick(View v, int Position, CheckBox checkBox);
-	}
-	
-	class OnPhotoClick implements OnClickListener{
-		int position;
-		CheckBox checkBox;
-		
-		public OnPhotoClick(int position,CheckBox checkBox) {
-			this.position=position;
-			this.checkBox=checkBox;
-		}
-		@Override
-		public void onClick(View v) {
-			if (data!=null && onItemClickClass!=null ) {
-				onItemClickClass.OnItemClick(v, position, checkBox);
-			}
-		}
-	}
-	
-}

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

@@ -10,7 +10,7 @@
     android:background="@drawable/selector_me_menu_item_bg"
     android:layout_height="wrap_content">
 
-    <com.core.widget.view
+    <com.core.widget.view.SmoothCheckBox
         android:id="@+id/cb_left"
         android:layout_width="20dp"
         android:layout_height="20dp"

app_modular/appme/src/main/AndroidManifest.xml

@@ -7,6 +7,25 @@
         android:label="@string/app_name"
         android:supportsRtl="true">
 
+        <activity android:name="com.uas.appme.pedometer.view.NewStepActivity"
+            android:label="@string/set_sport"></activity>
 
-</application>
+        <activity
+            android:name="com.uas.appme.pedometer.view.NewStepListActivity"
+            android:label="@string/sports_recode_more"/>
+        <activity android:name="com.uas.appme.pedometer.view.StepSplashActivity"></activity>
+
+        <activity android:name="com.uas.appme.settings.activity.AboutActivity"/>
+        <activity android:name="com.uas.appme.settings.activity.BaseInfoActivity"/>
+        <activity android:name="com.uas.appme.settings.activity.BookingSetActivity"/>
+        <activity
+            android:name="com.uas.appme.settings.activity.FeedbackActivity"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
+
+        <activity android:name="com.uas.appme.settings.activity.SelectLanguageActivity"/>
+        <activity
+            android:name="com.uas.appme.settings.activity.SettingActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:screenOrientation="portrait"/>
+    </application>
 </manifest>

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

@@ -60,6 +60,14 @@ public class NewStepListActivity extends BaseActivity {
         showNotice();
     }
     private void initView() {
+
+        step_num_lv = (MyListView) findViewById(R.id.step_num_lv);
+        steps_history_tv = (TextView) findViewById(R.id.steps_history_tv);
+        step_ll = (LinearLayout) findViewById(R.id.steps_history_ll);
+        step_photo_im = (CircleImageView) findViewById(R.id.step_photo_im);
+        step_name_tv = (TextView) findViewById(R.id.step_name_tv);
+        step_em_ll = (LinearLayout) findViewById(R.id.step_em_ll);
+
         muuStepNumAdapter = new UuStepNumAdapter();
         stepEntityList = new ArrayList<>();
         steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
@@ -72,12 +80,7 @@ public class NewStepListActivity extends BaseActivity {
         step_ll.setVisibility(View.GONE);
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
         manager = new DBManager(this);
-        step_num_lv = (MyListView) findViewById(R.id.step_num_lv);
-        steps_history_tv = (TextView) findViewById(R.id.steps_history_tv);
-        step_ll = (LinearLayout) findViewById(R.id.steps_history_ll);
-        step_photo_im = (CircleImageView) findViewById(R.id.step_photo_im);
-        step_name_tv = (TextView) findViewById(R.id.step_name_tv);
-        step_em_ll = (LinearLayout) findViewById(R.id.step_em_ll);
+
     }
     private void showNotice() {
         new AlertDialog.Builder(mContext)