tv : change gpl license to amlogic license; delete chinese annotation [1/4]

PD# 160531

change gpl license to amlogic license; delete chinese annotation

Change-Id: I24171486cab4cd884defd8dc6605b16755fcdb6b

11 files changed, 227 insertions, 525 deletions

diff --git a/core/java/com/droidlogic/app/tv/ChannelInfo.java b/core/java/com/droidlogic/app/tv/ChannelInfo.java
index 9181277..01de410 100644
--- a/core/java/com/droidlogic/app/tv/ChannelInfo.java
+++ b/core/java/com/droidlogic/app/tv/ChannelInfo.java
@@ -587,11 +587,11 @@ public class ChannelInfo {
     }
 
     public String getDisplayNameLocal() {
-        return TVMultilingualText.getText(getDisplayNameMulti());
+        return TvMultilingualText.getText(getDisplayNameMulti());
     }
 
     public String getDisplayName(String local) {
-        return TVMultilingualText.getText(getDisplayNameMulti(), local);
+        return TvMultilingualText.getText(getDisplayNameMulti(), local);
     }
 
     public int getFreeCa() {
diff --git a/core/java/com/droidlogic/app/tv/DroidLogicTvInputService.java b/core/java/com/droidlogic/app/tv/DroidLogicTvInputService.java
index 57db083..3abd7f3 100644
--- a/core/java/com/droidlogic/app/tv/DroidLogicTvInputService.java
+++ b/core/java/com/droidlogic/app/tv/DroidLogicTvInputService.java
@@ -11,7 +11,7 @@ import com.droidlogic.app.tv.ChannelInfo;
 import com.droidlogic.app.tv.DroidLogicHdmiCecManager;
 import com.droidlogic.app.tv.DroidLogicTvUtils;
 import com.droidlogic.app.tv.TvControlManager;
-import com.droidlogic.app.tv.TVInSignalInfo;
+import com.droidlogic.app.tv.TvInSignalInfo;
 
 import com.droidlogic.app.SystemControlManager;
 
@@ -54,7 +54,7 @@ import android.content.IntentFilter;
 import android.content.BroadcastReceiver;
 
 public class DroidLogicTvInputService extends TvInputService implements
-        TVInSignalInfo.SigInfoChangeListener, TvControlManager.StorDBEventListener,
+        TvInSignalInfo.SigInfoChangeListener, TvControlManager.StorDBEventListener,
         TvControlManager.ScanningFrameStableListener {
     private static final String TAG = DroidLogicTvInputService.class.getSimpleName();
     private static final boolean DEBUG = true;
@@ -307,8 +307,8 @@ public class DroidLogicTvInputService extends TvInputService implements
     }
 
     @Override
-    public void onSigChange(TVInSignalInfo signal_info) {
-        TVInSignalInfo.SignalStatus status = signal_info.sigStatus;
+    public void onSigChange(TvInSignalInfo signal_info) {
+        TvInSignalInfo.SignalStatus status = signal_info.sigStatus;
 
         if (DEBUG)
             Log.d(TAG, "onSigChange" + status.ordinal() + status.toString());
@@ -318,11 +318,11 @@ public class DroidLogicTvInputService extends TvInputService implements
         }
         onSigChanged(signal_info);
 
-        if (status == TVInSignalInfo.SignalStatus.TVIN_SIG_STATUS_NOSIG
-                || status == TVInSignalInfo.SignalStatus.TVIN_SIG_STATUS_NULL
-                || status == TVInSignalInfo.SignalStatus.TVIN_SIG_STATUS_NOTSUP) {
+        if (status == TvInSignalInfo.SignalStatus.TVIN_SIG_STATUS_NOSIG
+                || status == TvInSignalInfo.SignalStatus.TVIN_SIG_STATUS_NULL
+                || status == TvInSignalInfo.SignalStatus.TVIN_SIG_STATUS_NOTSUP) {
             mSession.notifyVideoUnavailable(TvInputManager.VIDEO_UNAVAILABLE_REASON_UNKNOWN);
-        } else if (status == TVInSignalInfo.SignalStatus.TVIN_SIG_STATUS_STABLE) {
+        } else if (status == TvInSignalInfo.SignalStatus.TVIN_SIG_STATUS_STABLE) {
             int device_id = mSession.getDeviceId();
             if ((mTvControlManager.GetCurrentSourceInput() != DroidLogicTvUtils.DEVICE_ID_DTV)
                 || (signal_info.reserved == 1))
@@ -339,16 +339,16 @@ public class DroidLogicTvInputService extends TvInputService implements
                     Log.d(TAG, "signal_info.fmt.toString() for hdmi=" + signal_info.sigFmt.toString());
 
                 strings = signal_info.sigFmt.toString().split("_");
-                TVInSignalInfo.SignalFmt fmt = signal_info.sigFmt;
-                if (fmt == TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X480I_60HZ
-                        || fmt == TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X480I_120HZ
-                        || fmt == TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X480I_240HZ
-                        || fmt == TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_2880X480I_60HZ
-                        || fmt == TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_2880X480I_60HZ) {
+                TvInSignalInfo.SignalFmt fmt = signal_info.sigFmt;
+                if (fmt == TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X480I_60HZ
+                        || fmt == TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X480I_120HZ
+                        || fmt == TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X480I_240HZ
+                        || fmt == TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_2880X480I_60HZ
+                        || fmt == TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_2880X480I_60HZ) {
                     strings[4] = "480I";
-                } else if (fmt == TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X576I_50HZ
-                        || fmt == TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X576I_100HZ
-                        || fmt == TVInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X576I_200HZ) {
+                } else if (fmt == TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X576I_50HZ
+                        || fmt == TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X576I_100HZ
+                        || fmt == TvInSignalInfo.SignalFmt.TVIN_SIG_FMT_HDMI_1440X576I_200HZ) {
                     strings[4] = "576I";
                 }
 
@@ -397,7 +397,7 @@ public class DroidLogicTvInputService extends TvInputService implements
         }
     }
 
-    public void onSigChanged(TVInSignalInfo signal_info) { }
+    public void onSigChanged(TvInSignalInfo signal_info) { }
 
 
     @Override
diff --git a/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java b/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
index 4039133..afce4fb 100644
--- a/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
+++ b/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
@@ -753,7 +753,7 @@ public class DroidLogicTvUtils
             if (g == null)
                 continue;
 
-            String ratingDescription = TVMultilingualText.getTextJ(g.optString("rs"));
+            String ratingDescription = TvMultilingualText.getTextJ(g.optString("rs"));
             int region = g.optInt("g", -1);
 
             JSONArray ratings = g.optJSONArray("rx");
diff --git a/core/java/com/droidlogic/app/tv/TVChannelParams.java b/core/java/com/droidlogic/app/tv/TvChannelParams.java
index ff62651..0da35b7 100644
--- a/core/java/com/droidlogic/app/tv/TVChannelParams.java
+++ b/core/java/com/droidlogic/app/tv/TvChannelParams.java
@@ -8,44 +8,36 @@ import android.database.Cursor;
 import android.content.Context;
 import android.util.Log;
 
-/**
- *频道参数
- */
-public class TVChannelParams  implements Parcelable {
-    private static String TAG = "TVChannelParams";
+public class TvChannelParams  implements Parcelable {
+    private static String TAG = "TvChannelParams";
     public static final int FE_HAS_SIGNAL   = 0x01;
     public static final int FE_HAS_CARRIER  = 0x02;
     public static final int FE_HAS_VITERBI  = 0x04;
     public static final int FE_HAS_SYNC     = 0x08;
-    /**锁定*/
+
     public static final int FE_HAS_LOCK     = 0x10;
-    /**超时*/
+
     public static final int FE_TIMEDOUT     = 0x20;
     public static final int FE_REINIT       = 0x40;
 
-    /**QPSK模式*/
     public static final int MODE_QPSK = 0;
-    /**QAM模式*/
+
     public static final int MODE_QAM  = 1;
-    /**OFDM模式*/
+
     public static final int MODE_OFDM = 2;
-    /**ATSC模式*/
+
     public static final int MODE_ATSC = 3;
-    /**模拟模式*/
+
     public static final int MODE_ANALOG = 4;
-    /**DTMB模式*/
+
     public static final int MODE_DTMB = 5;
-    /**ISDBT模式*/
+
     public static final int MODE_ISDBT = 6;
 
     public static final int OFDM_MODE_DVBT=0;
     public static final int OFDM_MODE_DVBT2=1;
 
-    /**
-     *由字符串获得调制模式
-     *@param str 字符串
-     *@return 返回调制模式
-     */
+
     public static int getModeFromString(String str){
         if (str.equals("dvbt"))
             return MODE_OFDM;
@@ -63,57 +55,57 @@ public class TVChannelParams  implements Parcelable {
         return -1;
     }
 
-    /**8MHz带宽*/
+
     public static final int BANDWIDTH_8_MHZ = 0;
-    /**7MHz带宽*/
+
     public static final int BANDWIDTH_7_MHZ = 1;
-    /**6MHz带宽*/
+
     public static final int BANDWIDTH_6_MHZ = 2;
-    /**自动带宽检测*/
+
     public static final int BANDWIDTH_AUTO  = 3;
-    /**5MHZ带宽*/
+
     public static final int BANDWIDTH_5_MHZ = 4;
-    /**10MHZ带宽*/
+
     public static final int BANDWIDTH_10_MHZ = 5;
 
-    /**QPSK调制*/
+
     public static final int MODULATION_QPSK    = 0;
-    /**QAM16调制*/
+
     public static final int MODULATION_QAM_16  = 1;
-    /**QAM32调制*/
+
     public static final int MODULATION_QAM_32  = 2;
-    /**QAM64调制*/
+
     public static final int MODULATION_QAM_64  = 3;
-    /**QAM128调制*/
+
     public static final int MODULATION_QAM_128 = 4;
-    /**QAM256调制*/
+
     public static final int MODULATION_QAM_256 = 5;
-    /**QAM调制(自动检测)*/
+
     public static final int MODULATION_QAM_AUTO= 6;
-    /**VSB8调制*/
+
     public static final int MODULATION_VSB_8   = 7;
-    /**VSB16调制*/
+
     public static final int MODULATION_VSB_16  = 8;
-    /**PSK8调制*/
+
     public static final int MODULATION_PSK_8   = 9;
-    /**APSK16调制*/
+
     public static final int MODULATION_APSK_16 = 10;
-    /**APSK32调制*/
+
     public static final int MODULATION_APSK_32 = 11;
-    /**DQPSK调制*/
+
     public static final int MODULATION_DQPSK   = 12;
 
-    /**单声道*/
+
     public static final int AUDIO_MONO   = 0x0000;
-    /**立体声*/
+
     public static final int AUDIO_STEREO = 0x0001;
-    /**语言2*/
+
     public static final int AUDIO_LANG2  = 0x0002;
     /**SAP*/
     public static final int AUDIO_SAP    = 0x0002;
-    /**语言1*/
+
     public static final int AUDIO_LANG1  = 0x0003;
-    /**语言1/2*/
+
     public static final int AUDIO_LANG1_LANG2 = 0x0004;
 
     /**PAL B*/
@@ -193,12 +185,10 @@ public class TVChannelParams  implements Parcelable {
     public static final int COLOR_NTSC  =0x08000000;
     public static final int COLOR_SECAM =0x10000000;
 
-    /**水平极性*/
     public static final int SAT_POLARISATION_H = 0;
-    /**垂直极限*/
+
     public static final int SAT_POLARISATION_V = 1;
 
-    /**ISDBT LAYER全输出*/
     public static final int ISDBT_LAYER_ALL = 0;
     /**ISDBT LAYER A*/
     public static final int ISDBT_LAYER_A = 0;
@@ -217,16 +207,16 @@ public class TVChannelParams  implements Parcelable {
     public int standard;
     public int afc_data;
     public int sat_id;
-    public TVSatelliteParams tv_satparams;
+    public TvSatelliteParams tv_satparams;
     public int sat_polarisation;
     public int isdbtLayer;
 
-    public static final Parcelable.Creator<TVChannelParams> CREATOR = new Parcelable.Creator<TVChannelParams>(){
-        public TVChannelParams createFromParcel(Parcel in) {
-            return new TVChannelParams(in);
+    public static final Parcelable.Creator<TvChannelParams> CREATOR = new Parcelable.Creator<TvChannelParams>(){
+        public TvChannelParams createFromParcel(Parcel in) {
+            return new TvChannelParams(in);
         }
-        public TVChannelParams[] newArray(int size) {
-            return new TVChannelParams[size];
+        public TvChannelParams[] newArray(int size) {
+            return new TvChannelParams[size];
         }
     };
 
@@ -251,7 +241,7 @@ public class TVChannelParams  implements Parcelable {
             sat_id = in.readInt();
             int satparams_notnull = in.readInt();
             if (satparams_notnull == 1)
-                tv_satparams = new TVSatelliteParams(in);
+                tv_satparams = new TvSatelliteParams(in);
             sat_polarisation = in.readInt();
         }
         if (mode == MODE_ISDBT) {
@@ -293,23 +283,17 @@ public class TVChannelParams  implements Parcelable {
         }
     }
 
-    public TVChannelParams(Parcel in){
+    public TvChannelParams(Parcel in){
         readFromParcel(in);
     }
 
-    public TVChannelParams(int mode){
+    public TvChannelParams(int mode){
         this.mode = mode;
     }
 
-    /**
-     *创建DVBC参数
-     *@param frequency 频率Hz为单位
-     *@param modulation 调制方式
-     *@param symbolRate 符号率
-     *@return 返回新创建的参数
-     */
-    public static TVChannelParams dvbcParams(int frequency, int modulation, int symbolRate){
-        TVChannelParams tp = new TVChannelParams(MODE_QAM);
+
+    public static TvChannelParams dvbcParams(int frequency, int modulation, int symbolRate){
+        TvChannelParams tp = new TvChannelParams(MODE_QAM);
 
         tp.frequency  = frequency;
         tp.modulation = modulation;
@@ -318,14 +302,8 @@ public class TVChannelParams  implements Parcelable {
         return tp;
     }
 
-    /**
-     *创建DVBT参数
-     *@param frequency 频率Hz为单位
-     *@param bandwidth 带宽
-     *@return 返回新创建的参数
-     */
-    public static TVChannelParams dvbtParams(int frequency, int bandwidth){
-        TVChannelParams tp = new TVChannelParams(MODE_OFDM);
+    public static TvChannelParams dvbtParams(int frequency, int bandwidth){
+        TvChannelParams tp = new TvChannelParams(MODE_OFDM);
         tp.frequency = frequency;
         tp.bandwidth = bandwidth;
         tp.ofdm_mode = OFDM_MODE_DVBT;
@@ -333,14 +311,9 @@ public class TVChannelParams  implements Parcelable {
         return tp;
     }
 
-    /**
-     *创建DVBT2参数
-     *@param frequency 频率Hz为单位
-     *@param bandwidth 带宽
-     *@return 返回新创建的参数
-     */
-    public static TVChannelParams dvbt2Params(int frequency, int bandwidth){
-        TVChannelParams tp = new TVChannelParams(MODE_OFDM);
+
+    public static TvChannelParams dvbt2Params(int frequency, int bandwidth){
+        TvChannelParams tp = new TvChannelParams(MODE_OFDM);
         Log.d(TAG,"---new DVBT2 channel params---");
         tp.frequency = frequency;
         tp.bandwidth = bandwidth;
@@ -348,16 +321,9 @@ public class TVChannelParams  implements Parcelable {
         return tp;
     }
 
-    /**
-     *创建DVBS参数
-     *@param frequency 频率Hz为单位
-     *@param symbolRate 符号率
-     *@param sat_id Tp属于的卫星id
-     *@param sat_polarisation Tp极性
-     *@return 返回新创建的参数
-     */
-    /*	public static TVChannelParams dvbsParams(Context context, int frequency, int symbolRate, int sat_id, int sat_polarisation){
-        TVChannelParams tp = new TVChannelParams(MODE_QPSK);
+
+    /*	public static TvChannelParams dvbsParams(Context context, int frequency, int symbolRate, int sat_id, int sat_polarisation){
+        TvChannelParams tp = new TvChannelParams(MODE_QPSK);
 
         tp.frequency  = frequency;
         tp.symbolRate = symbolRate;
@@ -370,28 +336,18 @@ public class TVChannelParams  implements Parcelable {
         return tp;
         }
      */
-    /**
-     *创建ATSC参数
-     *@param frequency 频率Hz为单位
-     *@return 返回新创建的参数
-     */
-    public static TVChannelParams atscParams(int frequency, int modulation){
-        TVChannelParams tp = new TVChannelParams(MODE_ATSC);
+
+    public static TvChannelParams atscParams(int frequency, int modulation){
+        TvChannelParams tp = new TvChannelParams(MODE_ATSC);
 
         tp.frequency  = frequency;
         tp.modulation = modulation;
         return tp;
     }
 
-    /**
-     *创建模拟参数
-     *@param frequency 频率Hz为单位
-     *@param std 视频标准
-     *@param audio 伴音选择
-     *@return 返回新创建的参数
-     */
-    public static TVChannelParams analogParams(int frequency, int std, int audio,int afc_flag){
-        TVChannelParams tp = new TVChannelParams(MODE_ANALOG);
+
+    public static TvChannelParams analogParams(int frequency, int std, int audio,int afc_flag){
+        TvChannelParams tp = new TvChannelParams(MODE_ANALOG);
 
         tp.frequency = frequency;
         tp.audio     = audio;
@@ -400,14 +356,8 @@ public class TVChannelParams  implements Parcelable {
         return tp;
     }
 
-    /**
-     *创建DTMB参数
-     *@param frequency 频率Hz为单位
-     *@param bandwidth 带宽
-     *@return 返回新创建的参数
-     */
-    public static TVChannelParams dtmbParams(int frequency, int bandwidth){
-        TVChannelParams tp = new TVChannelParams(MODE_DTMB);
+    public static TvChannelParams dtmbParams(int frequency, int bandwidth){
+        TvChannelParams tp = new TvChannelParams(MODE_DTMB);
 
         tp.frequency = frequency;
         tp.bandwidth = bandwidth;
@@ -415,14 +365,9 @@ public class TVChannelParams  implements Parcelable {
         return tp;
     }
 
-    /**
-     *创建ISDBT参数
-     *@param frequency 频率Hz为单位
-     *@param bandwidth 带宽
-     *@return 返回新创建的参数
-     */
-    public static TVChannelParams isdbtParams(int frequency, int bandwidth){
-        TVChannelParams tp = new TVChannelParams(MODE_ISDBT);
+
+    public static TvChannelParams isdbtParams(int frequency, int bandwidth){
+        TvChannelParams tp = new TvChannelParams(MODE_ISDBT);
 
         tp.frequency = frequency;
         tp.bandwidth = bandwidth;
@@ -560,10 +505,6 @@ public class TVChannelParams  implements Parcelable {
         return TvControlManager.ATV_AUDIO_STD_AUTO;
     }
 
-    /**
-     *修改模拟音频
-     *@return true 表示已经修改,false表示制式已经设置无需修改
-     */
     public boolean setATVAudio(int audio){
         if (this.audio == audio)
             return false;
@@ -572,11 +513,6 @@ public class TVChannelParams  implements Parcelable {
         return true;
     }
 
-    /**
-     *修改模拟视频制式
-     *@param fmt 视频制式
-     *@return true 表示已经修改制式,false表示制式已经设置无需修改
-     */
     public boolean setATVVideoFormat(int fmt){
         int afmt = AudioStd2Enum(standard);
         int std = getTunerStd(fmt, afmt);
@@ -588,11 +524,6 @@ public class TVChannelParams  implements Parcelable {
         return true;
     }
 
-    /**
-     *修改模拟音频制式
-     *@param fmt 音频制式
-     *@return true 表示已经修改制式,false表示制式已经设置无需修改
-     */
     public boolean setATVAudioFormat(int fmt){
         int vfmt = VideoStd2Enum(standard);
         int std = getTunerStd(vfmt, fmt);
@@ -604,18 +535,12 @@ public class TVChannelParams  implements Parcelable {
         return true;
     }
 
-    /**
-     *取得参数模式
-     *@return 返回模式
-     */
+
     public int getMode(){
         return mode;
     }
 
-    /**
-     *判断参数是否为DVB模式
-     *@return true表示是DVB模式，false表示不是DVB模式
-     */
+
     public boolean isDVBMode(){
         if ((mode == MODE_QPSK) || (mode == MODE_QAM) ||
                 (mode == MODE_OFDM) || (mode == MODE_DTMB)) {
@@ -625,10 +550,6 @@ public class TVChannelParams  implements Parcelable {
         return false;
     }
 
-    /**
-     *判断是参数否为DVBC模式
-     *@return true表示是DVBC模式，false表示不是DVBC模式
-     */
     public boolean isDVBCMode(){
         if (mode == MODE_QAM) {
             return true;
@@ -637,10 +558,7 @@ public class TVChannelParams  implements Parcelable {
         return false;
     }
 
-    /**
-     *判断是参数否为DVBT模式
-     *@return true表示是DVBT模式，false表示不是DVBT模式
-     */
+
     public boolean isDVBTMode(){
         if (mode == MODE_OFDM) {
             return true;
@@ -649,10 +567,7 @@ public class TVChannelParams  implements Parcelable {
         return false;
     }
 
-    /**
-     *判断是参数否为DVBS模式
-     *@return true表示是DVBS模式，false表示不是DVBS模式
-     */
+
     public boolean isDVBSMode(){
         if (mode == MODE_QPSK) {
             return true;
@@ -661,10 +576,7 @@ public class TVChannelParams  implements Parcelable {
         return false;
     }
 
-    /**
-     *判断参数是否为ATSC模式
-     *@return true表示是ATSC模式，false表示不是ATSC模式
-     */
+
     public boolean isATSCMode(){
         if (mode == MODE_ATSC) {
             return true;
@@ -673,10 +585,6 @@ public class TVChannelParams  implements Parcelable {
         return false;
     }
 
-    /**
-     *判断参数是否为模拟模式
-     *@return true表示是模拟模式，false表示不是模拟模式
-     */
     public boolean isAnalogMode(){
         if (mode == MODE_ANALOG) {
             return true;
@@ -685,10 +593,7 @@ public class TVChannelParams  implements Parcelable {
         return false;
     }
 
-    /**
-     *判断是参数否为DTMB模式
-     *@return true表示是DTMB模式，false表示不是DTMB模式
-     */
+
     public boolean isDTMBMode(){
         if (mode == MODE_DTMB) {
             return true;
@@ -697,10 +602,7 @@ public class TVChannelParams  implements Parcelable {
         return false;
     }
 
-    /**
-     *判断是参数否为ISDBT模式
-     *@return true表示是ISDBT模式，false表示不是ISDBT模式
-     */
+
     public boolean isISDBTMode(){
         if (mode == MODE_ISDBT) {
             return true;
@@ -709,34 +611,22 @@ public class TVChannelParams  implements Parcelable {
         return false;
     }
 
-    /**
-     *取得频率(单位Hz)
-     @return 返回频率
-     */
+
     public int getFrequency(){
         return frequency;
     }
 
-    /**
-     *取得OFDM_MODE
-     @return 返回OFDM_MODE
-     */
+
     public int getOFDM_Mode(){
         return ofdm_mode;
     }
 
-    /**
-     *设置频率(单位Hz)
-     @param frequency频率
-     */
+
     public void setFrequency(int frequency){
         this.frequency = frequency;
     }
 
-    /**
-     *取得伴音模式(模拟模式)
-     *@return 返回伴音模式
-     */
+
     public int getAudioMode(){
         if (!isAnalogMode())
             throw new UnsupportedOperationException();
@@ -744,10 +634,7 @@ public class TVChannelParams  implements Parcelable {
         return audio;
     }
 
-    /**
-     *取得视频标准(模拟模式)
-     *@return 返回视频标准
-     */
+
     public int getStandard(){
         if (!isAnalogMode())
             throw new UnsupportedOperationException();
@@ -755,10 +642,7 @@ public class TVChannelParams  implements Parcelable {
         return standard;
     }
 
-    /**
-     *取得带宽(OFDM模式或者DTMB模式)
-     *@return 返回带宽
-     */
+
     public int getBandwidth(){
         if (mode != MODE_OFDM && mode != MODE_DTMB)
             throw new UnsupportedOperationException();
@@ -766,10 +650,6 @@ public class TVChannelParams  implements Parcelable {
         return bandwidth;
     }
 
-    /**
-     *取得调制方式(QAM模式)
-     *@return 返回调试方式
-     */
     public int getModulation(){
         if (mode != MODE_QAM)
             throw new UnsupportedOperationException();
@@ -777,10 +657,7 @@ public class TVChannelParams  implements Parcelable {
         return modulation;
     }
 
-    /**
-     *取得符号率(QPSK/QAM模式)
-     *@return 返回符号率
-     */
+
     public int getSymbolRate(){
         if (!((mode == MODE_QPSK) || (mode == MODE_QAM)))
             throw new UnsupportedOperationException();
@@ -788,10 +665,7 @@ public class TVChannelParams  implements Parcelable {
         return symbolRate;
     }
 
-    /**
-     *设置符号率(QPSK/QAM模式)
-     *@param symbolRate 符号率
-     */
+
     public void setSymbolRate(int symbolRate){
         if (!((mode == MODE_QPSK) || (mode == MODE_QAM)))
             throw new UnsupportedOperationException();
@@ -799,10 +673,7 @@ public class TVChannelParams  implements Parcelable {
         this.symbolRate = symbolRate;
     }
 
-    /**
-     *取得卫星id(QPSK模式)
-     *@return 返回卫星id
-     */
+
     public int getSatId(){
         if (mode != MODE_QPSK)
             throw new UnsupportedOperationException();
@@ -810,10 +681,7 @@ public class TVChannelParams  implements Parcelable {
         return sat_id;
     }
 
-    /**
-     *取得极性(QPSK模式)
-     *@return 返回极性
-     */
+
     public int getPolarisation(){
         if (mode != MODE_QPSK)
             throw new UnsupportedOperationException();
@@ -821,10 +689,7 @@ public class TVChannelParams  implements Parcelable {
         return this.sat_polarisation;
     }
 
-    /**
-     *取得频率(单位Hz)
-     @return 返回频率
-     */
+
     public int getISDBTLayer(){
         if (mode != MODE_ISDBT)
             throw new UnsupportedOperationException();
@@ -832,10 +697,7 @@ public class TVChannelParams  implements Parcelable {
         return isdbtLayer;
     }
 
-    /**
-     *设置Layer(ISDBT模式)
-     *@param layer layer值
-     */
+
     public void setISDBTLayer(int layer){
         if (mode != MODE_ISDBT)
             throw new UnsupportedOperationException();
@@ -843,10 +705,7 @@ public class TVChannelParams  implements Parcelable {
         this.isdbtLayer = isdbtLayer;
     }
 
-    /**
-     *设置极性(QPSK模式)
-     *@param sat_polarisation 极性
-     */
+
     public void setPolarisation(int sat_polarisation){
         if (mode != MODE_QPSK)
             throw new UnsupportedOperationException();
@@ -854,12 +713,8 @@ public class TVChannelParams  implements Parcelable {
         this.sat_polarisation = sat_polarisation;
     }
 
-    /**
-     *检测前端参数和当前参数是否相等
-     *@param params 前端参数
-     *@return 如果相等返回true，不等返回false
-     */
-    public boolean equals(TVChannelParams params){
+
+    public boolean equals(TvChannelParams params){
         if (this.mode != params.mode)
             return false;
 
@@ -881,7 +736,7 @@ public class TVChannelParams  implements Parcelable {
         return true;
     }
 
-    public boolean equals_frontendevt(TVChannelParams params){
+    public boolean equals_frontendevt(TvChannelParams params){
         if (this.mode != params.mode)
             return false;
 
@@ -899,7 +754,7 @@ public class TVChannelParams  implements Parcelable {
         return 0;
     }
 
-    public static Parcelable.Creator<TVChannelParams> getCreator() {
+    public static Parcelable.Creator<TvChannelParams> getCreator() {
         return CREATOR;
     }
 }
diff --git a/core/java/com/droidlogic/app/tv/TvControlManager.java b/core/java/com/droidlogic/app/tv/TvControlManager.java
index c334d8d..e8416d9 100644
--- a/core/java/com/droidlogic/app/tv/TvControlManager.java
+++ b/core/java/com/droidlogic/app/tv/TvControlManager.java
@@ -110,8 +110,8 @@ public class TvControlManager {
 
     private long mNativeContext; // accessed by native methods
     private EventHandler mEventHandler;
-    private TVInSignalInfo.SigInfoChangeListener mSigInfoChangeLister = null;
-    private TVInSignalInfo.SigChannelSearchListener mSigChanSearchListener = null;
+    private TvInSignalInfo.SigInfoChangeListener mSigInfoChangeLister = null;
+    private TvInSignalInfo.SigChannelSearchListener mSigChanSearchListener = null;
     private Status3DChangeListener mStatus3DChangeListener = null;
     private AdcCalibrationListener mAdcCalibrationListener = null;
     private SourceSwitchListener mSourceSwitchListener = null;
@@ -484,10 +484,10 @@ public class TvControlManager {
                     break;
                 case SIGLE_DETECT_CALLBACK:
                     if (mSigInfoChangeLister != null) {
-                        TVInSignalInfo sigInfo = new TVInSignalInfo();
-                        sigInfo.transFmt = TVInSignalInfo.TransFmt.values()[(((Parcel) (msg.obj)).readInt())];
-                        sigInfo.sigFmt = TVInSignalInfo.SignalFmt.valueOf(((Parcel) (msg.obj)).readInt());
-                        sigInfo.sigStatus = TVInSignalInfo.SignalStatus.values()[(((Parcel) (msg.obj)).readInt())];
+                        TvInSignalInfo sigInfo = new TvInSignalInfo();
+                        sigInfo.transFmt = TvInSignalInfo.TransFmt.values()[(((Parcel) (msg.obj)).readInt())];
+                        sigInfo.sigFmt = TvInSignalInfo.SignalFmt.valueOf(((Parcel) (msg.obj)).readInt());
+                        sigInfo.sigStatus = TvInSignalInfo.SignalStatus.values()[(((Parcel) (msg.obj)).readInt())];
                         sigInfo.reserved = ((Parcel) (msg.obj)).readInt();
                         mSigInfoChangeLister.onSigChange(sigInfo);
                     }
@@ -678,14 +678,14 @@ public class TvControlManager {
      * @Param:
      * @Return: refer to class tvin_info_t
      */
-    public TVInSignalInfo GetCurrentSignalInfo() {
+    public TvInSignalInfo GetCurrentSignalInfo() {
         synchronized (mLock) {
-            TVInSignalInfo info = new TVInSignalInfo();
+            TvInSignalInfo info = new TvInSignalInfo();
             try {
                 SignalInfo hidlInfo = mProxy.getCurSignalInfo();
-                info.transFmt = TVInSignalInfo.TransFmt.values()[hidlInfo.transFmt];
-                info.sigFmt = TVInSignalInfo.SignalFmt.valueOf(hidlInfo.fmt);
-                info.sigStatus = TVInSignalInfo.SignalStatus.values()[hidlInfo.status];
+                info.transFmt = TvInSignalInfo.TransFmt.values()[hidlInfo.transFmt];
+                info.sigFmt = TvInSignalInfo.SignalFmt.valueOf(hidlInfo.fmt);
+                info.sigStatus = TvInSignalInfo.SignalStatus.values()[hidlInfo.status];
                 info.reserved = hidlInfo.frameRate;
                 return info;
             } catch (RemoteException e) {
@@ -1148,7 +1148,7 @@ public class TvControlManager {
      * @Param: value saturation, source refer to enum SourceInput, fmt current fmt refer to tvin_sig_fmt_e, is_save 1 to save
      * @Return: 0 success, -1 fail
      */
-    public int SetSaturation(int value, SourceInput source, TVInSignalInfo.SignalFmt fmt, int is_save) {
+    public int SetSaturation(int value, SourceInput source, TvInSignalInfo.SignalFmt fmt, int is_save) {
         int val[] = new int[]{value, source.toInt(), fmt.toInt(), is_save};
         return sendCmdIntArray(SET_SATURATION, val);
     }
@@ -1181,7 +1181,7 @@ public class TvControlManager {
      * @Param: value saturation, source refer to enum SourceInput, fmt current fmt refer to tvin_sig_fmt_e, is_save 1 to save
      * @Return: 0 success, -1 fail
      */
-    public int SetHue(int value, SourceInput source, TVInSignalInfo.SignalFmt fmt, int is_save) {
+    public int SetHue(int value, SourceInput source, TvInSignalInfo.SignalFmt fmt, int is_save) {
         int val[] = new int[]{value, source.toInt(), fmt.toInt(), is_save};
         return sendCmdIntArray(SET_HUE, val);
     }
@@ -1433,7 +1433,7 @@ public class TvControlManager {
      * @Param: value mode refer to enum Display_Mode, source refer to enum SourceInput, fmt refer to tvin_sig_fmt_e, is_save 1 to save
      * @Return: 0 success, -1 fail
      */
-    public int SetDisplayMode(Display_Mode display_mode, SourceInput source, TVInSignalInfo.SignalFmt fmt, int is_save) {
+    public int SetDisplayMode(Display_Mode display_mode, SourceInput source, TvInSignalInfo.SignalFmt fmt, int is_save) {
         int val[] = new int[]{display_mode.toInt(), source.toInt(), fmt.toInt(), is_save};
         return sendCmdIntArray(SET_DISPLAY_MODE, val);
     }
@@ -1922,8 +1922,8 @@ public class TvControlManager {
      * @Param: trans_fmt refer to enum tvin_trans_fmt, cutwin_t refer to class tvin_cutwin_t
      * @Return: 0 success, -1 fail
      */
-    public int FactorySetOverscanParams(SourceInput source_type, TVInSignalInfo.SignalFmt fmt,
-            TVInSignalInfo.TransFmt trans_fmt, tvin_cutwin_t cutwin_t) {
+    public int FactorySetOverscanParams(SourceInput source_type, TvInSignalInfo.SignalFmt fmt,
+            TvInSignalInfo.TransFmt trans_fmt, tvin_cutwin_t cutwin_t) {
         int val[] = new int[]{source_type.toInt(), fmt.toInt(), trans_fmt.ordinal(),
             cutwin_t.hs, cutwin_t.he, cutwin_t.vs, cutwin_t.ve};
         return sendCmdIntArray(FACTORY_SETOVERSCAN, val);
@@ -1936,8 +1936,8 @@ public class TvControlManager {
      * @Param: trans_fmt refer to enum tvin_trans_fmt
      * @Return: cutwin_t value for overscan refer to class tvin_cutwin_t
      */
-    public tvin_cutwin_t FactoryGetOverscanParams(SourceInput source_type, TVInSignalInfo.SignalFmt fmt,
-            TVInSignalInfo.TransFmt trans_fmt) {
+    public tvin_cutwin_t FactoryGetOverscanParams(SourceInput source_type, TvInSignalInfo.SignalFmt fmt,
+            TvInSignalInfo.TransFmt trans_fmt) {
         libtv_log_open();
         Parcel cmd = Parcel.obtain();
         Parcel r = Parcel.obtain();
@@ -4040,25 +4040,25 @@ public class TvControlManager {
     public static String baseModeToType(int baseMode) {
         String type = "";
         switch (baseMode) {
-            case TVChannelParams.MODE_DTMB:
+            case TvChannelParams.MODE_DTMB:
                 type = TvContract.Channels.TYPE_DTMB;
                 break;
-            case TVChannelParams.MODE_QPSK:
+            case TvChannelParams.MODE_QPSK:
                 type = TvContract.Channels.TYPE_DVB_S;
                 break;
-            case TVChannelParams.MODE_QAM:
+            case TvChannelParams.MODE_QAM:
                 type = TvContract.Channels.TYPE_DVB_C;
                 break;
-            case TVChannelParams.MODE_OFDM:
+            case TvChannelParams.MODE_OFDM:
                 type = TvContract.Channels.TYPE_DVB_T;
                 break;
-            case TVChannelParams.MODE_ATSC:
+            case TvChannelParams.MODE_ATSC:
                 type = TvContract.Channels.TYPE_ATSC_C;
                 break;
-            case TVChannelParams.MODE_ANALOG:
+            case TvChannelParams.MODE_ANALOG:
                 type = TvContract.Channels.TYPE_PAL;
                 break;
-            case TVChannelParams.MODE_ISDBT:
+            case TvChannelParams.MODE_ISDBT:
                 type = TvContract.Channels.TYPE_ISDB_T;
                 break;
             default:
@@ -4136,33 +4136,33 @@ public class TvControlManager {
         public String toType() {
             String type = "";
             switch (getBase()) {
-                case TVChannelParams.MODE_DTMB:
+                case TvChannelParams.MODE_DTMB:
                     type = TvContract.Channels.TYPE_DTMB;
                     break;
-                case TVChannelParams.MODE_QPSK:
+                case TvChannelParams.MODE_QPSK:
                     type = TvContract.Channels.TYPE_DVB_S;
                     if (getGen() == 1)
                         type = TvContract.Channels.TYPE_DVB_S2;
                     break;
-                case TVChannelParams.MODE_QAM:
+                case TvChannelParams.MODE_QAM:
                     type = TvContract.Channels.TYPE_DVB_C;
                     if (getGen() == 1)
                         type = TvContract.Channels.TYPE_DVB_C2;
                     break;
-                case TVChannelParams.MODE_OFDM:
+                case TvChannelParams.MODE_OFDM:
                     type = TvContract.Channels.TYPE_DVB_T;
                     if (getGen() == 1)
                         type = TvContract.Channels.TYPE_DVB_T2;
                     break;
-                case TVChannelParams.MODE_ATSC:
+                case TvChannelParams.MODE_ATSC:
                     type = TvContract.Channels.TYPE_ATSC_T;
                     if (getGen() == 1)
                         type = TvContract.Channels.TYPE_ATSC_C;
                     break;
-                case TVChannelParams.MODE_ANALOG:
+                case TvChannelParams.MODE_ANALOG:
                     type = TvContract.Channels.TYPE_PAL;
                     break;
-                case TVChannelParams.MODE_ISDBT:
+                case TvChannelParams.MODE_ISDBT:
                     type = TvContract.Channels.TYPE_ISDB_T;
                     break;
                 default:
@@ -4171,26 +4171,26 @@ public class TvControlManager {
             return type;
         }
         private int typeToBaseMode(String type) {
-            int mode = TVChannelParams.MODE_DTMB;
+            int mode = TvChannelParams.MODE_DTMB;
             if (TextUtils.equals(type, TvContract.Channels.TYPE_DTMB)) {
-                mode = TVChannelParams.MODE_DTMB;
+                mode = TvChannelParams.MODE_DTMB;
             } else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_S)
                 || (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_S2))) {
-                mode = TVChannelParams.MODE_QPSK;
+                mode = TvChannelParams.MODE_QPSK;
             } else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_C)
                 || (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_C2))) {
-                mode = TVChannelParams.MODE_QAM;
+                mode = TvChannelParams.MODE_QAM;
             } else if (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_T)
                 || (TextUtils.equals(type, TvContract.Channels.TYPE_DVB_T2))) {
-                mode = TVChannelParams.MODE_OFDM;
+                mode = TvChannelParams.MODE_OFDM;
             } else if (TextUtils.equals(type, TvContract.Channels.TYPE_ATSC_T)
                 || (TextUtils.equals(type, TvContract.Channels.TYPE_ATSC_C))) {
-                mode = TVChannelParams.MODE_ATSC;
+                mode = TvChannelParams.MODE_ATSC;
             } else if (TextUtils.equals(type, TvContract.Channels.TYPE_PAL)
                 || (TextUtils.equals(type, TvContract.Channels.TYPE_NTSC))) {
-                mode = TVChannelParams.MODE_ANALOG;
+                mode = TvChannelParams.MODE_ANALOG;
             } else if (TextUtils.equals(type, TvContract.Channels.TYPE_ISDB_T)) {
-                mode = TVChannelParams.MODE_ISDBT;
+                mode = TvChannelParams.MODE_ISDBT;
             }
             return mode;
         }
@@ -6501,12 +6501,12 @@ public class TvControlManager {
         mAVPlaybackListener = l;
     }
 
-    public void SetSigInfoChangeListener(TVInSignalInfo.SigInfoChangeListener l) {
+    public void SetSigInfoChangeListener(TvInSignalInfo.SigInfoChangeListener l) {
         libtv_log_open();
         mSigInfoChangeLister = l;
     }
 
-    public void SetSigChannelSearchListener(TVInSignalInfo.SigChannelSearchListener l) {
+    public void SetSigChannelSearchListener(TvInSignalInfo.SigChannelSearchListener l) {
         libtv_log_open();
         mSigChanSearchListener = l;
     }
diff --git a/core/java/com/droidlogic/app/tv/TvDataBaseManager.java b/core/java/com/droidlogic/app/tv/TvDataBaseManager.java
index b8ee7d7..ccc9c2f 100644
--- a/core/java/com/droidlogic/app/tv/TvDataBaseManager.java
+++ b/core/java/com/droidlogic/app/tv/TvDataBaseManager.java
@@ -44,22 +44,22 @@ public class TvDataBaseManager {
     private static final SparseArray<String> CHANNEL_MODE_TO_TYPE_MAP = new SparseArray<String>();
 
     static {
-        CHANNEL_MODE_TO_TYPE_MAP.put(TVChannelParams.MODE_DTMB, Channels.TYPE_DTMB);
-        CHANNEL_MODE_TO_TYPE_MAP.put(TVChannelParams.MODE_QPSK, Channels.TYPE_DVB_S);
-        CHANNEL_MODE_TO_TYPE_MAP.put(TVChannelParams.MODE_QAM, Channels.TYPE_DVB_C);
-        CHANNEL_MODE_TO_TYPE_MAP.put(TVChannelParams.MODE_OFDM, Channels.TYPE_DVB_T);
-        CHANNEL_MODE_TO_TYPE_MAP.put(TVChannelParams.MODE_ATSC, Channels.TYPE_ATSC_C);
-        CHANNEL_MODE_TO_TYPE_MAP.put(TVChannelParams.MODE_ANALOG, Channels.TYPE_PAL);
-        CHANNEL_MODE_TO_TYPE_MAP.put(TVChannelParams.MODE_ISDBT, Channels.TYPE_ISDB_T);
+        CHANNEL_MODE_TO_TYPE_MAP.put(TvChannelParams.MODE_DTMB, Channels.TYPE_DTMB);
+        CHANNEL_MODE_TO_TYPE_MAP.put(TvChannelParams.MODE_QPSK, Channels.TYPE_DVB_S);
+        CHANNEL_MODE_TO_TYPE_MAP.put(TvChannelParams.MODE_QAM, Channels.TYPE_DVB_C);
+        CHANNEL_MODE_TO_TYPE_MAP.put(TvChannelParams.MODE_OFDM, Channels.TYPE_DVB_T);
+        CHANNEL_MODE_TO_TYPE_MAP.put(TvChannelParams.MODE_ATSC, Channels.TYPE_ATSC_C);
+        CHANNEL_MODE_TO_TYPE_MAP.put(TvChannelParams.MODE_ANALOG, Channels.TYPE_PAL);
+        CHANNEL_MODE_TO_TYPE_MAP.put(TvChannelParams.MODE_ISDBT, Channels.TYPE_ISDB_T);
     }
 
     private static final Map<String, Integer> CHANNEL_TYPE_TO_MODE_MAP = new HashMap<String, Integer>();
 
     static {
-        CHANNEL_TYPE_TO_MODE_MAP.put(Channels.TYPE_DTMB, TVChannelParams.MODE_DTMB);
-        CHANNEL_TYPE_TO_MODE_MAP.put(Channels.TYPE_DVB_C, TVChannelParams.MODE_QAM);
-        CHANNEL_TYPE_TO_MODE_MAP.put(Channels.TYPE_DVB_T, TVChannelParams.MODE_OFDM);
-        CHANNEL_TYPE_TO_MODE_MAP.put(Channels.TYPE_PAL, TVChannelParams.MODE_ANALOG);
+        CHANNEL_TYPE_TO_MODE_MAP.put(Channels.TYPE_DTMB, TvChannelParams.MODE_DTMB);
+        CHANNEL_TYPE_TO_MODE_MAP.put(Channels.TYPE_DVB_C, TvChannelParams.MODE_QAM);
+        CHANNEL_TYPE_TO_MODE_MAP.put(Channels.TYPE_DVB_T, TvChannelParams.MODE_OFDM);
+        CHANNEL_TYPE_TO_MODE_MAP.put(Channels.TYPE_PAL, TvChannelParams.MODE_ANALOG);
     }
 
     private Context mContext;
diff --git a/core/java/com/droidlogic/app/tv/TVInSignalInfo.java b/core/java/com/droidlogic/app/tv/TvInSignalInfo.java
index 8c57619..2449176 100644
--- a/core/java/com/droidlogic/app/tv/TVInSignalInfo.java
+++ b/core/java/com/droidlogic/app/tv/TvInSignalInfo.java
@@ -1,6 +1,6 @@
 package com.droidlogic.app.tv;
 
-public class TVInSignalInfo {
+public class TvInSignalInfo {
     public enum TransFmt {
         TVIN_TFMT_2D,
         TVIN_TFMT_3D_LRH_OLOR,
@@ -322,12 +322,12 @@ public class TVInSignalInfo {
     public SignalStatus sigStatus;
     public int reserved;
 
-    public TVInSignalInfo() {
+    public TvInSignalInfo() {
     }
 
     // set listener when not need to listen set null
     public interface SigInfoChangeListener {
-        void onSigChange(TVInSignalInfo sigInfo);
+        void onSigChange(TvInSignalInfo sigInfo);
     };
 
     public interface SigChannelSearchListener {
diff --git a/core/java/com/droidlogic/app/tv/TVMultilingualText.java b/core/java/com/droidlogic/app/tv/TvMultilingualText.java
index 63bca5b..4dbce00 100644
--- a/core/java/com/droidlogic/app/tv/TVMultilingualText.java
+++ b/core/java/com/droidlogic/app/tv/TvMultilingualText.java
@@ -10,11 +10,11 @@ import org.json.JSONArray;
 import org.json.JSONException;
 
 /**
- *TVMultilingualText
+ *TvMultilingualText
  *multilingual text parsing
  */
-public class TVMultilingualText{
-    private static final String TAG="TVMultilingualText";
+public class TvMultilingualText{
+    private static final String TAG="TvMultilingualText";
 
     private class MultilingualText{
         protected String language;
@@ -100,7 +100,7 @@ public class TVMultilingualText{
         }
         String[] langText = formatText.split(split);
         for (int i=0; langText!=null && i<langText.length; i++) {
-            TVMultilingualText inst = new TVMultilingualText();
+            TvMultilingualText inst = new TvMultilingualText();
             MultilingualText text = inst.new MultilingualText(langText[i]);
 
             if (useFirst || text.getLangage().equalsIgnoreCase(lang)) {
@@ -188,7 +188,7 @@ public class TVMultilingualText{
         }
         for (int i=0; i<jsonArray.length(); i++) {
             JSONObject j = jsonArray.optJSONObject(i);
-            TVMultilingualText inst = new TVMultilingualText();
+            TvMultilingualText inst = new TvMultilingualText();
             MultilingualTextJ text = inst.new MultilingualTextJ(j);
             if (useFirst || text.getLangage().equalsIgnoreCase(lang)) {
                 ret = text.getText();
diff --git a/core/java/com/droidlogic/app/tv/TVSatelliteParams.java b/core/java/com/droidlogic/app/tv/TvSatelliteParams.java
index d7c7490..114ffa6 100644
--- a/core/java/com/droidlogic/app/tv/TVSatelliteParams.java
+++ b/core/java/com/droidlogic/app/tv/TvSatelliteParams.java
@@ -6,29 +6,23 @@ import android.database.Cursor;
 import android.content.Context;
 import android.util.Log;
 
-/**
- *TV Satellite参数信息.
- */
-public class TVSatelliteParams implements Parcelable {
-    private static final String TAG="TVSatelliteParams";
 
-    /**22k 参数*/
+public class TvSatelliteParams implements Parcelable {
+    private static final String TAG="TvSatelliteParams";
+
     public static final int SEC_22k_ON = 0;
     public static final int SEC_22k_OFF = 1;
     public static final int SEC_22k_AUTO = 2;
 
-    /**电压参数*/
     public static final int SEC_VOLTAGE_13V = 0;
     public static final int SEC_VOLTAGE_18V = 1;
     public static final int SEC_VOLTAGE_OFF = 2;
     public static final int SEC_VOLTAGE_AUTO = 3;
 
-    /**toneburst参数*/
     public static final int SEC_TONE_BURST_NONE = 0;
     public static final int SEC_TONE_BURST_A = 1;
     public static final int SEC_TONE_BURST_B = 2;
 
-    /**diseqc 模式*/
     public static final int DISEQC_MODE_NONE = 0;
     public static final int DISEQC_MODE_V1_0 = 1;
     public static final int DISEQC_MODE_V1_1 = 2;
@@ -36,14 +30,13 @@ public class TVSatelliteParams implements Parcelable {
     public static final int DISEQC_MODE_V1_3 = 4;
     public static final int DISEQC_MODE_SMARTV = 5;
 
-    /**diseqc committed端口0-3*/
     public static final int DISEQC_COMMITTED_AA = 0;
     public static final int DISEQC_COMMITTED_AB = 1;
     public static final int DISEQC_COMMITTED_BA = 2;
     public static final int DISEQC_COMMITTED_BB = 3;
-    /**diseqc不选择任何端口*/
+
     public static final int DISEQC_NONE  = 4;
-    /**diseqc uncommitted端口0-15*/
+
     public static final int DISEQC_UNCOMMITTED_0 = 0xF0;
     public static final int DISEQC_UNCOMMITTED_1 = 0xF1;
     public static final int DISEQC_UNCOMMITTED_2 = 0xF2;
@@ -61,7 +54,6 @@ public class TVSatelliteParams implements Parcelable {
     public static final int DISEQC_UNCOMMITTED_14 = 0xFE;
     public static final int DISEQC_UNCOMMITTED_15 = 0xFF;
 
-    /**卫星设备本地经纬度*/
     public double local_longitude;
     public double local_latitude;
 
@@ -96,12 +88,12 @@ public class TVSatelliteParams implements Parcelable {
     private int user_band;
     private int ub_freq;//!< kHz
 
-    public static final Parcelable.Creator<TVSatelliteParams> CREATOR = new Parcelable.Creator<TVSatelliteParams>(){
-        public TVSatelliteParams createFromParcel(Parcel in) {
-            return new TVSatelliteParams(in);
+    public static final Parcelable.Creator<TvSatelliteParams> CREATOR = new Parcelable.Creator<TvSatelliteParams>(){
+        public TvSatelliteParams createFromParcel(Parcel in) {
+            return new TvSatelliteParams(in);
         }
-        public TVSatelliteParams[] newArray(int size) {
-            return new TVSatelliteParams[size];
+        public TvSatelliteParams[] newArray(int size) {
+            return new TvSatelliteParams[size];
         }
     };
 
@@ -153,51 +145,35 @@ public class TVSatelliteParams implements Parcelable {
         dest.writeInt(ub_freq);
     }
 
-    public TVSatelliteParams(Parcel in){
+    public TvSatelliteParams(Parcel in){
         readFromParcel(in);
     }
 
-    public TVSatelliteParams(){
+    public TvSatelliteParams(){
     }
 
-    public TVSatelliteParams(double sat_longitude){
+    public TvSatelliteParams(double sat_longitude){
         /*default value*/
         this.sat_longitude = sat_longitude;
     }
 
-    /**
-     *设置卫星接收设备本地经纬度
-     *@param local_longitude 本地经度
-     *@param local_longitude 本地纬度
-     */
+
     public void setSatelliteRecLocal(double local_longitude, double local_latitude){
         this.local_longitude = local_longitude;
         this.local_latitude = local_latitude;
     }
 
-    /**
-     *获取卫星接收设备本地经度
-     *@return 本地经度
-     */
+
     public double getSatelliteRecLocalLongitude(){
         return this.local_longitude;
     }
 
-    /**
-     *获取卫星接收设备本地纬度
-     *@return 本地纬度
-     */
+
     public double getSatelliteRecLocalLatitude(){
         return this.local_latitude;
     }
 
-    /**
-     *设置卫星接收LNB信息
-     *@param lnb_num lnb号
-     *@param lnb_lof_hi lnb高本振频率
-     *@param lnb_lof_lo lnb低本振频率
-     *@param lnb_lof_threadhold lnb转折频率
-     */
+
     public void setSatelliteLnb(int lnb_num, int lnb_lof_hi, int lnb_lof_lo, int lnb_lof_threadhold){
         this.lnb_num = lnb_num;
         this.lnb_lof_hi = lnb_lof_hi;
@@ -205,278 +181,166 @@ public class TVSatelliteParams implements Parcelable {
         this.lnb_lof_threadhold = lnb_lof_threadhold;
     }
 
-    /**
-     *获取卫星接收LNB信息lnb号
-     *@return lnb号
-     */
+
     public int getSatelliteLnbNum(){
         return this.lnb_num;
     }
 
-    /**
-     *获取卫星接收LNB信息lnb高本振频率
-     *@return lnb高本振频率
-     */
+
     public int getSatelliteLnbLofhi(){
         return this.lnb_lof_hi;
     }
 
-    /**
-     *获取卫星接收LNB信息lnb低本振频率
-     *@return lnb低本振频率
-     */
+
     public int getSatelliteLnbLofLo(){
         return this.lnb_lof_lo;
     }
 
-    /**
-     *获取卫星接收LNB信息lnb转折频率
-     *@return lnb转折频率
-     */
     public int getSatelliteLnbLofthreadhold(){
         return this.lnb_lof_threadhold;
     }
 
-    /**
-     *设置卫星设备控制22k状态
-     *@param sec_22k_status 22k状态
-     */
     public void setSec22k(int sec_22k_status){
         this.sec_22k_status = sec_22k_status;
     }
 
-    /**
-     *获取卫星设备控制22k状态
-     *@return 22k状态
-     */
+
     public int getSec22k(){
         return this.sec_22k_status;
     }
 
-    /**
-     *设置卫星设备控制电压状态
-     *@param sec_voltage_status 电压状态
-     */
+
     public void setSecVoltage(int sec_voltage_status){
         this.sec_voltage_status = sec_voltage_status;
     }
 
-    /**
-     *获取卫星设备控制电压状态
-     *@return 电压状态
-     */
+
     public int getSecVoltage(){
         return this.sec_voltage_status;
     }
 
-    /**
-     *设置卫星设备控制tone burst
-     *@param sec_tone_burst tone burst 状态
-     */
     public void setSecToneBurst(int sec_tone_burst){
         this.sec_tone_burst = sec_tone_burst;
     }
 
-    /**
-     *获取卫星设备控制tone burst
-     *@return tone burst 状态
-     */
+
     public int getSecToneBurst(){
         return this.sec_tone_burst;
     }
 
-    /**
-     *设置diseqc模式
-     *@param diseqc_mode diseqc模式
-     */
     public void setDiseqcMode(int diseqc_mode){
         this.diseqc_mode = diseqc_mode;
     }
 
-    /**
-     *获取diseqc模式
-     *@return diseqc模式
-     */
+
     public int getDiseqcMode(){
         return this.diseqc_mode;
     }
 
-    /**
-     *设置diseqc committed
-     *@param diseqc_committed diseqc committed
-     */
     public void setDiseqcCommitted(int diseqc_committed){
         this.diseqc_committed = diseqc_committed;
     }
 
-    /**
-     *获取diseqc committed
-     *@return diseqc committed
-     */
+
     public int getDiseqcCommitted(){
         return this.diseqc_committed;
     }
 
-    /**
-     *设置diseqc uncommitted
-     *@param diseqc_uncommitted diseqc uncommitted
-     */
     public void setDiseqcUncommitted(int diseqc_uncommitted){
         this.diseqc_uncommitted= diseqc_uncommitted;
     }
 
-    /**
-     *获取diseqc uncommitted
-     *@return diseqc uncommitted
-     */
+
     public int getDiseqcUncommitted(){
         return this.diseqc_uncommitted;
     }
 
-    /**
-     *设置diseqc重复发送次数，用于级联
-     *@param diseqc_repeat_count 重复发送次数
-     */
     public void setDiseqcRepeatCount(int diseqc_repeat_count){
         this.diseqc_repeat_count = diseqc_repeat_count;
     }
 
-    /**
-     *获取diseqc重复发送次数，用于级联
-     *@return 重复发送次数
-     */
+
     public int getDiseqcRepeatCount(){
         return this.diseqc_repeat_count;
     }
 
-    /**
-     *设置diseqc发送2次
-     *@param diseqc_sequence_repeat 是否发送
-     */
+
     public void setDiseqcSequenceRepeat(int diseqc_sequence_repeat){
         this.diseqc_sequence_repeat = diseqc_sequence_repeat;
     }
 
-    /**
-     *获取diseqc发送2次
-     *@return 是否发送
-     */
+
     public int getDiseqcSequenceRepeat(){
         return this.diseqc_sequence_repeat;
     }
 
-    /**
-     *设置快速diseqc
-     *@param diseqc_fast 是否快速diseqc
-     */
+
     public void setDiseqcFast(int diseqc_fast){
         this.diseqc_fast = diseqc_fast;
     }
 
-    /**
-     *获取快速diseqc
-     *@return 是否快速diseqc
-     */
+
     public int getDiseqcFast(){
         return this.diseqc_fast;
     }
 
-    /**
-     *设置diseqc序列
-     *@param diseqc_order diseqc序列
-     */
     public void setDiseqcOrder(int diseqc_order){
         this.diseqc_order = diseqc_order;
     }
 
-    /**
-     *获取diseqc序列
-     *@return diseqc序列
-     */
+
     public int getDiseqcOrder(){
         return this.diseqc_order;
     }
 
-    /**
-     *设置马达号
-     *@param motor_num motor号
-     */
+
     public void setMotorNum(int motor_num){
         this.motor_num = motor_num;
     }
 
-    /**
-     *获取马达号
-     *@return motor号
-     */
+
     public int getMotorNum(){
         return this.motor_num;
     }
 
-    /**
-     *设置马达存储位置号
-     *@param motor_position_num motor存储位置号
-     */
+
     public void setMotorPositionNum(int motor_position_num){
         this.motor_position_num = motor_position_num;
     }
 
-    /**
-     *获取马达存储位置号
-     *@return motor存储位置号
-     */
+
     public int getMotorPositionNum(){
         return this.motor_position_num;
     }
 
-    /**
-     *设置卫星经度
-     *@param sat_longitude 卫星经度
-     */
+
     public void setSatelliteLongitude(double sat_longitude){
         this.sat_longitude = sat_longitude;
     }
 
-    /**
-     *获取卫星经度
-     *@return 卫星经度
-     */
+
     public double getSatelliteLongitude(){
         return this.sat_longitude;
     }
 
-    /**
-     *设置Unicable参数
-     *@param user_band Unicable通道
-     *@param ub_freq Unicable通道频率
-     */
+
     public void setUnicableParams(int user_band, int ub_freq) {
         this.user_band = user_band;
         this.ub_freq = ub_freq;
     }
 
-    /**
-     *获取Unicable通道
-     *@return Unicable通道
-     */
+
     public int getUnicableUserband(){
         return this.user_band;
     }
 
-    /**
-     *获取Unicable通道频率
-     *@return Unicable通道频率
-     */
+
     public int getUnicableUbfreq(){
         return this.ub_freq;
     }
 
-    /**
-     *检测卫星参数和当前参数是否相等
-     *@param params 卫星参数
-     *@return 如果相等返回true，不等返回false
-     */
-    public boolean equals(TVSatelliteParams params){
+
+    public boolean equals(TvSatelliteParams params){
         if (this.local_longitude != params.local_longitude)
             return false;
 
@@ -547,7 +411,7 @@ public class TVSatelliteParams implements Parcelable {
         return 0;
     }
 
-    public static Parcelable.Creator<TVSatelliteParams> getCreator() {
+    public static Parcelable.Creator<TvSatelliteParams> getCreator() {
         return CREATOR;
     }
 }
diff --git a/core/java/com/droidlogic/app/tv/TvStoreManager.java b/core/java/com/droidlogic/app/tv/TvStoreManager.java
index 67579a8..75bb411 100644
--- a/core/java/com/droidlogic/app/tv/TvStoreManager.java
+++ b/core/java/com/droidlogic/app/tv/TvStoreManager.java
@@ -200,7 +200,7 @@ public abstract class TvStoreManager {
         String serviceType;
 
         try {
-            name = TVMultilingualText.getText(event.programName);
+            name = TvMultilingualText.getText(event.programName);
         } catch (Exception e) {
             e.printStackTrace();
             name = "????";
@@ -306,7 +306,7 @@ public abstract class TvStoreManager {
                .setServiceType(TvContract.Channels.SERVICE_TYPE_AUDIO_VIDEO)//default is SERVICE_TYPE_AUDIO_VIDEO
                .setServiceId(0)
                .setDisplayNumber(Integer.toString(mDisplayNumber))
-               .setDisplayName(TVMultilingualText.getText(ATVName))
+               .setDisplayName(TvMultilingualText.getText(ATVName))
                .setLogoUrl(null)
                .setOriginalNetworkId(0)
                .setTransportStreamId(0)
@@ -1020,7 +1020,7 @@ public abstract class TvStoreManager {
             }
 
             bundle = getScanEventBundle(event);
-            if ((event.mode == TVChannelParams.MODE_ANALOG) && (event.lock == 0x11)) {
+            if ((event.mode == TvChannelParams.MODE_ANALOG) && (event.lock == 0x11)) {
                 bundle.putInt(DroidLogicTvUtils.SIG_INFO_C_DISPLAYNUM, mDisplayNumber);
                 mDisplayNumber++;//count for progress stage
             }
diff --git a/core/java/com/droidlogic/app/tv/TVTime.java b/core/java/com/droidlogic/app/tv/TvTime.java
index a91d01b..18e6d6f 100644
--- a/core/java/com/droidlogic/app/tv/TVTime.java
+++ b/core/java/com/droidlogic/app/tv/TvTime.java
@@ -9,10 +9,8 @@ import java.util.Date;
 
 import com.droidlogic.app.SystemControlManager;
 import com.droidlogic.app.DaylightSavingTime;
-/**
- *TV时间管理
- */
-public class TVTime{
+
+public class TvTime{
     private long diff = 0;
     private Context mContext;
     private SystemControlManager mSystemControlManager;
@@ -20,18 +18,12 @@ public class TVTime{
     private final static String TV_KEY_TVTIME = "dtvtime";
     private final static String PROP_SET_SYSTIME_ENABLED = "persist.sys.getdtvtime.isneed";
 
-    /**
-     *创建时间管理器
-     */
-    public TVTime(Context context){
+
+    public TvTime(Context context){
         mContext = context;
         mSystemControlManager = new SystemControlManager(mContext);
     }
 
-    /**
-     *设定当前时间
-     *@param time 当前时间（毫秒单位）
-     */
     public synchronized void setTime(long time){
         Date sys = new Date();
 
@@ -49,10 +41,7 @@ public class TVTime{
         Settings.System.putLong(mContext.getContentResolver(), TV_KEY_TVTIME, diff);
     }
 
-    /**
-     *取得当前时间
-     *@return 返回当前时间
-     */
+
     public synchronized long getTime(){
         Date sys = new Date();
         diff = Settings.System.getLong(mContext.getContentResolver(), TV_KEY_TVTIME, 0);
@@ -60,17 +49,11 @@ public class TVTime{
         return sys.getTime() + diff;
     }
 
-    /**
-     *取得TDT/STT与系统时间的差值
-     *@return 返回差值时间
-     */
+
     public synchronized long getDiffTime(){
         return Settings.System.getLong(mContext.getContentResolver(), TV_KEY_TVTIME, 0);
     }
 
-    /**
-     *设置TDT/STT与系统时间的差值
-     */
     public synchronized void setDiffTime(long diff){
         this.diff = diff;
         Settings.System.putLong(mContext.getContentResolver(), TV_KEY_TVTIME, this.diff);