Browse Source

语音图标修改

FANGLH 9 years ago
parent
commit
e165d687f2
24 changed files with 35 additions and 31 deletions
  1. 2 2
      MPAndroidChart/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
  2. 1 1
      MPAndroidChart/src/main/java/com/github/mikephil/charting/data/CandleDataSet.java
  3. 1 1
      MPAndroidChart/src/main/java/com/github/mikephil/charting/matrix/Vector3.java
  4. 1 1
      MPAndroidChart/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java
  5. 1 1
      MPAndroidChart/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.java
  6. 1 1
      WeiChat/build.gradle
  7. 1 1
      WeiChat/src/main/java/com/ipaulpro/afilechooser/FileChooserActivity.java
  8. 1 1
      WeiChat/src/main/java/com/ipaulpro/afilechooser/FileListAdapter.java
  9. 1 1
      WeiChat/src/main/java/com/ipaulpro/afilechooser/FileLoader.java
  10. 1 1
      WeiChat/src/main/java/com/ipaulpro/afilechooser/LocalStorageProvider.java
  11. 3 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyAddActivity.java
  12. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyShowActivity.java
  13. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/ContactFragment.java
  14. 6 3
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java
  15. 2 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SignSeniorSettingActivity.java
  16. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
  17. BIN
      WeiChat/src/main/res/drawable-hdpi/btn_yuyin_nor.png
  18. BIN
      WeiChat/src/main/res/drawable-xhdpi/btn_yuyin_nor.png
  19. BIN
      WeiChat/src/main/res/drawable-xxhdpi/btn_yuyin_nor.png
  20. 3 3
      WeiChat/src/main/res/layout/activity_add_work_daily.xml
  21. 3 3
      libedittextformlibrary/src/main/java/com/andreabaccega/formedittextvalidator/DomainValidator.java
  22. 3 3
      libedittextformlibrary/src/main/java/com/andreabaccega/formedittextvalidator/WebUrlValidator.java
  23. 0 1
      library-swipemenu_lv/src/main/java/com/baoyz/swipemenulistview/SwipeMenuLayout.java
  24. 1 1
      pullToRefershLibraryMy/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java

+ 2 - 2
MPAndroidChart/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java

@@ -400,13 +400,13 @@ public abstract class PieRadarChartBase<T extends ChartData<? extends DataSet<?
 
     @Override
     public float getYChartMax() {
-        // TODO Auto-generated method stub
+        // Auto-generated method stub
         return 0;
     }
 
     @Override
     public float getYChartMin() {
-        // TODO Auto-generated method stub
+        // Auto-generated method stub
         return 0;
     }
 

+ 1 - 1
MPAndroidChart/src/main/java/com/github/mikephil/charting/data/CandleDataSet.java

@@ -134,7 +134,7 @@ public class CandleDataSet extends BarLineScatterCandleDataSet<CandleEntry> {
         return mShadowWidth;
     }
 
-    // TODO
+    //
     /**
      * It is necessary to implement ColorsList class that will encapsulate
      * colors list functionality, because It's wrong to copy paste setColor,

+ 1 - 1
MPAndroidChart/src/main/java/com/github/mikephil/charting/matrix/Vector3.java

@@ -115,7 +115,7 @@ public final class Vector3 {
     public final float normalize() {
         final float magnitude = length();
 
-        // TODO: I'm choosing safety over speed here.
+        //  I'm choosing safety over speed here.
         if (magnitude != 0.0f) {
             x /= magnitude;
             y /= magnitude;

+ 1 - 1
MPAndroidChart/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.java

@@ -80,7 +80,7 @@ public class PieChartRenderer extends DataRenderer {
 
     @Override
     public void initBuffers() {
-        // TODO Auto-generated method stub
+        //  Auto-generated method stub
 
     }
 

+ 1 - 1
MPAndroidChart/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.java

@@ -45,7 +45,7 @@ public class RadarChartRenderer extends DataRenderer {
 
     @Override
     public void initBuffers() {
-        // TODO Auto-generated method stub
+        //Auto-generated method stub
         
     }
     

+ 1 - 1
WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UUAPP/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 1 - 1
WeiChat/src/main/java/com/ipaulpro/afilechooser/FileChooserActivity.java

@@ -43,7 +43,7 @@ import java.io.File;
  * @包名: com.ipaulpro.afilechooser
  * @作者:王阳
  * @创建时间: 2015年10月12日 上午9:25:39
- * @描述: TODO
+ * @描述:
  * @SVN版本号: $Rev: 2143 $
  * @修改人: $Author: luorc $
  * @修改时间: $Date: 2015-10-23 09:31:46 +0800 (Fri, 23 Oct 2015) $

+ 1 - 1
WeiChat/src/main/java/com/ipaulpro/afilechooser/FileListAdapter.java

@@ -35,7 +35,7 @@ import java.util.List;
  * @包名: com.ipaulpro.afilechooser
  * @作者:王阳
  * @创建时间: 2015年10月12日 上午9:26:33
- * @描述: TODO
+ * @描述:
  * @SVN版本号: $Rev: 2143 $
  * @修改人: $Author: luorc $
  * @修改时间: $Date: 2015-10-23 09:31:46 +0800 (Fri, 23 Oct 2015) $

+ 1 - 1
WeiChat/src/main/java/com/ipaulpro/afilechooser/FileLoader.java

@@ -31,7 +31,7 @@ import java.util.List;
  * @包名: com.ipaulpro.afilechooser
  * @作者:王阳
  * @创建时间: 2015年10月12日 上午9:27:12
- * @描述: TODO
+ * @描述:
  * @SVN版本号: $Rev: 2143 $
  * @修改人: $Author: luorc $
  * @修改时间: $Date: 2015-10-23 09:31:46 +0800 (Fri, 23 Oct 2015) $

+ 1 - 1
WeiChat/src/main/java/com/ipaulpro/afilechooser/LocalStorageProvider.java

@@ -31,7 +31,7 @@ import java.io.IOException;
  * @包名: com.ianhanniballake.localstorage
  * @作者:王阳
  * @创建时间: 2015年10月12日 上午9:24:21
- * @描述: TODO
+ * @描述:
  * @SVN版本号: $Rev: 2143 $
  * @修改人: $Author: luorc $
  * @修改时间: $Date: 2015-10-23 09:31:46 +0800 (Fri, 23 Oct 2015) $

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyAddActivity.java

@@ -229,7 +229,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         voice_summary.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                voice_summary.setImageResource(R.drawable.btn_yuyin_pressed);
+//                voice_summary.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice_type = 1;
                 voice.GetWordFromVoice();
             }
@@ -238,7 +238,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         voice_plan.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                voice_plan.setImageResource(R.drawable.btn_yuyin_pressed);
+//                voice_plan.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice_type = 2;
                 voice.GetWordFromVoice();
             }
@@ -247,7 +247,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         voice_experience.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                voice_experience.setImageResource(R.drawable.btn_yuyin_pressed);
+//                voice_experience.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice_type = 3;
                 voice.GetWordFromVoice();
             }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyShowActivity.java

@@ -101,7 +101,7 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
         voice_search.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                voice_search.setImageResource(R.drawable.btn_yuyin_pressed);
+//                voice_search.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice.GetWordFromVoice();
             }
         });

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/ContactFragment.java

@@ -210,7 +210,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         voice_search.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                voice_search.setImageResource(R.drawable.btn_yuyin_pressed);
+//                voice_search.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice.GetWordFromVoice();
             }
         });

+ 6 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java

@@ -123,6 +123,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             ToastMessage(msg.getData().getString("result"));
                         }
+                        progressDialog.dismiss();
                     }
                     break;
             }
@@ -228,7 +229,6 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
 
     private void clickEvent(){
         sign_range.setOnClickListener(new View.OnClickListener() {
-
             @Override
             public void onClick(View v) {
                 String[] distance = getResources().getStringArray(R.array.sign_distance);
@@ -245,6 +245,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
                 doSelectRange(distance, requestCode);
             }
         });
+
         add_address.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -358,6 +359,8 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
         myadapter.setAddress_names(address_names);
         myadapter.notifyDataSetChanged();
     }
+
+    //地点显示列表适配器
     public class OfficeAddressAdapter extends BaseAdapter{
         private OfficeAddressBean mOfficeAddressBean;
         private List<String> address_names;
@@ -406,11 +409,11 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
                 viewHolder = (ViewHolder) convertView.getTag();
             }
 
-            //ToDo 带回地址的显示
+            // 带回地址的显示
             if (!ListUtils.isEmpty(address_names) && !TextUtils.isEmpty(address_names.get(position))){
                 viewHolder.item_address_tv.setText(address_names.get(position));
             }
-            //TODo 地址的删除操作
+            // 地址的删除操作
             viewHolder.office_address_delete_im.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SignSeniorSettingActivity.java

@@ -93,6 +93,7 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
                         }else {
                             Toast.makeText(ct,"保存失败",Toast.LENGTH_LONG).show();
                         }
+                        progressDialog.dismiss();
                     }
 
                     break;
@@ -253,6 +254,7 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
 
     //保存操作
     private void doSaveSeniorSetting() {
+        progressDialog.show();
         String latetime = CommonUtil.getNumByString(late_time_tv.getText().toString()) + "";
         String seniouslatetime = CommonUtil.getNumByString(serious_late_time_tv.getText().toString()) + "" ;
         String leaveearlytime = CommonUtil.getNumByString(leave_early_tv.getText().toString()) + "";

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

@@ -235,7 +235,7 @@ public class MessageFragment extends EasyFragment implements RecognizerDialogLis
         voice_search.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                voice_search.setImageResource(R.drawable.btn_yuyin_pressed);
+//                voice_search.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice.GetWordFromVoice();
             }
         });

BIN
WeiChat/src/main/res/drawable-hdpi/btn_yuyin_nor.png


BIN
WeiChat/src/main/res/drawable-xhdpi/btn_yuyin_nor.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/btn_yuyin_nor.png


+ 3 - 3
WeiChat/src/main/res/layout/activity_add_work_daily.xml

@@ -51,7 +51,7 @@
                         android:id="@+id/voice_summary_iv"
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:background="@drawable/btn_yuyin_nor"
+                        android:src="@drawable/btn_yuyin_nor"
                         android:layout_gravity="right"
                         android:visibility="visible"
                         android:layout_marginRight="20dp"
@@ -104,7 +104,7 @@
                         android:id="@+id/voice_plan_iv"
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:background="@drawable/btn_yuyin_nor"
+                        android:src="@drawable/btn_yuyin_nor"
                         android:layout_gravity="right"
                         android:visibility="visible"
                         android:layout_marginRight="20dp"
@@ -156,7 +156,7 @@
                         android:id="@+id/voice_experience_iv"
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:background="@drawable/btn_yuyin_nor"
+                        android:src="@drawable/btn_yuyin_nor"
                         android:layout_gravity="right"
                         android:visibility="visible"
                         android:layout_marginRight="10dp"

+ 3 - 3
libedittextformlibrary/src/main/java/com/andreabaccega/formedittextvalidator/DomainValidator.java

@@ -1,13 +1,13 @@
 package com.andreabaccega.formedittextvalidator;
 
-import java.util.regex.Pattern;
-
 import android.os.Build;
 import android.util.Patterns;
 
+import java.util.regex.Pattern;
+
 public class DomainValidator extends PatternValidator{
 	public DomainValidator(String _customErrorMessage) {
-		//TODO: Fix the pattern for api level < 8
+		// Fix the pattern for api level < 8
 		super(_customErrorMessage, Build.VERSION.SDK_INT>=8?Patterns.DOMAIN_NAME:Pattern.compile(".*"));
 	}
 }

+ 3 - 3
libedittextformlibrary/src/main/java/com/andreabaccega/formedittextvalidator/WebUrlValidator.java

@@ -1,10 +1,10 @@
 package com.andreabaccega.formedittextvalidator;
 
-import java.util.regex.Pattern;
-
 import android.os.Build;
 import android.util.Patterns;
 
+import java.util.regex.Pattern;
+
 /**
  * Validates a web url in the format:
  * scheme + authority + path
@@ -13,7 +13,7 @@ import android.util.Patterns;
  */
 public class WebUrlValidator extends PatternValidator { 
 	public WebUrlValidator(String _customErrorMessage) {
-		//TODO: Fix the pattern for api level < 8
+		// Fix the pattern for api level < 8
 		super(_customErrorMessage, Build.VERSION.SDK_INT>=8?Patterns.WEB_URL:Pattern.compile(".*"));
 	}
 }

+ 0 - 1
library-swipemenu_lv/src/main/java/com/baoyz/swipemenulistview/SwipeMenuLayout.java

@@ -102,7 +102,6 @@ public class SwipeMenuLayout extends FrameLayout {
 			@Override
 			public boolean onFling(MotionEvent e1, MotionEvent e2,
 					float velocityX, float velocityY) {
-				// TODO
 				if (Math.abs(e1.getX() - e2.getX()) > MIN_FLING
 						&& velocityX < MAX_VELOCITYX) {
 					isFling = true;

+ 1 - 1
pullToRefershLibraryMy/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java

@@ -1566,7 +1566,7 @@ public abstract class PullToRefreshBase<T extends View> extends LinearLayout imp
 	 * @author Chris Banes
 	 */
 	public static interface OnRefreshListener2<V extends View> {
-		// TODO These methods need renaming to START/END rather than DOWN/UP
+		// These methods need renaming to START/END rather than DOWN/UP
 
 		/**
 		 * onPullDownToRefresh will be called only when the user has Pulled from